Azure
diff --git a/‎sdk/storage/azdatalake/assets.json
+1-1 b/‎sdk/storage/azdatalake/assets.json
+1-1
diff --git a/‎sdk/storage/azdatalake/directory/client.go
+2-2 b/‎sdk/storage/azdatalake/directory/client.go
+2-2
diff --git a/‎sdk/storage/azdatalake/file/client.go
+2-2 b/‎sdk/storage/azdatalake/file/client.go
+2-2
diff --git a/‎sdk/storage/azdatalake/filesystem/client.go
+2-2 b/‎sdk/storage/azdatalake/filesystem/client.go
+2-2
diff --git a/‎sdk/storage/azdatalake/internal/testcommon/clients_auth.go
+14 b/‎sdk/storage/azdatalake/internal/testcommon/clients_auth.go
+14
diff --git a/‎sdk/storage/azdatalake/lease/filesystem_client.go renamed to ‎sdk/storage/azdatalake/lease/client.go
+29-12 b/‎sdk/storage/azdatalake/lease/filesystem_client.go renamed to ‎sdk/storage/azdatalake/lease/client.go
+29-12
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "go",
   "TagPrefix": "go/storage/azdatalake",
-  "Tag": "go/storage/azdatalake_9dd1cc3e0e"
+  "Tag": "go/storage/azdatalake_78f150eb1d"
 }
