Fixed bug where Data Lake File and Directory Client constructors were not property populating ClientConfiguration.TokenCredential (Azure#38083)

seanmcc-msft · web-flow · commit 9fdbb9b0b70a · 2023-08-08T11:17:30.000-05:00
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeDirectoryClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeDirectoryClient.cs
@@ -219,7 +219,7 @@ public DataLakeDirectoryClient(Uri directoryUri, AzureSasCredential credential,
         /// The token credential used to sign requests.
         /// </param>
         public DataLakeDirectoryClient(Uri directoryUri, TokenCredential credential)
-            : this(directoryUri, credential.AsPolicy(new DataLakeClientOptions()), null, storageSharedKeyCredential:null)
+            : this(directoryUri, credential.AsPolicy(new DataLakeClientOptions()), null, tokenCredential: credential)
         {
             Errors.VerifyHttpsTokenAuth(directoryUri);
         }
@@ -242,7 +242,7 @@ public DataLakeDirectoryClient(Uri directoryUri, TokenCredential credential)
         /// every request.
         /// </param>
         public DataLakeDirectoryClient(Uri directoryUri, TokenCredential credential, DataLakeClientOptions options)
-            : this(directoryUri, credential.AsPolicy(options), options, storageSharedKeyCredential: null)
+            : this(directoryUri, credential.AsPolicy(options), options, tokenCredential: credential)
         {
             Errors.VerifyHttpsTokenAuth(directoryUri);
         }
@@ -317,6 +317,41 @@ internal DataLakeDirectoryClient
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataLakeDirectoryClient"/>
+        /// class.
+        /// </summary>
+        /// <param name="directoryUri">
+        /// A <see cref="Uri"/> referencing the directory that includes the
+        /// name of the account, the name of the file system, and the path of the
+        /// directory.
+        /// </param>
+        /// <param name="authentication">
+        /// An optional authentication policy used to sign requests.
+        /// </param>
+        /// <param name="options">
+        /// Optional client options that define the transport pipeline
+        /// policies for authentication, retries, etc., that are applied to
+        /// every request.
+        /// </param>
+        /// <param name="tokenCredential">
+        /// Token credential.
+        /// </param>
+        internal DataLakeDirectoryClient
+            (Uri directoryUri,
+            HttpPipelinePolicy authentication,
+            DataLakeClientOptions options,
+            TokenCredential tokenCredential)
+            : base(
+                  directoryUri,
+                  authentication,
+                  options,
+                  storageSharedKeyCredential: null,
+                  sasCredential: null,
+                  tokenCredential: tokenCredential)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DataLakeDirectoryClient"/>
         /// class.
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs
@@ -236,7 +236,7 @@ public DataLakeFileClient(Uri fileUri, AzureSasCredential credential, DataLakeCl
         /// The token credential used to sign requests.
         /// </param>
         public DataLakeFileClient(Uri fileUri, TokenCredential credential)
-            : this(fileUri, credential.AsPolicy(new DataLakeClientOptions()), null, storageSharedKeyCredential:null)
+            : this(fileUri, credential.AsPolicy(new DataLakeClientOptions()), null, tokenCredential: credential)
         {
             Errors.VerifyHttpsTokenAuth(fileUri);
         }
@@ -258,7 +258,7 @@ public DataLakeFileClient(Uri fileUri, TokenCredential credential)
         /// applied to every request.
         /// </param>
         public DataLakeFileClient(Uri fileUri, TokenCredential credential, DataLakeClientOptions options)
-            : this(fileUri, credential.AsPolicy(options), options, storageSharedKeyCredential:null)
+            : this(fileUri, credential.AsPolicy(options), options, credential)
         {
             Errors.VerifyHttpsTokenAuth(fileUri);
         }
@@ -332,6 +332,40 @@ internal DataLakeFileClient(
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataLakeFileClient"/>
+        /// class.
+        /// </summary>
+        /// <param name="fileUri">
+        /// A <see cref="Uri"/> referencing the file that includes the
+        /// name of the account, the name of the file system, and the path of the
+        /// file.
+        /// </param>
+        /// <param name="authentication">
+        /// An optional authentication policy used to sign requests.
+        /// </param>
+        /// <param name="options">
+        /// Optional client options that define the transport pipeline
+        /// policies for authentication, retries, etc., that are applied to
+        /// every request.
+        /// </param>
+        /// <param name="tokenCredential">
+        /// Token credential.
+        /// </param>
+        internal DataLakeFileClient(
+            Uri fileUri,
+            HttpPipelinePolicy authentication,
+            DataLakeClientOptions options,
+            TokenCredential tokenCredential)
+            : base(fileUri,
+                  authentication,
+                  options,
+                  storageSharedKeyCredential: null,
+                  sasCredential: null,
+                  tokenCredential: tokenCredential)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DataLakeFileClient"/> class.
         /// </summary>
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs
@@ -82,6 +82,7 @@ public async Task Ctor_SharedKey()
             Assert.AreEqual(fileSystemName, directoryClient.FileSystemName);
             Assert.AreEqual($"{parentDirectoryName}/{directoryName}", directoryClient.Path);
             Assert.AreEqual(uri, directoryClient.Uri);
+            Assert.IsNotNull(directoryClient.ClientConfiguration.SharedKeyCredential);
         }
 
         [RecordedTest]
@@ -109,6 +110,7 @@ public async Task Ctor_TokenCredential()
             Assert.AreEqual(fileSystemName, directoryClient.FileSystemName);
             Assert.AreEqual($"{parentDirectoryName}/{directoryName}", directoryClient.Path);
             Assert.AreEqual(uri, directoryClient.Uri);
+            Assert.IsNotNull(directoryClient.ClientConfiguration.TokenCredential);
         }
 
         [RecordedTest]
@@ -128,6 +130,7 @@ public async Task Ctor_ConnectionString_RoundTrip()
             // Assert
             await connStringDirectory.GetPropertiesAsync();
             await connStringDirectory.GetAccessControlAsync();
+            Assert.IsNotNull(connStringDirectory.ClientConfiguration.SharedKeyCredential);
         }
 
         [RecordedTest]
@@ -184,6 +187,7 @@ public async Task Ctor_AzureSasCredential()
 
             // Assert
             Assert.IsNotNull(properties);
+            Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);
         }
 
         [RecordedTest]
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs
@@ -85,6 +85,7 @@ public async Task Ctor_SharedKey()
             Assert.AreEqual(fileSystemName, fileClient.FileSystemName);
             Assert.AreEqual($"{directoryName}/{fileName}", fileClient.Path);
             Assert.AreEqual(uri, fileClient.Uri);
