[AzDatalake] Filesystem Client Implementation + Test Framework (#21067)

* Enable gocritic during linting (#20715)

Enabled gocritic's evalOrder to catch dependencies on undefined behavior
on return statements.
Updated to latest version of golangci-lint.
Fixed issue in azblob flagged by latest linter.

* Cosmos DB: Enable merge support (#20716)

* Adding header and value

* Wiring and tests

* format

* Fixing value

* change log

* [azservicebus, azeventhubs] Stress test and logging improvement (#20710)

Logging improvements:

* Updating the logging to print more tracing information (per-link) in prep for the bigger release coming up.
* Trimming out some of the verbose logging, seeing if I can get it a bit more reasonable.

Stress tests:

* Add a timestamp to the log name we generate and also default to append, not overwrite.
* Use 0.5 cores, 0.5GB as our baseline. Some pods use more and I'll tune them more later.

* update proxy version (#20712)

Co-authored-by: Scott Beddall <[email protected]>

* Return an error when you try to send a message that's too large. (#20721)

This now works just like the message batch - you'll get an ErrMessageTooLarge
if you attempt to send a message that's too large for the link's configured
size.

NOTE: there's a patch to `internal/go-amqp/Sender.go` to match what's in go-amqp's
main so it returns a programmatically useful error when the message is too large.

Fixes #20647

* Changes in test that is failing in pipeline (#20693)

* [azservicebus, azeventhubs] Treat 'entity full' as a fatal error (#20722)

When the remote entity is full we get a resource-limit-exceeded condition. This isn't something we should keep retrying on and it's best to just abort and let the user know immediately, rather than hoping it might eventually clear out.

This affected both Event Hubs and Service Bus.

Fixes #20647

* [azservicebus/azeventhubs] Redirect stderr and stdout to tee (#20726)

* Update changelog with latest features (#20730)

* Update changelog with latest features

Prepare for upcoming release.

* bump minor version

* pass along the artifact name so we can override it later (#20732)

Co-authored-by: scbedd <[email protected]>

* [azeventhubs] Fixing checkpoint store race condition (#20727)

The checkpoint store wasn't guarding against multiple owners claiming for the first time - fixing this by using IfNoneMatch

Fixes #20717

* Fix azidentity troubleshooting guide link (#20736)

* [Release] sdk/resourcemanager/paloaltonetworksngfw/armpanngfw/0.1.0 (#20437)

* [Release] sdk/resourcemanager/paloaltonetworksngfw/armpanngfw/0.1.0 generation from spec commit: 85fb4ac6f8bfefd179e6c2632976a154b5c9ff04

* client factory

* fix

* fix

* update

* add sdk/resourcemanager/postgresql/armpostgresql live test (#20685)

* add sdk/resourcemanager/postgresql/armpostgresql live test

* update assets.json

* set subscriptionId default value

* format

* add sdk/resourcemanager/eventhub/armeventhub live test (#20686)

* add sdk/resourcemanager/eventhub/armeventhub live test

* update assets

* add sdk/resourcemanager/compute/armcompute live test (#20048)

* add sdk/resourcemanager/compute/armcompute live test

* skus filter

* fix subscriptionId default value

* fix

* gofmt

* update recording

* sdk/resourcemanager/network/armnetwork live test (#20331)

* sdk/resourcemanager/network/armnetwork live test

* update subscriptionId default value

* update recording

* add sdk/resourcemanager/cosmos/armcosmos live test (#20705)

* add sdk/resourcemanager/cosmos/armcosmos live test

* update assets.json

* update assets.json

* update assets.json

* update assets.json

* Increment package version after release of azcore (#20740)

* [azeventhubs] Improperly resetting etag in the checkpoint store (#20737)

We shouldn't be resetting the etag to nil - it's what we use to enforce a "single winner" when doing ownership claims.

The bug here was two-fold: I had bad logic in my previous claim ownership, which I fixed in a previous PR, but we need to reflect that same constraint properly in our in-memory checkpoint store for these tests.

* Eng workflows sync and branch cleanup additions (#20743)

Co-authored-by: James Suplizio <[email protected]>

* [azeventhubs] Latest start position can also be inclusive (ie, get the latest message) (#20744)

* Update GitHubEventProcessor version and remove pull_request_review procesing (#20751)

Co-authored-by: James Suplizio <[email protected]>

* Rename DisableAuthorityValidationAndInstanceDiscovery (#20746)

* fix (#20707)

* AzFile (#20739)

* azfile: Fixing connection string parsing logic (#20798)

* Fixing connection string parse logic

* Update README

* [azadmin] fix flaky test (#20758)

* fix flaky test

* charles suggestion

* Prepare azidentity v1.3.0 for release (#20756)

* Fix broken podman link (#20801)

Co-authored-by: Wes Haggard <[email protected]>

* [azquery] update doc comments (#20755)

* update doc comments

* update statistics and visualization generation

* prep-for-release

* Fixed contribution section (#20752)

Co-authored-by: Bob Tabor <[email protected]>

* [azeventhubs,azservicebus] Some API cleanup, renames (#20754)

* Adding options to UpdateCheckpoint(), just for future potential expansion
* Make Offset an int64, not a *int64 (it's not optional, it'll always come back with ReceivedEvents)
* Adding more logging into the checkpoint store.
* Point all imports at the production go-amqp

* Add supporting features to enable distributed tracing (#20301) (#20708)

* Add supporting features to enable distributed tracing

This includes new internal pipeline policies and other supporting types.
See the changelog for a full description.
Added some missing doc comments.

* fix linter issue

* add net.peer.name trace attribute

sequence custom HTTP header policy before logging policy.
sequence logging policy after HTTP trace policy.
keep body download policy at the end.

* add span for iterating over pages

* Restore ARM CAE support for azcore beta (#20657)

This reverts commit 9020972.

* Upgrade to stable azcore (#20808)

* Increment package version after release of data/azcosmos (#20807)

* Updating changelog (#20810)

* Add fake package to azcore (#20711)

* Add fake package to azcore

This is the supporting infrastructure for the generated SDK fakes.

* fix doc comment

* Updating CHANGELOG.md (#20809)

* changelog (#20811)

* Increment package version after release of storage/azfile (#20813)

* Update changelog (azblob) (#20815)

* Updating CHANGELOG.md

* Update the changelog with correct version

* [azquery] migration guide (#20742)

* migration guide

* Charles feedback

* Richard feedback

---------

Co-authored-by: Charles Lowell <[email protected]>

* Increment package version after release of monitor/azquery (#20820)

* [keyvault] prep for release (#20819)

* prep for release

* perf tests

* update date

* added new client methods

* moved access conditions and wrote first test

* added more tests

* added path listing

* list deleted paths

* fixed formatter and added more tests

* added more tests

* marker fix

* log

* fixed constructor validation

* comment

* assets update:

---------

Co-authored-by: Joel Hendrix <[email protected]>
Co-authored-by: Matias Quaranta <[email protected]>
Co-authored-by: Richard Park <[email protected]>
Co-authored-by: Azure SDK Bot <[email protected]>
Co-authored-by: Scott Beddall <[email protected]>
Co-authored-by: siminsavani-msft <[email protected]>
Co-authored-by: scbedd <[email protected]>
Co-authored-by: Charles Lowell <[email protected]>
Co-authored-by: Peng Jiahui <[email protected]>
Co-authored-by: James Suplizio <[email protected]>
Co-authored-by: Sourav Gupta <[email protected]>
Co-authored-by: gracewilcox <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>
Co-authored-by: Bob Tabor <[email protected]>
Co-authored-by: Bob Tabor <[email protected]>

sdk/storage/azdatalake/assets.json

@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "go",
+  "TagPrefix": "go/storage/azdatalake",
+  "Tag": "go/storage/azdatalake_e05ec93d89"
+}

sdk/storage/azdatalake/common.go

@@ -7,17 +7,30 @@
 package azdatalake
 
 import (
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/generated"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/internal/exported"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/sas"
 )
 
-// AccessConditions identifies container-specific access conditions which you optionally set.
-type AccessConditions struct {
-	ModifiedAccessConditions *ModifiedAccessConditions
-	LeaseAccessConditions    *LeaseAccessConditions
+// SharedKeyCredential contains an account's name and its primary or secondary key.
+type SharedKeyCredential = exported.SharedKeyCredential
+
+// NewSharedKeyCredential creates an immutable SharedKeyCredential containing the
+// storage account's name and either its primary or secondary key.
+func NewSharedKeyCredential(accountName, accountKey string) (*SharedKeyCredential, error) {
+	return exported.NewSharedKeyCredential(accountName, accountKey)
 }
 
-// LeaseAccessConditions contains optional parameters to access leased entity.
-type LeaseAccessConditions = generated.LeaseAccessConditions
+// URLParts object represents the components that make up an Azure Storage Container/Blob URL.
+// NOTE: Changing any SAS-related field requires computing a new SAS signature.
+type URLParts = sas.URLParts
+
+// ParseURL parses a URL initializing URLParts' fields including any SAS-related & snapshot query parameters. Any other
+// query parameters remain in the UnparsedParams field. This method overwrites all fields in the URLParts object.
+func ParseURL(u string) (URLParts, error) {
+	return sas.ParseURL(u)
+}
 
-// ModifiedAccessConditions contains a group of parameters for specifying access conditions.
-type ModifiedAccessConditions = generated.ModifiedAccessConditions
+// HTTPRange defines a range of bytes within an HTTP resource, starting at offset and
+// 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

sdk/storage/azdatalake/datalakeerror/error_codes.go

@@ -0,0 +1,181 @@
+//go:build go1.18
+// +build go1.18
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+package datalakeerror
+
+import (
+	"errors"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
+)
+
+// HasCode returns true if the provided error is an *azcore.ResponseError
+// with its ErrorCode field equal to one of the specified Codes.
+func HasCode(err error, codes ...Code) bool {
+	var respErr *azcore.ResponseError
+	if !errors.As(err, &respErr) {
+		return false
+	}
+
+	for _, code := range codes {
+		if respErr.ErrorCode == string(code) {
+			return true
+		}
+	}
+
+	return false
+}
+
+type StorageErrorCode string
+
+// Code - Error codes returned by the service
+type Code = bloberror.Code
+
+const (
+	ContentLengthMustBeZero                StorageErrorCode = "ContentLengthMustBeZero"
+	PathAlreadyExists                      StorageErrorCode = "PathAlreadyExists"
+	InvalidFlushPosition                   StorageErrorCode = "InvalidFlushPosition"
+	InvalidPropertyName                    StorageErrorCode = "InvalidPropertyName"
+	InvalidSourceURI                       StorageErrorCode = "InvalidSourceUri"
+	UnsupportedRestVersion                 StorageErrorCode = "UnsupportedRestVersion"
+	FileSystemNotFound                     StorageErrorCode = "FilesystemNotFound"
+	PathNotFound                           StorageErrorCode = "PathNotFound"
+	RenameDestinationParentPathNotFound    StorageErrorCode = "RenameDestinationParentPathNotFound"
+	SourcePathNotFound                     StorageErrorCode = "SourcePathNotFound"
+	DestinationPathIsBeingDeleted          StorageErrorCode = "DestinationPathIsBeingDeleted"
+	FileSystemAlreadyExists                StorageErrorCode = "FilesystemAlreadyExists"
+	FileSystemBeingDeleted                 StorageErrorCode = "FilesystemBeingDeleted"
+	InvalidDestinationPath                 StorageErrorCode = "InvalidDestinationPath"
+	InvalidRenameSourcePath                StorageErrorCode = "InvalidRenameSourcePath"
+	InvalidSourceOrDestinationResourceType StorageErrorCode = "InvalidSourceOrDestinationResourceType"
+	LeaseIsAlreadyBroken                   StorageErrorCode = "LeaseIsAlreadyBroken"
+	LeaseNameMismatch                      StorageErrorCode = "LeaseNameMismatch"
+	PathConflict                           StorageErrorCode = "PathConflict"
+	SourcePathIsBeingDeleted               StorageErrorCode = "SourcePathIsBeingDeleted"
+)
+
+const (
+	AccountAlreadyExists                              Code = "AccountAlreadyExists"
+	AccountBeingCreated                               Code = "AccountBeingCreated"
+	AccountIsDisabled                                 Code = "AccountIsDisabled"
+	AppendPositionConditionNotMet                     Code = "AppendPositionConditionNotMet"
+	AuthenticationFailed                              Code = "AuthenticationFailed"
+	AuthorizationFailure                              Code = "AuthorizationFailure"
+	AuthorizationPermissionMismatch                   Code = "AuthorizationPermissionMismatch"
+	AuthorizationProtocolMismatch                     Code = "AuthorizationProtocolMismatch"
+	AuthorizationResourceTypeMismatch                 Code = "AuthorizationResourceTypeMismatch"
+	AuthorizationServiceMismatch                      Code = "AuthorizationServiceMismatch"
+	AuthorizationSourceIPMismatch                     Code = "AuthorizationSourceIPMismatch"
+	BlobAlreadyExists                                 Code = "BlobAlreadyExists"
+	PathArchived                                      Code = "BlobArchived"
+	PathBeingRehydrated                               Code = "BlobBeingRehydrated"
+	PathImmutableDueToPolicy                          Code = "BlobImmutableDueToPolicy"
+	PathNotArchived                                   Code = "BlobNotArchived"
+	BlobNotFound                                      Code = "BlobNotFound"
+	PathOverwritten                                   Code = "BlobOverwritten"
+	PathTierInadequateForContentLength                Code = "BlobTierInadequateForContentLength"
+	PathUsesCustomerSpecifiedEncryption               Code = "BlobUsesCustomerSpecifiedEncryption"
+	BlockCountExceedsLimit                            Code = "BlockCountExceedsLimit"
+	BlockListTooLong                                  Code = "BlockListTooLong"
+	CannotChangeToLowerTier                           Code = "CannotChangeToLowerTier"
+	CannotVerifyCopySource                            Code = "CannotVerifyCopySource"
+	ConditionHeadersNotSupported                      Code = "ConditionHeadersNotSupported"
+	ConditionNotMet                                   Code = "ConditionNotMet"
+	FilesystemAlreadyExists                           Code = "ContainerAlreadyExists"
+	ContainerBeingDeleted                             Code = "ContainerBeingDeleted"
+	ContainerDisabled                                 Code = "ContainerDisabled"
+	ContainerNotFound                                 Code = "ContainerNotFound"
+	ContentLengthLargerThanTierLimit                  Code = "ContentLengthLargerThanTierLimit"
+	CopyAcrossAccountsNotSupported                    Code = "CopyAcrossAccountsNotSupported"
+	CopyIDMismatch                                    Code = "CopyIdMismatch"
+	EmptyMetadataKey                                  Code = "EmptyMetadataKey"
+	FeatureVersionMismatch                            Code = "FeatureVersionMismatch"
+	IncrementalCopyPathMismatch                       Code = "IncrementalCopyBlobMismatch"
+	IncrementalCopyOfEralierVersionSnapshotNotAllowed Code = "IncrementalCopyOfEralierVersionSnapshotNotAllowed"
+	IncrementalCopySourceMustBeSnapshot               Code = "IncrementalCopySourceMustBeSnapshot"
+	InfiniteLeaseDurationRequired                     Code = "InfiniteLeaseDurationRequired"
+	InsufficientAccountPermissions                    Code = "InsufficientAccountPermissions"
+	InternalError                                     Code = "InternalError"
+	InvalidAuthenticationInfo                         Code = "InvalidAuthenticationInfo"
+	InvalidBlobOrBlock                                Code = "InvalidBlobOrBlock"
+	InvalidPathTier                                   Code = "InvalidBlobTier"
+	InvalidPathType                                   Code = "InvalidBlobType"
+	InvalidBlockID                                    Code = "InvalidBlockId"
+	InvalidBlockList                                  Code = "InvalidBlockList"
+	InvalidHTTPVerb                                   Code = "InvalidHttpVerb"
+	InvalidHeaderValue                                Code = "InvalidHeaderValue"
+	InvalidInput                                      Code = "InvalidInput"
+	InvalidMD5                                        Code = "InvalidMd5"
+	InvalidMetadata                                   Code = "InvalidMetadata"
+	InvalidOperation                                  Code = "InvalidOperation"
+	InvalidPageRange                                  Code = "InvalidPageRange"
+	InvalidQueryParameterValue                        Code = "InvalidQueryParameterValue"
+	InvalidRange                                      Code = "InvalidRange"
+	InvalidResourceName                               Code = "InvalidResourceName"
+	InvalidSourcePathType                             Code = "InvalidSourceBlobType"
+	InvalidSourcePathURL                              Code = "InvalidSourceBlobUrl"
+	InvalidURI                                        Code = "InvalidUri"
+	InvalidVersionForPageBlobOperation                Code = "InvalidVersionForPageBlobOperation"
+	InvalidXMLDocument                                Code = "InvalidXmlDocument"
+	InvalidXMLNodeValue                               Code = "InvalidXmlNodeValue"
+	LeaseAlreadyBroken                                Code = "LeaseAlreadyBroken"
+	LeaseAlreadyPresent                               Code = "LeaseAlreadyPresent"
+	LeaseIDMismatchWithBlobOperation                  Code = "LeaseIdMismatchWithBlobOperation"
+	LeaseIDMismatchWithContainerOperation             Code = "LeaseIdMismatchWithContainerOperation"
+	LeaseIDMismatchWithLeaseOperation                 Code = "LeaseIdMismatchWithLeaseOperation"
+	LeaseIDMissing                                    Code = "LeaseIdMissing"
+	LeaseIsBreakingAndCannotBeAcquired                Code = "LeaseIsBreakingAndCannotBeAcquired"
+	LeaseIsBreakingAndCannotBeChanged                 Code = "LeaseIsBreakingAndCannotBeChanged"
+	LeaseIsBrokenAndCannotBeRenewed                   Code = "LeaseIsBrokenAndCannotBeRenewed"
+	LeaseLost                                         Code = "LeaseLost"
+	LeaseNotPresentWithBlobOperation                  Code = "LeaseNotPresentWithBlobOperation"
+	LeaseNotPresentWithContainerOperation             Code = "LeaseNotPresentWithContainerOperation"
+	LeaseNotPresentWithLeaseOperation                 Code = "LeaseNotPresentWithLeaseOperation"
+	MD5Mismatch                                       Code = "Md5Mismatch"
+	CRC64Mismatch                                     Code = "Crc64Mismatch"
+	MaxBlobSizeConditionNotMet                        Code = "MaxBlobSizeConditionNotMet"
+	MetadataTooLarge                                  Code = "MetadataTooLarge"
+	MissingContentLengthHeader                        Code = "MissingContentLengthHeader"
+	MissingRequiredHeader                             Code = "MissingRequiredHeader"
+	MissingRequiredQueryParameter                     Code = "MissingRequiredQueryParameter"
+	MissingRequiredXMLNode                            Code = "MissingRequiredXmlNode"
+	MultipleConditionHeadersNotSupported              Code = "MultipleConditionHeadersNotSupported"
+	NoAuthenticationInformation                       Code = "NoAuthenticationInformation"
+	NoPendingCopyOperation                            Code = "NoPendingCopyOperation"
+	OperationNotAllowedOnIncrementalCopyBlob          Code = "OperationNotAllowedOnIncrementalCopyBlob"
+	OperationTimedOut                                 Code = "OperationTimedOut"
+	OutOfRangeInput                                   Code = "OutOfRangeInput"
+	OutOfRangeQueryParameterValue                     Code = "OutOfRangeQueryParameterValue"
+	PendingCopyOperation                              Code = "PendingCopyOperation"
+	PreviousSnapshotCannotBeNewer                     Code = "PreviousSnapshotCannotBeNewer"
+	PreviousSnapshotNotFound                          Code = "PreviousSnapshotNotFound"
+	PreviousSnapshotOperationNotSupported             Code = "PreviousSnapshotOperationNotSupported"
+	RequestBodyTooLarge                               Code = "RequestBodyTooLarge"
+	RequestURLFailedToParse                           Code = "RequestUrlFailedToParse"
+	ResourceAlreadyExists                             Code = "ResourceAlreadyExists"
+	ResourceNotFound                                  Code = "ResourceNotFound"
+	ResourceTypeMismatch                              Code = "ResourceTypeMismatch"
+	SequenceNumberConditionNotMet                     Code = "SequenceNumberConditionNotMet"
+	SequenceNumberIncrementTooLarge                   Code = "SequenceNumberIncrementTooLarge"
+	ServerBusy                                        Code = "ServerBusy"
+	SnapshotCountExceeded                             Code = "SnapshotCountExceeded"
+	SnapshotOperationRateExceeded                     Code = "SnapshotOperationRateExceeded"
+	SnapshotsPresent                                  Code = "SnapshotsPresent"
+	SourceConditionNotMet                             Code = "SourceConditionNotMet"
+	SystemInUse                                       Code = "SystemInUse"
+	TargetConditionNotMet                             Code = "TargetConditionNotMet"
+	UnauthorizedBlobOverwrite                         Code = "UnauthorizedBlobOverwrite"
+	UnsupportedHTTPVerb                               Code = "UnsupportedHttpVerb"
+	UnsupportedHeader                                 Code = "UnsupportedHeader"
+	UnsupportedQueryParameter                         Code = "UnsupportedQueryParameter"
+	UnsupportedXMLNode                                Code = "UnsupportedXmlNode"
+)
+
+var (
+	// MissingSharedKeyCredential - Error is returned when SAS URL is being created without SharedKeyCredential.
+	MissingSharedKeyCredential = bloberror.MissingSharedKeyCredential
+)

sdk/storage/azdatalake/directory/client.go

@@ -25,11 +25,41 @@ type ClientOptions base.ClientOptions
 // Client represents a URL to the Azure Datalake Storage service.
 type Client base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client]
 
-//TODO: NewClient()
+// 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
+//   - cred - an Azure AD credential, typically obtained via the azidentity module
+//   - options - client options; pass nil to accept the default values
+func NewClient(directoryURL string, cred azcore.TokenCredential, options *ClientOptions) (*Client, error) {
+	blobURL := strings.Replace(directoryURL, ".dfs.", ".blob.", 1)
+	directoryURL = strings.Replace(directoryURL, ".blob.", ".dfs.", 1)
+
+	authPolicy := shared.NewStorageChallengePolicy(cred)
+	conOptions := shared.GetClientOptions(options)
+	plOpts := runtime.PipelineOptions{
+		PerRetry: []policy.Policy{authPolicy},
+	}
+	base.SetPipelineOptions((*base.ClientOptions)(conOptions), &plOpts)
+
+	azClient, err := azcore.NewClient(shared.FileClient, exported.ModuleVersion, plOpts, &conOptions.ClientOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	if options == nil {
+		options = &ClientOptions{}
+	}
+	blobClientOpts := blob.ClientOptions{
+		ClientOptions: options.ClientOptions,
+	}
+	blobClient, _ := blob.NewClient(blobURL, cred, &blobClientOpts)
+	dirClient := base.NewPathClient(directoryURL, blobURL, blobClient, azClient, nil, (*base.ClientOptions)(conOptions))
+
+	return (*Client)(dirClient), nil
+}
 
 // NewClientWithNoCredential creates an instance of Client with the specified values.
 // This is used to anonymously access a storage account or with a shared access signature (SAS) token.
-//   - serviceURL - the URL of the storage account e.g. https://<account>.dfs.core.windows.net/?<sas token>
+//   - directoryURL - the URL of the storage account e.g. https://<account>.dfs.core.windows.net/fs/dir?<sas token>
 //   - options - client options; pass nil to accept the default values
 func NewClientWithNoCredential(directoryURL string, options *ClientOptions) (*Client, error) {
 	blobURL := strings.Replace(directoryURL, ".dfs.", ".blob.", 1)
@@ -44,6 +74,9 @@ func NewClientWithNoCredential(directoryURL string, options *ClientOptions) (*Cl
 		return nil, err
 	}
 
+	if options == nil {
+		options = &ClientOptions{}
+	}
 	blobClientOpts := blob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
@@ -54,7 +87,7 @@ func NewClientWithNoCredential(directoryURL string, options *ClientOptions) (*Cl
 }
 
 // NewClientWithSharedKeyCredential creates an instance of Client with the specified values.
-//   - serviceURL - the URL of the storage account e.g. https://<account>.dfs.core.windows.net/
+//   - directoryURL - the URL of the storage account e.g. https://<account>.dfs.core.windows.net/fs/dir
 //   - cred - a SharedKeyCredential created with the matching storage account and access key
 //   - options - client options; pass nil to accept the default values
 func NewClientWithSharedKeyCredential(directoryURL string, cred *SharedKeyCredential, options *ClientOptions) (*Client, error) {
@@ -73,6 +106,9 @@ func NewClientWithSharedKeyCredential(directoryURL string, cred *SharedKeyCreden
 		return nil, err
 	}
 
+	if options == nil {
+		options = &ClientOptions{}
+	}
 	blobClientOpts := blob.ClientOptions{
 		ClientOptions: options.ClientOptions,
 	}
@@ -103,13 +139,13 @@ func NewClientFromConnectionString(connectionString string, options *ClientOptio
 	return NewClientWithNoCredential(parsed.ServiceURL, options)
 }
 
-func (d *Client) generatedFSClientWithDFS() *generated.PathClient {
+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))
 	return dirClientWithDFS
 }
 
-func (d *Client) generatedFSClientWithBlob() *generated.PathClient {
+func (d *Client) generatedDirClientWithBlob() *generated.PathClient {
 	_, dirClientWithBlob, _ := base.InnerClients((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
 	return dirClientWithBlob
 }
@@ -123,9 +159,14 @@ func (d *Client) sharedKey() *exported.SharedKeyCredential {
 	return base.SharedKeyComposite((*base.CompositeClient[generated.PathClient, generated.PathClient, blob.Client])(d))
 }
 
-// URL returns the URL endpoint used by the Client object.
-func (d *Client) URL() string {
-	return "s.generated().Endpoint()"
+// DFSURL returns the URL endpoint used by the Client object.
+func (d *Client) DFSURL() string {
+	return d.generatedDirClientWithDFS().Endpoint()
+}
+
+// BlobURL returns the URL endpoint used by the Client object.
+func (d *Client) BlobURL() string {
+	return d.generatedDirClientWithBlob().Endpoint()
 }
 
 // Create creates a new directory (dfs1).
@@ -190,3 +231,8 @@ 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
+}