Data Lake Create Bundle

sdk/storage/azdatalake/CHANGELOG.md

@@ -9,6 +9,7 @@
 * Flush API bundled with release lease option.
 * HNS Encryption Context support
 * Pagination Support for recursive directory deletion
+* Bundle ability to set permission, owner, group, acl, lease, expiry time and umask along with FileSystem.CreateFile and FileSystem.CreateDirectory APIs.
 
 ### Breaking Changes
 

sdk/storage/azdatalake/assets.json

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

sdk/storage/azdatalake/filesystem/client.go

@@ -371,3 +371,21 @@ func (fs *Client) GetSASURL(permissions sas.FileSystemPermissions, expiry time.T
 
 	return endpoint, nil
 }
+
+// CreateFile Creates a new file within a file system.
+// For more information, see the <a href="https://docs.microsoft.com/rest/api/storageservices/datalakestoragegen2/path/create">Azure Docs</a>.
+func (fs *Client) CreateFile(ctx context.Context, filePath string, options *CreateFileOptions) (CreateFileResponse, error) {
+	fileClient := fs.NewFileClient(filePath)
+	resp, err := fileClient.Create(ctx, options)
+	err = exported.ConvertToDFSError(err)
+	return resp, err
+}
+
+// CreateDirectory Creates a new directory within a file system.
+// For more information, see the <a href="https://docs.microsoft.com/rest/api/storageservices/datalakestoragegen2/path/create">Azure Docs</a>.
+func (fs *Client) CreateDirectory(ctx context.Context, filePath string, options *CreateDirectoryOptions) (CreateDirectoryResponse, error) {
+	dirClient := fs.NewDirectoryClient(filePath)
+	resp, err := dirClient.Create(ctx, options)
+	err = exported.ConvertToDFSError(err)
+	return resp, err
+}

sdk/storage/azdatalake/filesystem/client_test.go

@@ -2000,3 +2000,87 @@ func (s *UnrecordedTestSuite) TestFSCreateDeleteUsingOAuth() {
 	_require.NoError(err)
 
 }
+
+func (s *RecordedTestSuite) TestCreateFileInFileSystemSetOptions() {
+	_require := require.New(s.T())
+	testName := s.T().Name()
+
+	umask := "0000"
+	user := "4cf4e284-f6a8-4540-b53e-c3469af032dc"
+	group := user
+	acl := "user::rwx,group::r-x,other::rwx"
+	leaseDuration := to.Ptr(int64(15))
+
+	filesystemName := testcommon.GenerateFileSystemName(testName)
+	fsClient, err := testcommon.GetFileSystemClient(filesystemName, s.T(), testcommon.TestAccountDatalake, nil)
+	_require.NoError(err)
+	defer testcommon.DeleteFileSystem(context.Background(), _require, fsClient)
+
+	_, err = fsClient.Create(context.Background(), nil)
+	_require.NoError(err)
+
+	createFileOptions := &filesystem.CreateFileOptions{
+		Umask: &umask,
+		Owner: &user,
+		Group: &group,
+		ACL:   &acl,
+		Expiry: file.CreateExpiryValues{
+			ExpiryType: file.CreateExpiryTypeNeverExpire,
+		},
+		LeaseDuration:   leaseDuration,
+		ProposedLeaseID: proposedLeaseIDs[0],
+	}
+	resp, err := fsClient.CreateFile(context.Background(), testName, createFileOptions)
+	_require.NoError(err)
+	_require.NotNil(resp)
+
+	fClient := fsClient.NewFileClient(testName)
+
+	response, err := fClient.GetProperties(context.Background(), nil)
+	_require.NoError(err)
+	_require.Equal("4cf4e284-f6a8-4540-b53e-c3469af032dc", *response.Owner)
+	_require.Equal("rwxr-xrwx", *response.Permissions)
+	_require.Equal(filesystem.StateTypeLeased, *response.LeaseState)
+
+}
+
+func (s *RecordedTestSuite) TestCreateDirectoryInFileSystemSetOptions() {
+	_require := require.New(s.T())
+	testName := s.T().Name()
+
+	perms := "0777"
+	umask := "0000"
+	owner := "4cf4e284-f6a8-4540-b53e-c3469af032dc"
+	group := owner
+	leaseDuration := to.Ptr(int64(-1))
+
+	filesystemName := testcommon.GenerateFileSystemName(testName)
+	fsClient, err := testcommon.GetFileSystemClient(filesystemName, s.T(), testcommon.TestAccountDatalake, nil)
+	_require.NoError(err)
+	defer testcommon.DeleteFileSystem(context.Background(), _require, fsClient)
+
+	_, err = fsClient.Create(context.Background(), nil)
+	_require.NoError(err)
+
+	createDirOptions := &filesystem.CreateDirectoryOptions{
+		Permissions:     &perms,
+		Umask:           &umask,
+		Owner:           &owner,
+		Group:           &group,
+		LeaseDuration:   leaseDuration,
+		ProposedLeaseID: proposedLeaseIDs[0],
+	}
+
+	resp, err := fsClient.CreateDirectory(context.Background(), testName, createDirOptions)
+	_require.NoError(err)
+	_require.NotNil(resp)
+
+	dirClient := fsClient.NewDirectoryClient(testName)
+
+	response, err := dirClient.GetProperties(context.Background(), nil)
+	_require.NoError(err)
+	_require.Equal(*response.Owner, "4cf4e284-f6a8-4540-b53e-c3469af032dc")
+	_require.Equal("rwxrwxrwx", *response.Permissions)
+	_require.Equal(filesystem.StateTypeLeased, *response.LeaseState)
+
+}

