[AzDatalake] File Client Support

sdk/storage/azdatalake/assets.json

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

sdk/storage/azdatalake/datalakeerror/error_codes.go

@@ -178,4 +178,7 @@ const (
 var (
 	// MissingSharedKeyCredential - Error is returned when SAS URL is being created without SharedKeyCredential.
 	MissingSharedKeyCredential = bloberror.MissingSharedKeyCredential
+
+	// MissingParameters - Error is returned when at least one parameter should be set for any API.
+	MissingParameters = errors.New("at least one parameter should be set for SetAccessControl API")
 )

sdk/storage/azdatalake/directory/client.go

@@ -11,7 +11,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/base"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/generated"
@@ -22,7 +22,7 @@ import (
 type ClientOptions base.ClientOptions
 
 // Client represents a URL to the Azure Datalake Storage service.
-type Client base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client]
+type Client base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client]
 
 // NewClient creates an instance of Client with the specified values.
 //   - directoryURL - the URL of the directory e.g. https://<account>.dfs.core.windows.net/fs/dir
@@ -46,10 +46,10 @@ func NewClient(directoryURL string, cred azcore.TokenCredential, options *Client
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
-	blobClient, _ := blob.NewClient(blobURL, cred, &blobClientOpts)
+	blobClient, _ := blockblob.NewClient(blobURL, cred, &blobClientOpts)
 	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
@@ -74,10 +74,10 @@ func NewClientWithNoCredential(directoryURL string, options *ClientOptions) (*Cl
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
-	blobClient, _ := blob.NewClientWithNoCredential(blobURL, &blobClientOpts)
+	blobClient, _ := blockblob.NewClientWithNoCredential(blobURL, &blobClientOpts)
 	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
@@ -105,14 +105,14 @@ func NewClientWithSharedKeyCredential(directoryURL string, cred *SharedKeyCreden
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
 	blobSharedKey, err := cred.ConvertToBlobSharedKey()
 	if err != nil {
 		return nil, err
 	}
-	blobClient, _ := blob.NewClientWithSharedKeyCredential(blobURL, blobSharedKey, &blobClientOpts)
+	blobClient, _ := blockblob.NewClientWithSharedKeyCredential(blobURL, blobSharedKey, &blobClientOpts)
 	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(dirClient), nil
@@ -140,22 +140,22 @@ func NewClientFromConnectionString(connectionString string, options *ClientOptio
 
 func (d *Client) generatedDirClientWithDFS() *generated.PathClient {
 	//base.SharedKeyComposite((*base.CompositeClient[generated.BlobClient, generated.BlockBlobClient])(bb))
-	dirClientWithDFS, _, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
+	dirClientWithDFS, _, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
 	return dirClientWithDFS
 }
 
 func (d *Client) generatedDirClientWithBlob() *generated.PathClient {
-	_, dirClientWithBlob, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
+	_, dirClientWithBlob, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
 	return dirClientWithBlob
 }
 
-func (d *Client) blobClient() *blob.Client {
-	_, _, blobClient := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
+func (d *Client) blobClient() *blockblob.Client {
+	_, _, blobClient := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
 	return blobClient
 }
 
 func (d *Client) sharedKey() *exported.SharedKeyCredential {
-	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
+	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(d))
 }
 
 // DFSURL returns the URL endpoint used by the Client object.

sdk/storage/azdatalake/file/client.go

@@ -11,7 +11,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/base"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/generated"
@@ -22,7 +22,7 @@ import (
 type ClientOptions base.ClientOptions
 
 // Client represents a URL to the Azure Datalake Storage service.
-type Client base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client]
+type Client base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client]
 
 // NewClient creates an instance of Client with the specified values.
 //   - fileURL - the URL of the blob e.g. https://<account>.dfs.core.windows.net/fs/file.txt
@@ -45,10 +45,10 @@ func NewClient(fileURL string, cred azcore.TokenCredential, options *ClientOptio
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
-	blobClient, _ := blob.NewClient(blobURL, cred, &blobClientOpts)
+	blobClient, _ := blockblob.NewClient(blobURL, cred, &blobClientOpts)
 	fileClient := base.NewPathClient(fileURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(fileClient), nil
@@ -73,10 +73,10 @@ func NewClientWithNoCredential(fileURL string, options *ClientOptions) (*Client,
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
-	blobClient, _ := blob.NewClientWithNoCredential(blobURL, &blobClientOpts)
+	blobClient, _ := blockblob.NewClientWithNoCredential(blobURL, &blobClientOpts)
 	fileClient := base.NewPathClient(fileURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(fileClient), nil
@@ -104,14 +104,14 @@ func NewClientWithSharedKeyCredential(fileURL string, cred *SharedKeyCredential,
 	if options == nil {
 		options = &ClientOptions{}
 	}
-	blobClientOpts := blob.ClientOptions{
+	blobClientOpts := blockblob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
 	blobSharedKey, err := cred.ConvertToBlobSharedKey()
 	if err != nil {
 		return nil, err
 	}
-	blobClient, _ := blob.NewClientWithSharedKeyCredential(blobURL, blobSharedKey, &blobClientOpts)
+	blobClient, _ := blockblob.NewClientWithSharedKeyCredential(blobURL, blobSharedKey, &blobClientOpts)
 	fileClient := base.NewPathClient(fileURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
 
 	return (*Client)(fileClient), nil
@@ -139,22 +139,26 @@ func NewClientFromConnectionString(connectionString string, options *ClientOptio
 
 func (f *Client) generatedFileClientWithDFS() *generated.PathClient {
 	//base.SharedKeyComposite((*base.CompositeClient[generated.BlobClient, generated.BlockBlobClient])(bb))
-	dirClientWithDFS, _, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(f))
+	dirClientWithDFS, _, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(f))
 	return dirClientWithDFS
 }
 
 func (f *Client) generatedFileClientWithBlob() *generated.PathClient {
-	_, dirClientWithBlob, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(f))
+	_, dirClientWithBlob, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(f))
 	return dirClientWithBlob
 }
 
-func (f *Client) blobClient() *blob.Client {
-	_, _, blobClient := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(f))
+func (f *Client) blobClient() *blockblob.Client {
+	_, _, blobClient := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(f))
 	return blobClient
 }
 
 func (f *Client) sharedKey() *exported.SharedKeyCredential {
-	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(f))
+	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(f))
+}
+
+func (f *Client) getClientOptions() *base.ClientOptions {
+	return base.GetCompositeClientOptions((*base.CompositeClient[generated.PathClient, generated.PathClient, blockblob.Client])(f))
 }
 
 // DFSURL returns the URL endpoint used by the Client object.
@@ -169,96 +173,111 @@ func (f *Client) BlobURL() string {
 
 // Create creates a new file (dfs1).
 func (f *Client) Create(ctx context.Context, options *CreateOptions) (CreateResponse, error) {
-	// TODO: format for options should be able to handle the access conditions parameter correctly
-	return CreateResponse{}, nil
+	lac, mac, httpHeaders, createOpts, cpkOpts := options.format()
+	return f.generatedFileClientWithDFS().Create(ctx, createOpts, httpHeaders, lac, mac, nil, cpkOpts)
 }
 
 // Delete deletes a file (dfs1).
 func (f *Client) Delete(ctx context.Context, options *DeleteOptions) (DeleteResponse, error) {
-	// TODO: recursive set to false when calling generated code
-	return DeleteResponse{}, nil
+	lac, mac, deleteOpts := options.format()
+	return f.generatedFileClientWithDFS().Delete(ctx, deleteOpts, lac, mac)
 }
 
 // GetProperties gets the properties of a file (blob3)
 func (f *Client) GetProperties(ctx context.Context, options *GetPropertiesOptions) (GetPropertiesResponse, error) {
-	// TODO: format blob response to path response
-	return GetPropertiesResponse{}, nil
-}
-
-// Rename renames a file (dfs1).
-func (f *Client) Rename(ctx context.Context, newName string, options *RenameOptions) (RenameResponse, error) {
-	return RenameResponse{}, nil
+	opts := options.format()
+	// TODO: format response + add acls, owner, group, permissions to it
+	return f.blobClient().GetProperties(ctx, opts)
 }
 
-// SetExpiry operation sets an expiry time on an existing file.
-func (f *Client) SetExpiry(ctx context.Context, expiryType ExpiryType, o *SetExpiryOptions) (SetExpiryResponse, error) {
-	// TODO: consider using the blob client set expiry
-	// TODO: call methods in set_expiry.go
-	return SetExpiryResponse{}, nil
+// TODO: implement below
+//// Rename renames a file (dfs1). TODO: look into returning a new client possibly or changing the url
+//func (f *Client) Rename(ctx context.Context, newName string, options *RenameOptions) (RenameResponse, error) {
+//	path, err := url.Parse(f.DFSURL())
+//	if err != nil {
+//		return RenameResponse{}, err
+//	}
+//	lac, mac, smac, createOpts := options.format(path.Path)
+//	fileURL := runtime.JoinPaths(f.generatedFileClientWithDFS().Endpoint(), newName)
+//	// TODO: remove new azcore.Client creation after the API for shallow copying with new client name is implemented
+//	clOpts := f.getClientOptions()
+//	azClient, err := azcore.NewClient(shared.FileClient, exported.ModuleVersion, *(base.GetPipelineOptions(clOpts)), &(clOpts.ClientOptions))
+//	if err != nil {
+//		if log.Should(exported.EventError) {
+//			log.Writef(exported.EventError, err.Error())
+//		}
+//		return RenameResponse{}, err
+//	}
+//	blobURL, fileURL := shared.GetURLs(fileURL)
+//	tempFileClient := (*Client)(base.NewPathClient(fileURL, blobURL, nil, azClient, f.sharedKey(), clOpts))
+//	// this tempClient does not have a blobClient
+//	return tempFileClient.generatedFileClientWithDFS().Create(ctx, createOpts, nil, lac, mac, smac, nil)
+//}
+
+// SetExpiry operation sets an expiry time on an existing file (blob2).
+func (f *Client) SetExpiry(ctx context.Context, expiryType SetExpiryType, o *SetExpiryOptions) (SetExpiryResponse, error) {
+	expMode, opts := expiryType.Format(o)
+	return f.generatedFileClientWithBlob().SetExpiry(ctx, expMode, opts)
 }
 
-// Upload uploads data to a file.
-func (f *Client) Upload(ctx context.Context) {
-
-}
-
-// Append appends data to a file.
-func (f *Client) Append(ctx context.Context) {
-
-}
-
-// Flush flushes previous uploaded data to a file.
-func (f *Client) Flush(ctx context.Context) {
-
-}
-
-// Download downloads data from a file.
-func (f *Client) Download(ctx context.Context) {
-
-}
+//// Upload uploads data to a file.
+//func (f *Client) Upload(ctx context.Context) {
+//
+//}
+//
+//// Append appends data to a file.
+//func (f *Client) Append(ctx context.Context) {
+//
+//}
+//
+//// Flush flushes previous uploaded data to a file.
+//func (f *Client) Flush(ctx context.Context) {
+//
+//}
+//
+//// Download downloads data from a file.
+//func (f *Client) Download(ctx context.Context) {
+//
+//}
 
 // SetAccessControl sets the owner, owning group, and permissions for a file or directory (dfs1).
 func (f *Client) SetAccessControl(ctx context.Context, options *SetAccessControlOptions) (SetAccessControlResponse, error) {
-	return SetAccessControlResponse{}, nil
-}
-
-// SetAccessControlRecursive sets the owner, owning group, and permissions for a file or directory (dfs1).
-func (f *Client) SetAccessControlRecursive(ctx context.Context, options *SetAccessControlRecursiveOptions) (SetAccessControlRecursiveResponse, error) {
-	// TODO explicitly pass SetAccessControlRecursiveMode
-	return SetAccessControlRecursiveResponse{}, nil
+	opts, lac, mac, err := options.format()
+	if err != nil {
+		return SetAccessControlResponse{}, err
+	}
+	return f.generatedFileClientWithDFS().SetAccessControl(ctx, opts, lac, mac)
 }
 
-// UpdateAccessControlRecursive updates the owner, owning group, and permissions for a file or directory (dfs1).
-func (f *Client) UpdateAccessControlRecursive(ctx context.Context, options *UpdateAccessControlRecursiveOptions) (UpdateAccessControlRecursiveResponse, error) {
-	// TODO explicitly pass SetAccessControlRecursiveMode
-	return SetAccessControlRecursiveResponse{}, nil
+// UpdateAccessControl updates the owner, owning group, and permissions for a file or directory (dfs1).
+func (f *Client) UpdateAccessControl(ctx context.Context, ACL string, options *UpdateAccessControlOptions) (UpdateAccessControlResponse, error) {
+	opts, mode := options.format(ACL)
+	return f.generatedFileClientWithDFS().SetAccessControlRecursive(ctx, mode, opts)
 }
 
 // GetAccessControl gets the owner, owning group, and permissions for a file or directory (dfs1).
 func (f *Client) GetAccessControl(ctx context.Context, options *GetAccessControlOptions) (GetAccessControlResponse, error) {
-	return GetAccessControlResponse{}, nil
+	opts, lac, mac := options.format()
+	return f.generatedFileClientWithDFS().GetProperties(ctx, opts, lac, mac)
 }
 
-// RemoveAccessControlRecursive removes the owner, owning group, and permissions for a file or directory (dfs1).
-func (f *Client) RemoveAccessControlRecursive(ctx context.Context, options *RemoveAccessControlRecursiveOptions) (RemoveAccessControlRecursiveResponse, error) {
-	// TODO explicitly pass SetAccessControlRecursiveMode
-	return SetAccessControlRecursiveResponse{}, nil
+// RemoveAccessControl removes the owner, owning group, and permissions for a file or directory (dfs1).
+func (f *Client) RemoveAccessControl(ctx context.Context, ACL string, options *RemoveAccessControlOptions) (RemoveAccessControlResponse, error) {
+	opts, mode := options.format(ACL)
+	return f.generatedFileClientWithDFS().SetAccessControlRecursive(ctx, mode, opts)
 }
 
 // SetMetadata sets the metadata for a file or directory (blob3).
 func (f *Client) SetMetadata(ctx context.Context, options *SetMetadataOptions) (SetMetadataResponse, error) {
-	// TODO: call directly into blob
-	return SetMetadataResponse{}, nil
+	opts, metadata := options.format()
+	return f.blobClient().SetMetadata(ctx, metadata, opts)
 }
 
 // SetHTTPHeaders sets the HTTP headers for a file or directory (blob3).
 func (f *Client) SetHTTPHeaders(ctx context.Context, httpHeaders HTTPHeaders, options *SetHTTPHeadersOptions) (SetHTTPHeadersResponse, error) {
-	// TODO: call formatBlobHTTPHeaders() since we want to add the blob prefix to our options before calling into blob
-	// TODO: call into blob
-	return SetHTTPHeadersResponse{}, nil
-}
-
-// UndeletePath restores the specified path that was previously deleted. (dfs op/blob2).
-func (f *Client) UndeletePath(ctx context.Context, path string, options *UndeletePathOptions) (UndeletePathResponse, error) {
-	return UndeletePathResponse{}, nil
+	opts, blobHTTPHeaders := options.format(httpHeaders)
+	resp, err := f.blobClient().SetHTTPHeaders(ctx, blobHTTPHeaders, opts)
+	newResp := SetHTTPHeadersResponse{}
+	formatSetHTTPHeadersResponse(&newResp, &resp)
+	return newResp, err
 }