@@ -303,8 +303,10 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata
303
303
GalleryUrl = armMetadata . Gallery ,
304
304
SqlDatabaseDnsSuffix = armMetadata . Suffixes . SqlServerHostname ,
305
305
GraphUrl = armMetadata . Graph ,
306
+ //TODO, ARM endpoint doesn't have TrafficManagerDnsSuffix
306
307
TrafficManagerDnsSuffix = GetTrafficManagerDnsSuffix ( armMetadata . Name ) ,
307
308
AzureKeyVaultDnsSuffix = armMetadata . Suffixes . KeyVaultDns ,
309
+ //Default ARM endpoint doens't provide KeyVault service resource id. Keep it here just in case.
308
310
AzureKeyVaultServiceEndpointResourceId = GetKeyVaultServiceEndpointResourceId ( armMetadata . Name ) ,
309
311
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = armMetadata . Suffixes . AzureDataLakeAnalyticsCatalogAndJob ,
310
312
AzureDataLakeStoreFileSystemEndpointSuffix = armMetadata . Suffixes . AzureDataLakeStoreFileSystem ,
@@ -315,6 +317,12 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata
315
317
ContainerRegistryEndpointSuffix = armMetadata . Suffixes . AcrLoginServer
316
318
} ;
317
319
320
+ //We reuse the value of KeyVaultDns
321
+ if ( string . IsNullOrEmpty ( azureEnvironment . AzureKeyVaultServiceEndpointResourceId ) )
322
+ {
323
+ azureEnvironment . AzureKeyVaultServiceEndpointResourceId = $ "https://{ azureEnvironment . AzureKeyVaultDnsSuffix } ";
324
+ }
325
+
318
326
// There are mismatches between metadata built in Azure PowerShell/CLI and from ARM endpoint.
319
327
// Considering compatibility, below hard coded logic accommodates those mismatches
320
328
// SqlDatabaseDnsSuffix requires value leading with period
0 commit comments