sdk/storage/azdatalake/filesystem/examples_test.go

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/file"
 	"io"
 	"log"
 	"net/http"
@@ -328,3 +329,71 @@ func Example_fs_ClientSetMetadata() {
 	_, err = fsClient.SetMetadata(context.TODO(), &filesystem.SetMetadataOptions{Metadata: fsGetPropertiesResponse.Metadata})
 	handleError(err)
 }
+
+func Example_fs_ClientCreateFile() {
+	accountName, ok := os.LookupEnv("AZURE_STORAGE_ACCOUNT_NAME")
+	if !ok {
+		panic("AZURE_STORAGE_ACCOUNT_NAME could not be found")
+	}
+	fsName := "testfs"
+	fsURL := fmt.Sprintf("https://%s.dfs.core.windows.net/%s", accountName, fsName)
+	filePath := "testFile"
+
+	cred, err := azidentity.NewDefaultAzureCredential(nil)
+	handleError(err)
+
+	fsClient, err := filesystem.NewClient(fsURL, cred, nil)
+	handleError(err)
+
+	fsCreateResponse, err := fsClient.Create(context.TODO(), &filesystem.CreateOptions{
+		Metadata: map[string]*string{"Foo": to.Ptr("Bar")},
+	})
+	handleError(err)
+	fmt.Println(fsCreateResponse)
+
+	createFileOptions := &filesystem.CreateFileOptions{
+		Umask: to.Ptr("0000"),
+		ACL:   to.Ptr("user::rwx,group::r-x,other::rwx"),
+		Expiry: file.CreateExpiryValues{
+			ExpiryType: file.CreateExpiryTypeAbsolute,
+			ExpiresOn:  time.Now().Add(20 * time.Second).UTC().Format(http.TimeFormat),
+		},
+		LeaseDuration:   to.Ptr(int64(15)),
+		ProposedLeaseID: to.Ptr("c820a799-76d7-4ee2-6e15-546f19325c2c"),
+	}
+	resp, err := fsClient.CreateFile(context.Background(), filePath, createFileOptions)
+	handleError(err)
+	fmt.Println(resp)
+}
+
+func Example_fs_ClientCreateDirectory() {
+	accountName, ok := os.LookupEnv("AZURE_STORAGE_ACCOUNT_NAME")
+	if !ok {
+		panic("AZURE_STORAGE_ACCOUNT_NAME could not be found")
+	}
+	fsName := "testfs"
+	fsURL := fmt.Sprintf("https://%s.dfs.core.windows.net/%s", accountName, fsName)
+	dirPath := "testDir"
+
+	cred, err := azidentity.NewDefaultAzureCredential(nil)
+	handleError(err)
+
+	fsClient, err := filesystem.NewClient(fsURL, cred, nil)
+	handleError(err)
+
+	fsCreateResponse, err := fsClient.Create(context.TODO(), &filesystem.CreateOptions{
+		Metadata: map[string]*string{"Foo": to.Ptr("Bar")},
+	})
+	handleError(err)
+	fmt.Println(fsCreateResponse)
+
+	options := &filesystem.CreateDirectoryOptions{
+		Umask:           to.Ptr("0000"),
+		ACL:             to.Ptr("user::rwx,group::r-x,other::rwx"),
+		LeaseDuration:   to.Ptr(int64(15)),
+		ProposedLeaseID: to.Ptr("c820a799-76d7-4ee2-6e15-546f19325c2c"),
+	}
+	resp, err := fsClient.CreateDirectory(context.Background(), dirPath, options)
+	handleError(err)
+	fmt.Println(resp)
+}

sdk/storage/azdatalake/filesystem/models.go

@@ -8,6 +8,8 @@ package filesystem
 
 import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/directory"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/file"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/generated"
 	"time"
@@ -250,3 +252,9 @@ type PathProperties = generated.PathPropertiesInternal
 
 // PathPrefix contains the response from method FileSystemClient.ListPathsHierarchySegment.
 type PathPrefix = generated.PathPrefix
+
+// CreateFileOptions contains the optional parameters when calling the CreateFile operation.
+type CreateFileOptions = file.CreateOptions
+
+// CreateDirectoryOptions contains the optional parameters when calling the CreateDirectory operation.
+type CreateDirectoryOptions = directory.CreateOptions

sdk/storage/azdatalake/filesystem/responses.go

@@ -150,3 +150,9 @@ type ListPathsHierarchySegmentResponse = generated.ListPathsHierarchySegmentResp
 
 // PathHierarchyListSegment contains the response from method FileSystemClient.ListPathsHierarchySegment.
 type PathHierarchyListSegment = generated.PathHierarchyListSegment
+
+// CreateFileResponse contains the response from method FileSystemClient.CreateFile.
+type CreateFileResponse = generated.PathClientCreateResponse
+
+// CreateDirectoryResponse contains the response from method FileSystemClient.CreateDirectory.
+type CreateDirectoryResponse = generated.PathClientCreateResponse