[AzDatalake] Cleanup + Improvements

sdk/storage/azdatalake/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "go",
   "TagPrefix": "go/storage/azdatalake",
-  "Tag": "go/storage/azdatalake_820b86faa9"
+  "Tag": "go/storage/azdatalake_db1de4a48b"
 }

sdk/storage/azdatalake/common.go

@@ -7,6 +7,7 @@
 package azdatalake
 
 import (
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/lease"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/sas"
 )
@@ -34,3 +35,47 @@ func ParseURL(u string) (URLParts, error) {
 // ending at offset+count. A zero-value HTTPRange indicates the entire resource. An HTTPRange
 // which has an offset but no zero value count indicates from the offset to the resource's end.
 type HTTPRange = exported.HTTPRange
+
+// ===================================== LEASE CONSTANTS ============================================================
+
+// StatusType defines values for StatusType
+type StatusType = lease.StatusType
+
+const (
+	StatusTypeLocked   StatusType = lease.StatusTypeLocked
+	StatusTypeUnlocked StatusType = lease.StatusTypeUnlocked
+)
+
+// PossibleStatusTypeValues returns the possible values for the StatusType const type.
+func PossibleStatusTypeValues() []StatusType {
+	return lease.PossibleStatusTypeValues()
+}
+
+// DurationType defines values for DurationType
+type DurationType = lease.DurationType
+
+const (
+	DurationTypeInfinite DurationType = lease.DurationTypeInfinite
+	DurationTypeFixed    DurationType = lease.DurationTypeFixed
+)
+
+// PossibleDurationTypeValues returns the possible values for the DurationType const type.
+func PossibleDurationTypeValues() []DurationType {
+	return lease.PossibleDurationTypeValues()
+}
+
+// StateType defines values for StateType
+type StateType = lease.StateType
+
+const (
+	StateTypeAvailable StateType = lease.StateTypeAvailable
+	StateTypeLeased    StateType = lease.StateTypeLeased
+	StateTypeExpired   StateType = lease.StateTypeExpired
+	StateTypeBreaking  StateType = lease.StateTypeBreaking
+	StateTypeBroken    StateType = lease.StateTypeBroken
+)
+
+// PossibleStateTypeValues returns the possible values for the StateType const type.
+func PossibleStateTypeValues() []StateType {
+	return lease.PossibleStateTypeValues()
+}

sdk/storage/azdatalake/directory/client.go

@@ -50,7 +50,7 @@ func NewClient(directoryURL string, cred azcore.TokenCredential, options *Client
 		ClientOptions: options.ClientOptions,
 	}
 	blobClient, _ := blockblob.NewClient(blobURL, cred, &blobClientOpts)
-	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
+	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, &cred, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
 }
@@ -78,7 +78,7 @@ func NewClientWithNoCredential(directoryURL string, options *ClientOptions) (*Cl
 		ClientOptions: options.ClientOptions,
 	}
 	blobClient, _ := blockblob.NewClientWithNoCredential(blobURL, &blobClientOpts)
-	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
+	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
 }
@@ -113,7 +113,7 @@ func NewClientWithSharedKeyCredential(directoryURL string, cred *SharedKeyCreden
 		return nil, err
 	}
 	blobClient, _ := blockblob.NewClientWithSharedKeyCredential(blobURL, blobSharedKey, &blobClientOpts)
-	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, cred, (*base.ClientOptions)(conOptions))
+	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, cred, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
 }
@@ -158,6 +158,10 @@ func (d *Client) sharedKey() *exported.SharedKeyCredential {
 	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
 }
 
+func (d *Client) identityCredential() *azcore.TokenCredential {
+	return base.IdentityCredentialComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
+}
+
 // DFSURL returns the URL endpoint used by the Client object.
 func (d *Client) DFSURL() string {
 	return d.generatedDirClientWithDFS().Endpoint()
@@ -168,6 +172,8 @@ func (d *Client) BlobURL() string {
 	return d.generatedDirClientWithBlob().Endpoint()
 }
 
+//TODO: create method to get file client - this will require block blob to have a method to get another block blob
+
 // Create creates a new directory (dfs1).
 func (d *Client) Create(ctx context.Context, options *CreateOptions) (CreateResponse, error) {
 	return CreateResponse{}, nil
@@ -230,8 +236,3 @@ func (d *Client) SetHTTPHeaders(ctx context.Context, httpHeaders HTTPHeaders, op
 	// TODO: call into blob
 	return SetHTTPHeadersResponse{}, nil
 }
-
-// UndeletePath restores the specified path that was previously deleted. (dfs op/blob2).
-func (d *Client) UndeletePath(ctx context.Context, path string, options *UndeletePathOptions) (UndeletePathResponse, error) {
-	return UndeletePathResponse{}, nil
-}

sdk/storage/azdatalake/directory/constants.go

@@ -7,37 +7,12 @@
 package directory
 
 import (
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/generated"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/path"
 )
 
-type ResourceType = generated.PathResourceType
+type EncryptionAlgorithmType = path.EncryptionAlgorithmType
 
-// TODO: consider the possibility of not exposing this and just pass it under the hood
 const (
-	ResourceTypeFile      ResourceType = generated.PathResourceTypeFile
-	ResourceTypeDirectory ResourceType = generated.PathResourceTypeDirectory
-)
-
-type RenameMode = generated.PathRenameMode
-
-// TODO: consider the possibility of not exposing this and just pass it under the hood
-const (
-	RenameModeLegacy RenameMode = generated.PathRenameModeLegacy
-	RenameModePosix  RenameMode = generated.PathRenameModePosix
-)
-
-type SetAccessControlRecursiveMode = generated.PathSetAccessControlRecursiveMode
-
-const (
-	SetAccessControlRecursiveModeSet    SetAccessControlRecursiveMode = generated.PathSetAccessControlRecursiveModeSet
-	SetAccessControlRecursiveModeModify SetAccessControlRecursiveMode = generated.PathSetAccessControlRecursiveModeModify
-	SetAccessControlRecursiveModeRemove SetAccessControlRecursiveMode = generated.PathSetAccessControlRecursiveModeRemove
-)
-
-type EncryptionAlgorithmType = blob.EncryptionAlgorithmType
-
-const (
-	EncryptionAlgorithmTypeNone   EncryptionAlgorithmType = blob.EncryptionAlgorithmTypeNone
-	EncryptionAlgorithmTypeAES256 EncryptionAlgorithmType = blob.EncryptionAlgorithmTypeAES256
+	EncryptionAlgorithmTypeNone   EncryptionAlgorithmType = path.EncryptionAlgorithmTypeNone
+	EncryptionAlgorithmTypeAES256 EncryptionAlgorithmType = path.EncryptionAlgorithmTypeAES256
 )