@@ -219,14 +219,14 @@ func (d *Client) renamePathInURL(newName string) (string, string, string) {
 	lastIndex := strings.LastIndex(endpoint, separator)
 	// Split the string based on the last occurrence of the separator
 	firstPart := endpoint[:lastIndex] // From the beginning of the string to the last occurrence of the separator
-	newPathURL, newBlobURL := shared.GetURLs(runtime.JoinPaths(firstPart, newName))
+	newBlobURL, newPathURL := shared.GetURLs(runtime.JoinPaths(firstPart, newName))
 	parsedNewURL, _ := url.Parse(d.DFSURL())
 	return parsedNewURL.Path, newPathURL, newBlobURL
 }
 
 // Rename renames a directory (dfs1)
 func (d *Client) Rename(ctx context.Context, newName string, options *RenameOptions) (RenameResponse, error) {
-	newPathWithoutURL, newBlobURL, newPathURL := d.renamePathInURL(newName)
+	newPathWithoutURL, newPathURL, newBlobURL := d.renamePathInURL(newName)
 	lac, mac, smac, createOpts := path.FormatRenameOptions(options, newPathWithoutURL)
 	var newBlobClient *blockblob.Client
 	var err error
 
@@ -224,14 +224,14 @@ func (f *Client) renamePathInURL(newName string) (string, string, string) {
 	lastIndex := strings.LastIndex(endpoint, separator)
 	// Split the string based on the last occurrence of the separator
 	firstPart := endpoint[:lastIndex] // From the beginning of the string to the last occurrence of the separator
-	newPathURL, newBlobURL := shared.GetURLs(runtime.JoinPaths(firstPart, newName))
+	newBlobURL, newPathURL := shared.GetURLs(runtime.JoinPaths(firstPart, newName))
 	parsedNewURL, _ := url.Parse(f.DFSURL())
 	return parsedNewURL.Path, newPathURL, newBlobURL
 }
 
 // Rename renames a file (dfs1)
 func (f *Client) Rename(ctx context.Context, newName string, options *RenameOptions) (RenameResponse, error) {
-	newPathWithoutURL, newBlobURL, newPathURL := f.renamePathInURL(newName)
+	newPathWithoutURL, newPathURL, newBlobURL := f.renamePathInURL(newName)
 	lac, mac, smac, createOpts := path.FormatRenameOptions(options, newPathWithoutURL)
 	var newBlobClient *blockblob.Client
 	var err error
 
@@ -184,15 +184,15 @@ func (fs *Client) BlobURL() string {
 // The new directory.Client uses the same request policy pipeline as the Client.
 func (fs *Client) NewDirectoryClient(directoryPath string) *directory.Client {
 	dirURL := runtime.JoinPaths(fs.generatedFSClientWithDFS().Endpoint(), directoryPath)
-	dirURL, blobURL := shared.GetURLs(dirURL)
+	blobURL, dirURL := shared.GetURLs(dirURL)
 	return (*directory.Client)(base.NewPathClient(dirURL, blobURL, fs.containerClient().NewBlockBlobClient(directoryPath), fs.generatedFSClientWithDFS().InternalClient().WithClientName(shared.DirectoryClient), fs.sharedKey(), fs.identityCredential(), fs.getClientOptions()))
 }
 
 // NewFileClient creates a new file.Client object by concatenating file path to the end of this Client's URL.
 // The new file.Client uses the same request policy pipeline as the Client.
 func (fs *Client) NewFileClient(filePath string) *file.Client {
 	fileURL := runtime.JoinPaths(fs.generatedFSClientWithDFS().Endpoint(), filePath)
-	fileURL, blobURL := shared.GetURLs(filePath)
+	blobURL, fileURL := shared.GetURLs(fileURL)
 	return (*file.Client)(base.NewPathClient(fileURL, blobURL, fs.containerClient().NewBlockBlobClient(filePath), fs.generatedFSClientWithDFS().InternalClient().WithClientName(shared.FileClient), fs.sharedKey(), fs.identityCredential(), fs.getClientOptions()))
 }
 
 
@@ -141,6 +141,20 @@ func GetFileClient(fsName, fName string, t *testing.T, accountType TestAccountTy
 	return fileClient, err
 }
 
+func CreateNewFile(ctx context.Context, _require *require.Assertions, fileName string, filesystemClient *filesystem.Client) *file.Client {
+	fileClient := filesystemClient.NewFileClient(fileName)
+	_, err := fileClient.Create(ctx, nil)
+	_require.Nil(err)
+	return fileClient
+}
+
+func CreateNewDir(ctx context.Context, _require *require.Assertions, dirName string, filesystemClient *filesystem.Client) *directory.Client {
+	dirClient := filesystemClient.NewDirectoryClient(dirName)
+	_, err := dirClient.Create(ctx, nil)
+	_require.Nil(err)
+	return dirClient
+}
+
 func GetDirClient(fsName, dirName string, t *testing.T, accountType TestAccountType, options *directory.ClientOptions) (*directory.Client, error) {
 	if options == nil {
 		options = &directory.ClientOptions{}
 
@@ -8,28 +8,36 @@ package lease
 
 import (
 	"context"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/lease"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/filesystem"
+	"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"
 )
 
 // FilesystemClient provides lease functionality for the underlying filesystem client.
 type FilesystemClient struct {
-	leaseID         *string
 	containerClient *lease.ContainerClient
+	leaseID         *string
 }
 
 // FilesystemClientOptions contains the optional values when creating a FilesystemClient.
-type FilesystemClientOptions struct {
-	// LeaseID contains a caller-provided lease ID.
-	LeaseID *string
-}
+type FilesystemClientOptions = lease.ContainerClientOptions
 
 // NewFilesystemClient creates a filesystem lease client for the provided filesystem client.
 //   - client - an instance of a filesystem client
 //   - options - client options; pass nil to accept the default values
 func NewFilesystemClient(client *filesystem.Client, options *FilesystemClientOptions) (*FilesystemClient, error) {
-	// TODO: set up container lease client
-	return nil, nil
+	_, _, containerClient := base.InnerClients((*base.CompositeClient[generated.FileSystemClient, generated.FileSystemClient, container.Client])(client))
+	containerLeaseClient, err := lease.NewContainerClient(containerClient, options)
+	if err != nil {
+		return nil, exported.ConvertToDFSError(err)
+	}
+	return &FilesystemClient{
+		containerClient: containerLeaseClient,
+		leaseID:         containerLeaseClient.LeaseID(),
+	}, nil
 }
 
 // LeaseID returns leaseID of the client.
@@ -42,33 +50,42 @@ func (c *FilesystemClient) LeaseID() *string {
 // For more information, see https://docs.microsoft.com/rest/api/storageservices/lease-blob.
 func (c *FilesystemClient) AcquireLease(ctx context.Context, duration int32, o *FilesystemAcquireOptions) (FilesystemAcquireResponse, error) {
 	opts := o.format()
-	return c.containerClient.AcquireLease(ctx, duration, opts)
+	resp, err := c.containerClient.AcquireLease(ctx, duration, opts)
+	return resp, exported.ConvertToDFSError(err)
 }
 
 // BreakLease breaks the filesystem's previously-acquired lease (if it exists). Pass the LeaseBreakDefault (-1)
 // constant to break a fixed-Duration lease when it expires or an infinite lease immediately.
 // For more information, see https://docs.microsoft.com/rest/api/storageservices/lease-blob.
 func (c *FilesystemClient) BreakLease(ctx context.Context, o *FilesystemBreakOptions) (FilesystemBreakResponse, error) {
 	opts := o.format()
-	return c.containerClient.BreakLease(ctx, opts)
+	resp, err := c.containerClient.BreakLease(ctx, opts)
+	return resp, exported.ConvertToDFSError(err)
 }
 
 // ChangeLease changes the filesystem's lease ID.
 // For more information, see https://docs.microsoft.com/rest/api/storageservices/lease-blob.
 func (c *FilesystemClient) ChangeLease(ctx context.Context, proposedLeaseID string, o *FilesystemChangeOptions) (FilesystemChangeResponse, error) {
 	opts := o.format()
-	return c.containerClient.ChangeLease(ctx, proposedLeaseID, opts)
+	resp, err := c.containerClient.ChangeLease(ctx, proposedLeaseID, opts)
+	if err != nil {
+		return resp, exported.ConvertToDFSError(err)
+	}
+	c.leaseID = &proposedLeaseID
+	return resp, nil
 }
 
 // RenewLease renews the filesystem's previously-acquired lease.
 // For more information, see https://docs.microsoft.com/rest/api/storageservices/lease-blob.
 func (c *FilesystemClient) RenewLease(ctx context.Context, o *FilesystemRenewOptions) (FilesystemRenewResponse, error) {
 	opts := o.format()
-	return c.containerClient.RenewLease(ctx, opts)
+	resp, err := c.containerClient.RenewLease(ctx, opts)
+	return resp, exported.ConvertToDFSError(err)
 }
 
 // ReleaseLease releases the filesystem's previously-acquired lease.
 func (c *FilesystemClient) ReleaseLease(ctx context.Context, o *FilesystemReleaseOptions) (FilesystemReleaseResponse, error) {
 	opts := o.format()
-	return c.containerClient.ReleaseLease(ctx, opts)
+	resp, err := c.containerClient.ReleaseLease(ctx, opts)
+	return resp, exported.ConvertToDFSError(err)
 }
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"AssetsRepo": "Azure/azure-sdk-assets",`
`3`	`3`	`"AssetsRepoPrefixPath": "go",`
`4`	`4`	`"TagPrefix": "go/storage/azdatalake",`
`5`		`- "Tag": "go/storage/azdatalake_9dd1cc3e0e"`
	`5`	`+ "Tag": "go/storage/azdatalake_78f150eb1d"`
`6`	`6`	`}`