+            Assert.IsNotNull(fileClient.ClientConfiguration.SharedKeyCredential);
         }
 
         [RecordedTest]
@@ -112,6 +113,7 @@ public async Task Ctor_TokenCredential()
             Assert.AreEqual(fileSystemName, fileClient.FileSystemName);
             Assert.AreEqual($"{directoryName}/{fileName}", fileClient.Path);
             Assert.AreEqual(uri, fileClient.Uri);
+            Assert.IsNotNull(fileClient.ClientConfiguration.TokenCredential);
         }
 
         [RecordedTest]
@@ -148,6 +150,7 @@ public async Task Ctor_ConnectionString_RoundTrip()
             // Assert
             await connStringFile.GetPropertiesAsync();
             await connStringFile.GetAccessControlAsync();
+            Assert.IsNotNull(connStringFile.ClientConfiguration.SharedKeyCredential);
         }
 
         [RecordedTest]
@@ -187,6 +190,7 @@ public async Task Ctor_AzureSasCredential()
 
             // Assert
             Assert.IsNotNull(properties);
+            Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);
         }
 
         [RecordedTest]
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs
@@ -74,6 +74,7 @@ public async Task Ctor_SharedKey()
                 // Assert
                 Assert.AreEqual(fileSystemName, fileSystemClient.Name);
                 Assert.AreEqual(uri, fileSystemClient.Uri);
+                Assert.IsNotNull(fileSystemClient.ClientConfiguration.SharedKeyCredential);
             }
             finally
             {
@@ -97,6 +98,7 @@ public async Task Ctor_TokenCredential()
 
                 // Act
                 await fileSystemClient.GetPropertiesAsync();
+                Assert.IsNotNull(fileSystemClient.ClientConfiguration.TokenCredential);
             }
             finally
             {
@@ -122,6 +124,7 @@ public async Task Ctor_ConnectionString_RoundTrip()
 
                 // Assert
                 Assert.AreEqual(1, paths.Count);
+                Assert.IsNotNull(fileSystem.ClientConfiguration.SharedKeyCredential);
             }
 
             // Cleanup
