Try managed identity before defaultIdentity

erdembayar · erdembayar · commit c44da560f355 · 2023-09-06T12:31:52.000-07:00
diff --git a/src/NuGet.Services.KeyVault/KeyVaultReader.cs b/src/NuGet.Services.KeyVault/KeyVaultReader.cs
@@ -59,12 +59,17 @@ public async Task<ISecret> GetSecretObjectAsync(string secretName, ILogger logge
         private SecretClient InitializeClient()
         {
             TokenCredential credential = null;
+
             if (_configuration.UseManagedIdentity)
             {
-                credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions
+                if (string.IsNullOrEmpty(_configuration.ClientId))
+                {
+                    credential = new DefaultAzureCredential();
+                }
+                else
                 {
-                    ManagedIdentityClientId = _configuration.ClientId
-                });
+                    credential = new ManagedIdentityCredential(_configuration.ClientId);
+                }
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,17 @@ public async Task<ISecret> GetSecretObjectAsync(string secretName, ILogger logge`
`59`	`59`	`private SecretClient InitializeClient()`
`60`	`60`	`{`
`61`	`61`	`TokenCredential credential = null;`
	`62`	`+`
`62`	`63`	`if (_configuration.UseManagedIdentity)`
`63`	`64`	`{`
`64`		`- credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions`
	`65`	`+ if (string.IsNullOrEmpty(_configuration.ClientId))`
	`66`	`+ {`
	`67`	`+ credential = new DefaultAzureCredential();`
	`68`	`+ }`
	`69`	`+ else`
`65`	`70`	`{`
`66`		`- ManagedIdentityClientId = _configuration.ClientId`
`67`		`- });`
	`71`	`+ credential = new ManagedIdentityCredential(_configuration.ClientId);`
	`72`	`+ }`
`68`	`73`	`}`
`69`	`74`	`else`
`70`	`75`	`{`