Skip to content

Commit bae7d80

Browse files
authored
Use DNS suffix as resource id when it is not provided (#255)
* Use DNS suffix as resource id when it is not provided * Update AzureEnvironment.cs * update after review
1 parent cb5c4d4 commit bae7d80

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/Authentication.Abstractions/AzureEnvironment.cs

+8
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,10 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata
303303
GalleryUrl = armMetadata.Gallery,
304304
SqlDatabaseDnsSuffix = armMetadata.Suffixes.SqlServerHostname,
305305
GraphUrl = armMetadata.Graph,
306+
//TODO, ARM endpoint doesn't have TrafficManagerDnsSuffix
306307
TrafficManagerDnsSuffix = GetTrafficManagerDnsSuffix(armMetadata.Name),
307308
AzureKeyVaultDnsSuffix = armMetadata.Suffixes.KeyVaultDns,
309+
//Default ARM endpoint doens't provide KeyVault service resource id. Keep it here just in case.
308310
AzureKeyVaultServiceEndpointResourceId = GetKeyVaultServiceEndpointResourceId(armMetadata.Name),
309311
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = armMetadata.Suffixes.AzureDataLakeAnalyticsCatalogAndJob,
310312
AzureDataLakeStoreFileSystemEndpointSuffix = armMetadata.Suffixes.AzureDataLakeStoreFileSystem,
@@ -315,6 +317,12 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata
315317
ContainerRegistryEndpointSuffix = armMetadata.Suffixes.AcrLoginServer
316318
};
317319

320+
//We reuse the value of KeyVaultDns
321+
if (string.IsNullOrEmpty(azureEnvironment.AzureKeyVaultServiceEndpointResourceId))
322+
{
323+
azureEnvironment.AzureKeyVaultServiceEndpointResourceId = $"https://{azureEnvironment.AzureKeyVaultDnsSuffix}";
324+
}
325+
318326
// There are mismatches between metadata built in Azure PowerShell/CLI and from ARM endpoint.
319327
// Considering compatibility, below hard coded logic accommodates those mismatches
320328
// SqlDatabaseDnsSuffix requires value leading with period

0 commit comments

Comments
 (0)