@@ -195,6 +198,7 @@ public async Task Ctor_AzureSasCredential()
 
             // Assert
             Assert.IsNotNull(properties);
+            Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);
         }
 
         [RecordedTest]
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs
@@ -54,6 +54,7 @@ public async Task Ctor_SharedKey()
 
             // Assert
             Assert.AreEqual(uri, serviceClient.Uri);
+            Assert.IsNotNull(serviceClient.ClientConfiguration.SharedKeyCredential);
         }
 
         [RecordedTest]
@@ -69,6 +70,7 @@ public async Task Ctor_TokenCredential()
 
             // Assert
             Assert.AreEqual(uri, serviceClient.Uri);
+            Assert.IsNotNull(serviceClient.ClientConfiguration.TokenCredential);
         }
 
         [RecordedTest]
@@ -83,6 +85,7 @@ public async Task Ctor_ConnectionString_RoundTrip()
             try
             {
                 await fileSystem.CreateAsync();
+                Assert.IsNotNull(fileSystem.ClientConfiguration.SharedKeyCredential);
             }
 
             // Cleanup
@@ -154,6 +157,7 @@ public async Task Ctor_AzureSasCredential()
 
             // Assert
             Assert.IsNotNull(fileSystems);
+            Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);
         }
 
         [RecordedTest]

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public async Task Ctor_SharedKey()`
`82`	`82`	`Assert.AreEqual(fileSystemName, directoryClient.FileSystemName);`
`83`	`83`	`Assert.AreEqual($"{parentDirectoryName}/{directoryName}", directoryClient.Path);`
`84`	`84`	`Assert.AreEqual(uri, directoryClient.Uri);`
	`85`	`+ Assert.IsNotNull(directoryClient.ClientConfiguration.SharedKeyCredential);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`[RecordedTest]`
`@@ -109,6 +110,7 @@ public async Task Ctor_TokenCredential()`
`109`	`110`	`Assert.AreEqual(fileSystemName, directoryClient.FileSystemName);`
`110`	`111`	`Assert.AreEqual($"{parentDirectoryName}/{directoryName}", directoryClient.Path);`
`111`	`112`	`Assert.AreEqual(uri, directoryClient.Uri);`
	`113`	`+ Assert.IsNotNull(directoryClient.ClientConfiguration.TokenCredential);`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`[RecordedTest]`
`@@ -128,6 +130,7 @@ public async Task Ctor_ConnectionString_RoundTrip()`
`128`	`130`	`// Assert`
`129`	`131`	`await connStringDirectory.GetPropertiesAsync();`
`130`	`132`	`await connStringDirectory.GetAccessControlAsync();`
	`133`	`+ Assert.IsNotNull(connStringDirectory.ClientConfiguration.SharedKeyCredential);`
`131`	`134`	`}`
`132`	`135`
`133`	`136`	`[RecordedTest]`
`@@ -184,6 +187,7 @@ public async Task Ctor_AzureSasCredential()`
`184`	`187`
`185`	`188`	`// Assert`
`186`	`189`	`Assert.IsNotNull(properties);`
	`190`	`+ Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);`
`187`	`191`	`}`
`188`	`192`
`189`	`193`	`[RecordedTest]`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public async Task Ctor_SharedKey()`
`85`	`85`	`Assert.AreEqual(fileSystemName, fileClient.FileSystemName);`
`86`	`86`	`Assert.AreEqual($"{directoryName}/{fileName}", fileClient.Path);`
`87`	`87`	`Assert.AreEqual(uri, fileClient.Uri);`
	`88`	`+ Assert.IsNotNull(fileClient.ClientConfiguration.SharedKeyCredential);`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`[RecordedTest]`
`@@ -112,6 +113,7 @@ public async Task Ctor_TokenCredential()`
`112`	`113`	`Assert.AreEqual(fileSystemName, fileClient.FileSystemName);`
`113`	`114`	`Assert.AreEqual($"{directoryName}/{fileName}", fileClient.Path);`
`114`	`115`	`Assert.AreEqual(uri, fileClient.Uri);`
	`116`	`+ Assert.IsNotNull(fileClient.ClientConfiguration.TokenCredential);`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`[RecordedTest]`
`@@ -148,6 +150,7 @@ public async Task Ctor_ConnectionString_RoundTrip()`
`148`	`150`	`// Assert`
`149`	`151`	`await connStringFile.GetPropertiesAsync();`
`150`	`152`	`await connStringFile.GetAccessControlAsync();`
	`153`	`+ Assert.IsNotNull(connStringFile.ClientConfiguration.SharedKeyCredential);`
