diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs index abf1139a2dc3..d0f06bfb11f9 100644 --- a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs +++ b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs @@ -126,6 +126,7 @@ public partial class AppConfigurationStore : Azure.Provisioning.Resource)) { } public static Azure.Provisioning.AppConfiguration.AppConfigurationStore FromExisting(Azure.Provisioning.IConstruct scope, string name, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null) { throw null; } + protected override string GetAzureName(Azure.Provisioning.IConstruct scope, string resourceName) { throw null; } } } namespace Azure.Provisioning.AppService @@ -204,6 +205,7 @@ public partial class CognitiveServicesAccount : Azure.Provisioning.Resource)) { } public static Azure.Provisioning.CognitiveServices.CognitiveServicesAccount FromExisting(Azure.Provisioning.IConstruct scope, string name, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null) { throw null; } + protected override string GetAzureName(Azure.Provisioning.IConstruct scope, string resourceName) { throw null; } } public partial class CognitiveServicesAccountDeployment : Azure.Provisioning.Resource { diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs index abf1139a2dc3..d0f06bfb11f9 100644 --- a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs +++ b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs @@ -126,6 +126,7 @@ public partial class AppConfigurationStore : Azure.Provisioning.Resource)) { } public static Azure.Provisioning.AppConfiguration.AppConfigurationStore FromExisting(Azure.Provisioning.IConstruct scope, string name, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null) { throw null; } + protected override string GetAzureName(Azure.Provisioning.IConstruct scope, string resourceName) { throw null; } } } namespace Azure.Provisioning.AppService @@ -204,6 +205,7 @@ public partial class CognitiveServicesAccount : Azure.Provisioning.Resource)) { } public static Azure.Provisioning.CognitiveServices.CognitiveServicesAccount FromExisting(Azure.Provisioning.IConstruct scope, string name, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null) { throw null; } + protected override string GetAzureName(Azure.Provisioning.IConstruct scope, string resourceName) { throw null; } } public partial class CognitiveServicesAccountDeployment : Azure.Provisioning.Resource { diff --git a/sdk/provisioning/Azure.Provisioning/assets.json b/sdk/provisioning/Azure.Provisioning/assets.json index d4d6b7875035..4e8f961fb796 100644 --- a/sdk/provisioning/Azure.Provisioning/assets.json +++ b/sdk/provisioning/Azure.Provisioning/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/provisioning/Azure.Provisioning", - "Tag": "net/provisioning/Azure.Provisioning_d2660e3b79" + "Tag": "net/provisioning/Azure.Provisioning_2e6e26284c" } \ No newline at end of file diff --git a/sdk/provisioning/Azure.Provisioning/src/appconfiguration/AppConfigurationStore.cs b/sdk/provisioning/Azure.Provisioning/src/appconfiguration/AppConfigurationStore.cs index da4b4c5381e4..0b45577299ee 100644 --- a/sdk/provisioning/Azure.Provisioning/src/appconfiguration/AppConfigurationStore.cs +++ b/sdk/provisioning/Azure.Provisioning/src/appconfiguration/AppConfigurationStore.cs @@ -32,6 +32,7 @@ public AppConfigurationStore(IConstruct scope, ResourceGroup? parent = null, str location: location ?? Environment.GetEnvironmentVariable("AZURE_LOCATION") ?? AzureLocation.WestUS, skuName: "free")) { + AssignProperty(data => data.Name, GetAzureName(scope, name)); AddOutput($"{Name}_endpoint", store => store.Endpoint); } @@ -49,5 +50,8 @@ private AppConfigurationStore(IConstruct scope, ResourceGroup? parent = null, st /// The KeyVault instance. public static AppConfigurationStore FromExisting(IConstruct scope, string name, ResourceGroup? parent = null) => new AppConfigurationStore(scope, parent, name, isExisting: true); + + /// + protected override string GetAzureName(IConstruct scope, string resourceName) => GetGloballyUniqueName(resourceName); } } diff --git a/sdk/provisioning/Azure.Provisioning/src/cognitiveservices/CognitiveServicesAccount.cs b/sdk/provisioning/Azure.Provisioning/src/cognitiveservices/CognitiveServicesAccount.cs index 891cc4c11eaa..43502200b78e 100644 --- a/sdk/provisioning/Azure.Provisioning/src/cognitiveservices/CognitiveServicesAccount.cs +++ b/sdk/provisioning/Azure.Provisioning/src/cognitiveservices/CognitiveServicesAccount.cs @@ -43,6 +43,7 @@ public CognitiveServicesAccount( kind: kind ?? "OpenAI", properties: new CognitiveServicesAccountProperties())) { + AssignProperty(data => data.Name, GetAzureName(scope, name)); } private CognitiveServicesAccount( @@ -65,5 +66,8 @@ private CognitiveServicesAccount( /// The KeyVault instance. public static CognitiveServicesAccount FromExisting(IConstruct scope, string name, ResourceGroup? parent = null) => new CognitiveServicesAccount(scope, parent: parent, name: name, isExisting: true); + + /// + protected override string GetAzureName(IConstruct scope, string resourceName) => GetGloballyUniqueName(resourceName); } } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep index 079b19cdd46e..0b170622a2fe 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep @@ -14,4 +14,4 @@ module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { scope: resourceGroup_I6QNkoPsb } -output appConfigurationStore_sgecYnln3_endpoint string = rg_TEST_module.outputs.appConfigurationStore_sgecYnln3_endpoint +output appConfigurationStore_4WdTZ5u6X_endpoint string = rg_TEST_module.outputs.appConfigurationStore_4WdTZ5u6X_endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep index 12efbf2dc8b0..22e21fc1ea48 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,6 +1,6 @@ -resource appConfigurationStore_sgecYnln3 'Microsoft.AppConfiguration/configurationStores@2023-03-01' = { - name: 'store-TEST' +resource appConfigurationStore_4WdTZ5u6X 'Microsoft.AppConfiguration/configurationStores@2023-03-01' = { + name: toLower(take(concat('store', uniqueString(resourceGroup().id)), 24)) location: 'westus' sku: { name: 'free' @@ -9,4 +9,4 @@ resource appConfigurationStore_sgecYnln3 'Microsoft.AppConfiguration/configurati } } -output appConfigurationStore_sgecYnln3_endpoint string = appConfigurationStore_sgecYnln3.properties.endpoint +output appConfigurationStore_4WdTZ5u6X_endpoint string = appConfigurationStore_4WdTZ5u6X.properties.endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/CognitiveServices/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/CognitiveServices/main.bicep index 78add1260ef1..4c942ed5b507 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/CognitiveServices/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/CognitiveServices/main.bicep @@ -7,8 +7,8 @@ param location string = resourceGroup().location param publicNetworkAccess string = 'Enabled' -resource cognitiveServicesAccount_ZfMvJY5Po 'Microsoft.CognitiveServices/accounts@2023-05-01' = { - name: 'cs-TEST' +resource cognitiveServicesAccount_cNLMqn7X3 'Microsoft.CognitiveServices/accounts@2023-05-01' = { + name: toLower(take(concat('cs', uniqueString(resourceGroup().id)), 24)) location: location kind: 'OpenAI' sku: { @@ -19,8 +19,8 @@ resource cognitiveServicesAccount_ZfMvJY5Po 'Microsoft.CognitiveServices/account } } -resource cognitiveServicesAccountDeployment_JeeW2XLVR 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = { - parent: cognitiveServicesAccount_ZfMvJY5Po +resource cognitiveServicesAccountDeployment_WYhBFVWTN 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = { + parent: cognitiveServicesAccount_cNLMqn7X3 name: 'cs' sku: { name: 'S0' @@ -34,5 +34,5 @@ resource cognitiveServicesAccountDeployment_JeeW2XLVR 'Microsoft.CognitiveServic } } -output endpoint string = 'Endpoint=${cognitiveServicesAccount_ZfMvJY5Po.properties.endpoint}' -output expression string = uniqueString(cognitiveServicesAccount_ZfMvJY5Po.properties.endpoint) +output endpoint string = 'Endpoint=${cognitiveServicesAccount_cNLMqn7X3.properties.endpoint}' +output expression string = uniqueString(cognitiveServicesAccount_cNLMqn7X3.properties.endpoint)