`151`	`154`	`}`
`152`	`155`
`153`	`156`	`[RecordedTest]`
`@@ -187,6 +190,7 @@ public async Task Ctor_AzureSasCredential()`
`187`	`190`
`188`	`191`	`// Assert`
`189`	`192`	`Assert.IsNotNull(properties);`
	`193`	`+ Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);`
`190`	`194`	`}`
`191`	`195`
`192`	`196`	`[RecordedTest]`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public async Task Ctor_SharedKey()`
`74`	`74`	`// Assert`
`75`	`75`	`Assert.AreEqual(fileSystemName, fileSystemClient.Name);`
`76`	`76`	`Assert.AreEqual(uri, fileSystemClient.Uri);`
	`77`	`+ Assert.IsNotNull(fileSystemClient.ClientConfiguration.SharedKeyCredential);`
`77`	`78`	`}`
`78`	`79`	`finally`
`79`	`80`	`{`
`@@ -97,6 +98,7 @@ public async Task Ctor_TokenCredential()`
`97`	`98`
`98`	`99`	`// Act`
`99`	`100`	`await fileSystemClient.GetPropertiesAsync();`
	`101`	`+ Assert.IsNotNull(fileSystemClient.ClientConfiguration.TokenCredential);`
`100`	`102`	`}`
`101`	`103`	`finally`
`102`	`104`	`{`
`@@ -122,6 +124,7 @@ public async Task Ctor_ConnectionString_RoundTrip()`
`122`	`124`
`123`	`125`	`// Assert`
`124`	`126`	`Assert.AreEqual(1, paths.Count);`
	`127`	`+ Assert.IsNotNull(fileSystem.ClientConfiguration.SharedKeyCredential);`
`125`	`128`	`}`
`126`	`129`
`127`	`130`	`// Cleanup`
`@@ -195,6 +198,7 @@ public async Task Ctor_AzureSasCredential()`
`195`	`198`
`196`	`199`	`// Assert`
`197`	`200`	`Assert.IsNotNull(properties);`
	`201`	`+ Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);`
`198`	`202`	`}`
`199`	`203`
`200`	`204`	`[RecordedTest]`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public async Task Ctor_SharedKey()`
`54`	`54`
`55`	`55`	`// Assert`
`56`	`56`	`Assert.AreEqual(uri, serviceClient.Uri);`
	`57`	`+ Assert.IsNotNull(serviceClient.ClientConfiguration.SharedKeyCredential);`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`[RecordedTest]`
`@@ -69,6 +70,7 @@ public async Task Ctor_TokenCredential()`
`69`	`70`
`70`	`71`	`// Assert`
`71`	`72`	`Assert.AreEqual(uri, serviceClient.Uri);`
	`73`	`+ Assert.IsNotNull(serviceClient.ClientConfiguration.TokenCredential);`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`[RecordedTest]`
`@@ -83,6 +85,7 @@ public async Task Ctor_ConnectionString_RoundTrip()`
`83`	`85`	`try`
`84`	`86`	`{`
`85`	`87`	`await fileSystem.CreateAsync();`
	`88`	`+ Assert.IsNotNull(fileSystem.ClientConfiguration.SharedKeyCredential);`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`// Cleanup`
`@@ -154,6 +157,7 @@ public async Task Ctor_AzureSasCredential()`
`154`	`157`
`155`	`158`	`// Assert`
`156`	`159`	`Assert.IsNotNull(fileSystems);`
	`160`	`+ Assert.IsNotNull(sasClient.ClientConfiguration.SasCredential);`
`157`	`161`	`}`
`158`	`162`
`159`	`163`	`[RecordedTest]`