From 057a1f5542db911657fa80211fdd109b20508f29 Mon Sep 17 00:00:00 2001 From: jolov Date: Wed, 21 Feb 2024 21:53:12 -0800 Subject: [PATCH 1/7] Save --- .../OutputsSpanningModules/main.bicep | 2 +- .../resources/rg1_TEST/rg1_TEST.bicep | 2 +- .../resources/rg_TEST/rg_TEST.bicep | 8 ++--- .../resources/rg_TEST/rg_TEST.bicep | 8 ++--- .../Infrastructure/WebSiteUsingL1/main.bicep | 4 +-- .../resources/rg_TEST/rg_TEST.bicep | 4 +-- .../Infrastructure/WebSiteUsingL2/main.bicep | 8 +++-- .../resources/rg_TEST/rg_TEST.bicep | 9 +++-- .../Infrastructure/WebSiteUsingL3/main.bicep | 4 +-- .../resources/rg_TEST/rg_TEST.bicep | 4 +-- .../tests/ProvisioningTests.cs | 36 +++++++++++++++---- .../tests/TestCommonSqlDatabase.cs | 5 +-- .../tests/TestFrontEndWebSite.cs | 5 +++ 13 files changed, 67 insertions(+), 32 deletions(-) diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep index bf86881c1597..0f9bd05871ad 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep @@ -1,7 +1,7 @@ targetScope = 'subscription' @description('Enable soft delete') -param enableSoftDelete string +param enableSoftDelete string = 'True' resource resourceGroup_AVG5HpqPz 'Microsoft.Resources/resourceGroups@2023-07-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep index cfa2927c488d..41ba3db9ce4a 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep @@ -1,5 +1,5 @@ @description('Enable soft delete') -param enableSoftDelete string +param enableSoftDelete string = 'True' @secure() @description('') diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep index 9f4f9be3da7b..db188d1a5ad8 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep @@ -1,6 +1,6 @@ -resource storageAccount_XyWBeAbL6 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacct7909f77b383a447' +resource storageAccount_8fKO55BEa 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacctc69d56d11b224fe' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,8 +10,8 @@ resource storageAccount_XyWBeAbL6 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_SduEdkgbK 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_XyWBeAbL6 +resource blobService_UWDFk5mnH 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_8fKO55BEa name: 'default' properties: { cors: { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep index 4881eebbfa24..ae7e9af07bd5 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep @@ -1,6 +1,6 @@ -resource storageAccount_F00UduuIF 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacct05f2f60511ac497' +resource storageAccount_Rx5iuerhh 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacct8cb90ee591ac46d' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,8 +10,8 @@ resource storageAccount_F00UduuIF 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_L1IVWfLBd 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_F00UduuIF +resource blobService_RdulWdFAE 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_Rx5iuerhh name: 'default' properties: { cors: { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep index de707f7ec8ff..4d90b2482690 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep @@ -2,11 +2,11 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep index 21d1f5466603..51e652ea1b60 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep @@ -1,10 +1,10 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep index de707f7ec8ff..68b744354307 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep @@ -2,11 +2,14 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' + +@description('') +param workaround string = '/subscriptions/subscription()/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { @@ -24,6 +27,7 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { params: { sqlAdminPassword: sqlAdminPassword appUserPassword: appUserPassword + workaround: workaround } } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep index 29dc24c21827..a8d5a28f25bf 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep @@ -1,10 +1,13 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' + +@description('') +param workaround string = '/subscriptions/subscription()/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { @@ -81,7 +84,7 @@ resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { } kind: 'app,linux' properties: { - serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' + serverFarmId: workaround siteConfig: { linuxFxVersion: 'node|18-lts' alwaysOn: true diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep index 9678d44aa7b7..f91f12ba44f3 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep @@ -2,11 +2,11 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep index 2c4b639bd4fb..2fa2191dec53 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep @@ -1,10 +1,10 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string +param sqlAdminPassword string = 'password' @secure() @description('Application user password') -param appUserPassword string +param appUserPassword string = 'password' resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs index a65a048ea55c..e2ccd1db006e 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs @@ -7,14 +7,19 @@ using System.IO; using System.Diagnostics; using System.Linq; +using System.Threading.Tasks; using Azure.Core.TestFramework; using Azure.Core.Tests.TestFramework; +using Azure.Identity; using Azure.Provisioning.AppService; using Azure.Provisioning.KeyVaults; using Azure.Provisioning.Sql; using Azure.Provisioning.Resources; using Azure.Provisioning.Storage; using Azure.Provisioning.AppConfiguration; +using Azure.ResourceManager; +using Azure.ResourceManager.Resources; +using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Storage.Models; namespace Azure.Provisioning.Tests @@ -28,9 +33,9 @@ public void WebSiteUsingL1() { var infra = new TestInfrastructure(); - Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true); + Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true, defaultValue: "password"); infra.AddParameter(sqlAdminPasswordParam); - Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true); + Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true, defaultValue: "password"); infra.AddParameter(appUserPasswordParam); infra.AddResourceGroup(); @@ -72,21 +77,23 @@ public void WebSiteUsingL1() } [TearDown] - public void ValidateBicep() + public async Task ValidateBicep() { if (TestEnvironment.GlobalIsRunningInCI) { return; } + var testPath = Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name); + try { - var path = Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name, "main.bicep"); + var bicepPath = Path.Combine(testPath, "main.bicep"); var args = Path.Combine( TestEnvironment.RepositoryRoot, "eng", "scripts", - $"Validate-Bicep.ps1 {path}"); + $"Validate-Bicep.ps1 {bicepPath}"); var processInfo = new ProcessStartInfo("pwsh.exe", args) { UseShellExecute = false, RedirectStandardOutput = true, RedirectStandardError = true, @@ -101,10 +108,25 @@ public void ValidateBicep() Assert.Fail(error); } } + + var client = new ArmClient(new DefaultAzureCredential()); + SubscriptionResource subscription = await client.GetSubscriptions().GetAsync(Environment.GetEnvironmentVariable("SUBSCRIPTION_ID")); + + var identifier = ArmDeploymentResource.CreateResourceIdentifier(subscription.Id, TestContext.CurrentContext.Test.Name); + var resource = client.GetArmDeploymentResource(identifier); + await resource.ValidateAsync(WaitUntil.Completed, + new ArmDeploymentContent( + new ArmDeploymentProperties(ArmDeploymentMode.Incremental) + { + Template = new BinaryData(File.ReadAllText(Path.Combine(testPath, "main.json"))), + }) + { + Location = "westus" + }); } finally { - File.Delete(Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name, "main.json")); + // File.Delete(Path.Combine(testPath, "main.json")); } } @@ -196,7 +218,7 @@ public void OutputsSpanningModules() var output2 = frontEnd1.AddOutput(data => data.Location, "LOCATION"); KeyVault keyVault = infra.AddKeyVault(resourceGroup: rg1); - keyVault.AssignParameter(data => data.Properties.EnableSoftDelete, new Parameter("enableSoftDelete", "Enable soft delete", isSecure: false)); + keyVault.AssignParameter(data => data.Properties.EnableSoftDelete, new Parameter("enableSoftDelete", "Enable soft delete", defaultValue: true, isSecure: false)); WebSite frontEnd2 = new WebSite(infra, "frontEnd", appServicePlan, WebSiteRuntime.Node, "18-lts", parent: rg2); diff --git a/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs b/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs index 538308900054..b45685586dd5 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs @@ -22,8 +22,9 @@ public TestCommonSqlDatabase(IConstruct scope, KeyVault? keyVault = null) keyVault = UseExistingResource(keyVault, () => scope.AddKeyVault(ResourceGroup)); - Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true); - Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true); + // specifying the default value for the parameters to allow the ARM validation to pass in our tests + Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true, defaultValue: "password"); + Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true, defaultValue: "password"); AddParameter(sqlAdminPasswordParam); AddParameter(appUserPasswordParam); diff --git a/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs b/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs index c9c941df81d5..bab9dd46a195 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs @@ -16,6 +16,11 @@ public TestFrontEndWebSite(IConstruct scope, KeyVault? keyVault = null, AppServi keyVault = UseExistingResource(keyVault, () => scope.AddKeyVault(ResourceGroup)); WebSite frontEnd = new WebSite(this, "frontEnd", appServicePlan, WebSiteRuntime.Node, "18-lts"); + + // frontEnd.AssignParameter( + // website => website.AppServicePlanId, + // new Parameter("workaround", defaultValue: $"resourceId('Microsoft.Web/serverfarms', {appServicePlan.Id.Name})")); + var frontEndPrincipalId = frontEnd.AddOutput( website => website.Identity.PrincipalId, "SERVICE_API_IDENTITY_PRINCIPAL_ID", From 68e7e11b3f8778823941c677946ff4559f21659b Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 22 Feb 2024 13:38:44 -0800 Subject: [PATCH 2/7] Validate bicep against ARM endpoint --- .../Azure.Provisioning/src/Construct.cs | 2 +- .../Azure.Provisioning/src/ModuleConstruct.cs | 9 ++++++++- .../Azure.Provisioning/src/Resource.cs | 2 +- .../MultipleSubscriptions/main.bicep | 20 +++++++++++++++---- .../resources/rg1_TEST/rg1_TEST.bicep | 4 ---- .../resources/rg2_TEST/rg2_TEST.bicep | 3 +-- .../resources/rg3_TEST/rg3_TEST.bicep | 4 ---- .../resources/rg_TEST/rg_TEST.bicep | 10 ++++------ .../resources/rg_TEST/rg_TEST.bicep | 10 ++++------ .../resources/rg_TEST/rg_TEST.bicep | 8 -------- .../Infrastructure/WebSiteUsingL2/main.bicep | 4 ---- .../resources/rg_TEST/rg_TEST.bicep | 13 +----------- .../resources/rg_TEST/rg_TEST.bicep | 8 -------- .../tests/ProvisioningTests.cs | 3 ++- 14 files changed, 38 insertions(+), 62 deletions(-) diff --git a/sdk/provisioning/Azure.Provisioning/src/Construct.cs b/sdk/provisioning/Azure.Provisioning/src/Construct.cs index 1c009462cd89..513acf1cad34 100644 --- a/sdk/provisioning/Azure.Provisioning/src/Construct.cs +++ b/sdk/provisioning/Azure.Provisioning/src/Construct.cs @@ -229,7 +229,7 @@ private BinaryData SerializeModule(ModelReaderWriterOptions options) foreach (var resource in GetResources(false)) { - if (resource is Tenant || resource is Subscription) + if (resource is Tenant) { continue; } diff --git a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs index d7a962e6af3a..a628ff21bd5d 100644 --- a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs +++ b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs @@ -11,7 +11,7 @@ internal class ModuleConstruct : Construct public ModuleConstruct(ModuleResource resource) : base( resource.Scope, - resource.Resource is Subscription ? resource.Resource.Name : resource.Resource.Id.Name.Replace('-', '_'), + GetScopeName(resource.Resource), ResourceToConstructScope(resource.Resource), tenant: GetTenant(resource.Resource), subscription: GetSubscription(resource.Resource), @@ -19,6 +19,13 @@ public ModuleConstruct(ModuleResource resource) { } + private static string GetScopeName(Resource resource) + { + // for subscriptions we cannot use the Id.Name as + var prefix = resource is Subscription ? resource.Name : resource.Id.Name.Replace('-', '_'); + return $"{prefix}_module"; + } + public bool IsRoot { get; set; } private static Tenant? GetTenant(Resource resource) diff --git a/sdk/provisioning/Azure.Provisioning/src/Resource.cs b/sdk/provisioning/Azure.Provisioning/src/Resource.cs index c6b782cd29bd..1109aa31ef13 100644 --- a/sdk/provisioning/Azure.Provisioning/src/Resource.cs +++ b/sdk/provisioning/Azure.Provisioning/src/Resource.cs @@ -216,7 +216,7 @@ private BinaryData SerializeModule(ModelReaderWriterOptions options) stream.WriteLine($"resource {Name} '{ResourceType}@{Version}' = {{"); - if (this.IsChildResource() && this is not DeploymentScript) + if (this.IsChildResource() && this is not DeploymentScript && this is not Subscription) { stream.WriteLine($" parent: {Parent!.Name}"); } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep index bbd8a186882d..abde52f6b3de 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep @@ -1,12 +1,24 @@ targetScope = 'tenant' -module subscription_O0vZNnri3 './resources/subscription_O0vZNnri3/subscription_O0vZNnri3.bicep' = { - name: 'subscription_O0vZNnri3' +resource subscription_O0vZNnri3 'Microsoft.Resources/subscriptions@2022-12-01' = { + id: '/subscriptions/8286d046-9740-a3e4-95cf-ff46699c73c4' + subscriptionId: '8286d046-9740-a3e4-95cf-ff46699c73c4' + tenantId: '00000000-0000-0000-0000-000000000000' +} + +resource subscription_i7MQMw1U7 'Microsoft.Resources/subscriptions@2022-12-01' = { + id: '/subscriptions/3410cda1-5b13-a34e-6f84-a54adf7a0ea0' + subscriptionId: '3410cda1-5b13-a34e-6f84-a54adf7a0ea0' + tenantId: '00000000-0000-0000-0000-000000000000' +} + +module subscription_O0vZNnri3_module './resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep' = { + name: 'subscription_O0vZNnri3_module' scope: subscription('subscription_O0vZNnri3') } -module subscription_i7MQMw1U7 './resources/subscription_i7MQMw1U7/subscription_i7MQMw1U7.bicep' = { - name: 'subscription_i7MQMw1U7' +module subscription_i7MQMw1U7_module './resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep' = { + name: 'subscription_i7MQMw1U7_module' scope: subscription('subscription_i7MQMw1U7') } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep index 41ba3db9ce4a..fea43db57942 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep @@ -20,8 +20,6 @@ resource appServicePlan_viooTTlOI 'Microsoft.Web/serverfarms@2021-02-01' = { resource webSite_dOTaZfna6 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -29,8 +27,6 @@ resource webSite_dOTaZfna6 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep index d78c76e04601..6fd9d14deae9 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep @@ -6,6 +6,7 @@ resource webSite_80I4ejz5T 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' identity: { + principalId: STORAGE_PRINCIPAL_ID } kind: 'app,linux' properties: { @@ -14,8 +15,6 @@ resource webSite_80I4ejz5T 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep index 3e6eecdefdca..935c5394002d 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep @@ -2,8 +2,6 @@ resource webSite_Y34mQ7HgU 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -11,8 +9,6 @@ resource webSite_Y34mQ7HgU 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep index db188d1a5ad8..01cb4a9bc866 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep @@ -1,6 +1,6 @@ -resource storageAccount_8fKO55BEa 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacctc69d56d11b224fe' +resource storageAccount_lhz250vzx 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacct0be0d45f98a343c' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,11 +10,9 @@ resource storageAccount_8fKO55BEa 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_UWDFk5mnH 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_8fKO55BEa +resource blobService_JBIiUqDdA 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_lhz250vzx name: 'default' properties: { - cors: { - } } } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep index ae7e9af07bd5..cfdb00be866a 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep @@ -1,6 +1,6 @@ -resource storageAccount_Rx5iuerhh 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacct8cb90ee591ac46d' +resource storageAccount_uVkMHo5HI 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacctedca28ca81d643d' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,12 +10,10 @@ resource storageAccount_Rx5iuerhh 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_RdulWdFAE 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_Rx5iuerhh +resource blobService_z01YdOOpK 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_uVkMHo5HI name: 'default' properties: { - cors: { - } deleteRetentionPolicy: { enabled: true } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep index 51e652ea1b60..e6a5abefd98d 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep @@ -21,8 +21,6 @@ resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -30,8 +28,6 @@ resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' @@ -213,8 +209,6 @@ SCRIPT_END resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { name: 'backEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -222,8 +216,6 @@ resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'dotnetcore|6.0' alwaysOn: true appCommandLine: '' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep index 68b744354307..4d90b2482690 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep @@ -8,9 +8,6 @@ param sqlAdminPassword string = 'password' @description('Application user password') param appUserPassword string = 'password' -@description('') -param workaround string = '/subscriptions/subscription()/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' - resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { name: 'rg-TEST' @@ -27,7 +24,6 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { params: { sqlAdminPassword: sqlAdminPassword appUserPassword: appUserPassword - workaround: workaround } } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep index a8d5a28f25bf..cb0f01a5fff9 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep @@ -6,9 +6,6 @@ param sqlAdminPassword string = 'password' @description('Application user password') param appUserPassword string = 'password' -@description('') -param workaround string = '/subscriptions/subscription()/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' - resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { name: 'appServicePlan-TEST' @@ -80,17 +77,13 @@ resource keyVaultSecret_7eiFxkj0r 'Microsoft.KeyVault/vaults/secrets@2023-02-01' resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { - serverFarmId: workaround + serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' siteConfig: { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' @@ -216,8 +209,6 @@ SCRIPT_END resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { name: 'backEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -225,8 +216,6 @@ resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'dotnetcore|6.0' alwaysOn: true appCommandLine: '' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep index 2fa2191dec53..ef87eafde18b 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep @@ -80,8 +80,6 @@ resource keyVaultSecret_7eiFxkj0r 'Microsoft.KeyVault/vaults/secrets@2023-02-01' resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { name: 'frontEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -89,8 +87,6 @@ resource webSite_W5EweSXEq 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'node|18-lts' alwaysOn: true appCommandLine: './entrypoint.sh -o ./env-config.js && pm2 serve /home/site/wwwroot --no-daemon --spa' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' @@ -216,8 +212,6 @@ SCRIPT_END resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { name: 'backEnd-TEST' location: 'westus' - identity: { - } kind: 'app,linux' properties: { serverFarmId: '/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-TEST/providers/Microsoft.Web/serverfarms/appServicePlan-TEST' @@ -225,8 +219,6 @@ resource webSite_4pzZqR2OO 'Microsoft.Web/sites@2021-02-01' = { linuxFxVersion: 'dotnetcore|6.0' alwaysOn: true appCommandLine: '' - experiments: { - } cors: { allowedOrigins: [ 'https://portal.azure.com' diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs index e2ccd1db006e..462482c0fad7 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs @@ -126,7 +126,7 @@ await resource.ValidateAsync(WaitUntil.Completed, } finally { - // File.Delete(Path.Combine(testPath, "main.json")); + File.Delete(Path.Combine(testPath, "main.json")); } } @@ -192,6 +192,7 @@ public void AppConfiguration() } [Test] + [Ignore("Multiple subscriptions are not fully supported yet. https://github.com/Azure/azure-sdk-for-net/issues/42146")] public void MultipleSubscriptions() { // ensure deterministic subscription names and directories From 0f43a18273225c29f313e054dbe3359ed8bdfd7c Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 22 Feb 2024 13:42:14 -0800 Subject: [PATCH 3/7] revert workaround --- .../Azure.Provisioning/tests/TestFrontEndWebSite.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs b/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs index bab9dd46a195..903ebf211be9 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/TestFrontEndWebSite.cs @@ -17,10 +17,6 @@ public TestFrontEndWebSite(IConstruct scope, KeyVault? keyVault = null, AppServi WebSite frontEnd = new WebSite(this, "frontEnd", appServicePlan, WebSiteRuntime.Node, "18-lts"); - // frontEnd.AssignParameter( - // website => website.AppServicePlanId, - // new Parameter("workaround", defaultValue: $"resourceId('Microsoft.Web/serverfarms', {appServicePlan.Id.Name})")); - var frontEndPrincipalId = frontEnd.AddOutput( website => website.Identity.PrincipalId, "SERVICE_API_IDENTITY_PRINCIPAL_ID", From 7e4f6d77d47158755c68f621ee0784e9123ec334 Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 22 Feb 2024 13:49:24 -0800 Subject: [PATCH 4/7] trailing space --- sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs index a628ff21bd5d..1e100da5bef3 100644 --- a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs +++ b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs @@ -21,7 +21,7 @@ public ModuleConstruct(ModuleResource resource) private static string GetScopeName(Resource resource) { - // for subscriptions we cannot use the Id.Name as + // for subscriptions we cannot use the Id.Name as var prefix = resource is Subscription ? resource.Name : resource.Id.Name.Replace('-', '_'); return $"{prefix}_module"; } From ed8d7485d7f02b8d686febfe34594173284237df Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 22 Feb 2024 20:17:30 -0800 Subject: [PATCH 5/7] Pass parameters in Validate call --- .../AppConfiguration/main.bicep | 6 +- .../rg_TEST_module.bicep} | 0 .../tests/Infrastructure/MoveNext/main.bicep | 17 ++ .../rg_TEST_module/rg_TEST_module.bicep | 12 ++ .../MultipleSubscriptions/main.bicep | 24 --- .../subscription_O0vZNnri3.bicep | 10 -- .../subscription_i7MQMw1U7.bicep | 10 -- .../OutputsSpanningModules/main.bicep | 24 +-- .../rg1_TEST_module.bicep} | 0 .../rg2_TEST_module.bicep} | 0 .../rg3_TEST_module.bicep} | 0 .../StorageBlobDefaults/main.bicep | 4 +- .../resources/rg_TEST/rg_TEST.bicep | 18 --- .../rg_TEST_module/rg_TEST_module.bicep | 18 +++ .../StorageBlobDropDown/main.bicep | 4 +- .../rg_TEST_module.bicep} | 8 +- .../Infrastructure/WebSiteUsingL1/main.bicep | 12 +- .../rg_TEST_module.bicep} | 4 +- .../Infrastructure/WebSiteUsingL2/main.bicep | 8 +- .../rg_TEST_module.bicep} | 0 .../Infrastructure/WebSiteUsingL3/main.bicep | 8 +- .../rg_TEST_module.bicep} | 0 .../tests/ProvisioningTests.cs | 153 ++++++++++-------- 23 files changed, 173 insertions(+), 167 deletions(-) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/{rg_TEST/rg_TEST.bicep => rg_TEST_module/rg_TEST_module.bicep} (100%) create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3/subscription_O0vZNnri3.bicep delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7/subscription_i7MQMw1U7.bicep rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/{rg1_TEST/rg1_TEST.bicep => rg1_TEST_module/rg1_TEST_module.bicep} (100%) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/{rg2_TEST/rg2_TEST.bicep => rg2_TEST_module/rg2_TEST_module.bicep} (100%) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/{rg3_TEST/rg3_TEST.bicep => rg3_TEST_module/rg3_TEST_module.bicep} (100%) delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/{rg_TEST/rg_TEST.bicep => rg_TEST_module/rg_TEST_module.bicep} (55%) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/{rg_TEST/rg_TEST.bicep => rg_TEST_module/rg_TEST_module.bicep} (98%) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/{rg_TEST/rg_TEST.bicep => rg_TEST_module/rg_TEST_module.bicep} (100%) rename sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/{rg_TEST/rg_TEST.bicep => rg_TEST_module/rg_TEST_module.bicep} (100%) diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep index 163f0ff9d1c2..079b19cdd46e 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/main.bicep @@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb } -output appConfigurationStore_sgecYnln3_endpoint string = rg_TEST.outputs.appConfigurationStore_sgecYnln3_endpoint +output appConfigurationStore_sgecYnln3_endpoint string = rg_TEST_module.outputs.appConfigurationStore_sgecYnln3_endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST/rg_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/AppConfiguration/resources/rg_TEST_module/rg_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep new file mode 100644 index 000000000000..079b19cdd46e --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep @@ -0,0 +1,17 @@ +targetScope = 'subscription' + + +resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { + name: 'rg-TEST' + location: 'westus' + tags: { + 'azd-env-name': 'TEST' + } +} + +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' + scope: resourceGroup_I6QNkoPsb +} + +output appConfigurationStore_sgecYnln3_endpoint string = rg_TEST_module.outputs.appConfigurationStore_sgecYnln3_endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep new file mode 100644 index 000000000000..12efbf2dc8b0 --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep @@ -0,0 +1,12 @@ + +resource appConfigurationStore_sgecYnln3 'Microsoft.AppConfiguration/configurationStores@2023-03-01' = { + name: 'store-TEST' + location: 'westus' + sku: { + name: 'free' + } + properties: { + } +} + +output appConfigurationStore_sgecYnln3_endpoint string = appConfigurationStore_sgecYnln3.properties.endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep deleted file mode 100644 index abde52f6b3de..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep +++ /dev/null @@ -1,24 +0,0 @@ -targetScope = 'tenant' - - -resource subscription_O0vZNnri3 'Microsoft.Resources/subscriptions@2022-12-01' = { - id: '/subscriptions/8286d046-9740-a3e4-95cf-ff46699c73c4' - subscriptionId: '8286d046-9740-a3e4-95cf-ff46699c73c4' - tenantId: '00000000-0000-0000-0000-000000000000' -} - -resource subscription_i7MQMw1U7 'Microsoft.Resources/subscriptions@2022-12-01' = { - id: '/subscriptions/3410cda1-5b13-a34e-6f84-a54adf7a0ea0' - subscriptionId: '3410cda1-5b13-a34e-6f84-a54adf7a0ea0' - tenantId: '00000000-0000-0000-0000-000000000000' -} - -module subscription_O0vZNnri3_module './resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep' = { - name: 'subscription_O0vZNnri3_module' - scope: subscription('subscription_O0vZNnri3') -} - -module subscription_i7MQMw1U7_module './resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep' = { - name: 'subscription_i7MQMw1U7_module' - scope: subscription('subscription_i7MQMw1U7') -} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3/subscription_O0vZNnri3.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3/subscription_O0vZNnri3.bicep deleted file mode 100644 index ebb9a61118ab..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3/subscription_O0vZNnri3.bicep +++ /dev/null @@ -1,10 +0,0 @@ -targetScope = 'subscription' - - -resource resourceGroup_grHjXx8QF 'Microsoft.Resources/resourceGroups@2023-07-01' = { - name: 'rg-TEST' - location: 'westus' - tags: { - 'azd-env-name': 'TEST' - } -} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7/subscription_i7MQMw1U7.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7/subscription_i7MQMw1U7.bicep deleted file mode 100644 index 34344c2dc39a..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7/subscription_i7MQMw1U7.bicep +++ /dev/null @@ -1,10 +0,0 @@ -targetScope = 'subscription' - - -resource resourceGroup_U95xWHMzX 'Microsoft.Resources/resourceGroups@2023-07-01' = { - name: 'rg-TEST' - location: 'westus' - tags: { - 'azd-env-name': 'TEST' - } -} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep index 0f9bd05871ad..96ff62d3a80e 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep @@ -28,29 +28,29 @@ resource resourceGroup_Q4i0lpa1h 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg1_TEST './resources/rg1_TEST/rg1_TEST.bicep' = { - name: 'rg1_TEST' +module rg1_TEST_module './resources/rg1_TEST_module/rg1_TEST_module.bicep' = { + name: 'rg1_TEST_module' scope: resourceGroup_AVG5HpqPz params: { enableSoftDelete: enableSoftDelete - SERVICE_API_IDENTITY_PRINCIPAL_ID: rg3_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID + SERVICE_API_IDENTITY_PRINCIPAL_ID: rg3_TEST_module.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID } } -module rg2_TEST './resources/rg2_TEST/rg2_TEST.bicep' = { - name: 'rg2_TEST' +module rg2_TEST_module './resources/rg2_TEST_module/rg2_TEST_module.bicep' = { + name: 'rg2_TEST_module' scope: resourceGroup_hu2r8JaSi params: { - STORAGE_PRINCIPAL_ID: rg1_TEST.outputs.STORAGE_PRINCIPAL_ID + STORAGE_PRINCIPAL_ID: rg1_TEST_module.outputs.STORAGE_PRINCIPAL_ID } } -module rg3_TEST './resources/rg3_TEST/rg3_TEST.bicep' = { - name: 'rg3_TEST' +module rg3_TEST_module './resources/rg3_TEST_module/rg3_TEST_module.bicep' = { + name: 'rg3_TEST_module' scope: resourceGroup_Q4i0lpa1h } -output STORAGE_PRINCIPAL_ID string = rg1_TEST.outputs.STORAGE_PRINCIPAL_ID -output LOCATION string = rg1_TEST.outputs.LOCATION -output vaultUri string = rg1_TEST.outputs.vaultUri -output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg3_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID +output STORAGE_PRINCIPAL_ID string = rg1_TEST_module.outputs.STORAGE_PRINCIPAL_ID +output LOCATION string = rg1_TEST_module.outputs.LOCATION +output vaultUri string = rg1_TEST_module.outputs.vaultUri +output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg3_TEST_module.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST_module/rg1_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST_module/rg1_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST_module/rg2_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST/rg2_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg2_TEST_module/rg2_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST_module/rg3_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST/rg3_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg3_TEST_module/rg3_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep index da7e83d582e0..136bc7020567 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep @@ -9,7 +9,7 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep deleted file mode 100644 index 01cb4a9bc866..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep +++ /dev/null @@ -1,18 +0,0 @@ - -resource storageAccount_lhz250vzx 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacct0be0d45f98a343c' - location: 'westus' - sku: { - name: 'Premium_LRS' - } - kind: 'StorageV2' - properties: { - } -} - -resource blobService_JBIiUqDdA 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_lhz250vzx - name: 'default' - properties: { - } -} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep new file mode 100644 index 000000000000..27ca58eca2ff --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep @@ -0,0 +1,18 @@ + +resource storageAccount_HyirDMZoD 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacct061c8f62f9864b9' + location: 'westus' + sku: { + name: 'Premium_LRS' + } + kind: 'StorageV2' + properties: { + } +} + +resource blobService_7r8FxNxCI 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_HyirDMZoD + name: 'default' + properties: { + } +} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep index da7e83d582e0..136bc7020567 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep @@ -9,7 +9,7 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep similarity index 55% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep index cfdb00be866a..b4bb374fea5f 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,6 +1,6 @@ -resource storageAccount_uVkMHo5HI 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacctedca28ca81d643d' +resource storageAccount_G59l5B2rB 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacctbc21bc86b39b414' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,8 +10,8 @@ resource storageAccount_uVkMHo5HI 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_z01YdOOpK 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_uVkMHo5HI +resource blobService_H0uNWDEc2 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_G59l5B2rB name: 'default' properties: { deleteRetentionPolicy: { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep index 4d90b2482690..fd23a848138b 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep @@ -2,11 +2,11 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { @@ -18,8 +18,8 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb params: { sqlAdminPassword: sqlAdminPassword @@ -27,5 +27,5 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { } } -output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID -output vaultUri string = rg_TEST.outputs.vaultUri +output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST_module.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID +output vaultUri string = rg_TEST_module.outputs.vaultUri diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST_module/rg_TEST_module.bicep similarity index 98% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST_module/rg_TEST_module.bicep index e6a5abefd98d..07b502fac695 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,10 +1,10 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep index 4d90b2482690..94848bc983ce 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep @@ -18,8 +18,8 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb params: { sqlAdminPassword: sqlAdminPassword @@ -27,5 +27,5 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { } } -output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID -output vaultUri string = rg_TEST.outputs.vaultUri +output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST_module.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID +output vaultUri string = rg_TEST_module.outputs.vaultUri diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep index f91f12ba44f3..d26cc79fe8eb 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep @@ -18,8 +18,8 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' } } -module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { - name: 'rg_TEST' +module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { + name: 'rg_TEST_module' scope: resourceGroup_I6QNkoPsb params: { sqlAdminPassword: sqlAdminPassword @@ -27,5 +27,5 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = { } } -output vaultUri string = rg_TEST.outputs.vaultUri -output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID +output vaultUri string = rg_TEST_module.outputs.vaultUri +output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST_module.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep similarity index 100% rename from sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep rename to sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs index 462482c0fad7..b3bc0c90a5c3 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs @@ -29,13 +29,13 @@ public class ProvisioningTests private static readonly string _infrastructureRoot = Path.Combine(GetGitRoot(), "sdk", "provisioning", "Azure.Provisioning", "tests", "Infrastructure"); [Test] - public void WebSiteUsingL1() + public async Task WebSiteUsingL1() { var infra = new TestInfrastructure(); - Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true, defaultValue: "password"); + Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true); infra.AddParameter(sqlAdminPasswordParam); - Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true, defaultValue: "password"); + Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true); infra.AddParameter(appUserPasswordParam); infra.AddResourceGroup(); @@ -74,72 +74,27 @@ public void WebSiteUsingL1() WebSiteConfigLogs logs = new WebSiteConfigLogs(infra, "logs", frontEnd); infra.Build(GetOutputPath()); - } - - [TearDown] - public async Task ValidateBicep() - { - if (TestEnvironment.GlobalIsRunningInCI) - { - return; - } - var testPath = Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name); - - try - { - var bicepPath = Path.Combine(testPath, "main.bicep"); - var args = Path.Combine( - TestEnvironment.RepositoryRoot, - "eng", - "scripts", - $"Validate-Bicep.ps1 {bicepPath}"); - var processInfo = new ProcessStartInfo("pwsh.exe", args) - { - UseShellExecute = false, RedirectStandardOutput = true, RedirectStandardError = true, - }; - var process = Process.Start(processInfo); - while (!process!.HasExited && !process!.StandardError.EndOfStream) + await ValidateBicepAsync(BinaryData.FromObjectAsJson( + new { - var error = process.StandardError.ReadLine(); - TestContext.Progress.WriteLine(error); - if (error!.StartsWith("ERROR")) - { - Assert.Fail(error); - } - } - - var client = new ArmClient(new DefaultAzureCredential()); - SubscriptionResource subscription = await client.GetSubscriptions().GetAsync(Environment.GetEnvironmentVariable("SUBSCRIPTION_ID")); - - var identifier = ArmDeploymentResource.CreateResourceIdentifier(subscription.Id, TestContext.CurrentContext.Test.Name); - var resource = client.GetArmDeploymentResource(identifier); - await resource.ValidateAsync(WaitUntil.Completed, - new ArmDeploymentContent( - new ArmDeploymentProperties(ArmDeploymentMode.Incremental) - { - Template = new BinaryData(File.ReadAllText(Path.Combine(testPath, "main.json"))), - }) - { - Location = "westus" - }); - } - finally - { - File.Delete(Path.Combine(testPath, "main.json")); - } + sqlAdminPassword = new { value = "password" }, + appUserPassword = new { value = "password" } + })); } [Test] - public void ResourceGroupOnly() + public async Task ResourceGroupOnly() { TestInfrastructure infrastructure = new TestInfrastructure(); var resourceGroup = infrastructure.AddResourceGroup(); infrastructure.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - public void WebSiteUsingL2() + public async Task WebSiteUsingL2() { var infra = new TestInfrastructure(); infra.AddFrontEndWebSite(); @@ -148,10 +103,12 @@ public void WebSiteUsingL2() infra.GetSingleResource()!.Properties.Tags.Add("key", "value"); infra.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - public void WebSiteUsingL3() + public async Task WebSiteUsingL3() { var infra = new TestInfrastructure(); infra.AddWebSiteWithSqlBackEnd(); @@ -159,19 +116,23 @@ public void WebSiteUsingL3() infra.GetSingleResource()!.Properties.Tags.Add("key", "value"); infra.GetSingleResourceInScope()!.Properties.Tags.Add("key", "value"); infra.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - public void StorageBlobDefaults() + public async Task StorageBlobDefaults() { var infra = new TestInfrastructure(); infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage); infra.AddBlobService(); infra.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - public void StorageBlobDropDown() + public async Task StorageBlobDropDown() { var infra = new TestInfrastructure(); infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage); @@ -181,18 +142,21 @@ public void StorageBlobDropDown() IsEnabled = true }; infra.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - public void AppConfiguration() + public async Task AppConfiguration() { var infra = new TestInfrastructure(); infra.AddAppConfigurationStore(); infra.Build(GetOutputPath()); + + await ValidateBicepAsync(); } [Test] - [Ignore("Multiple subscriptions are not fully supported yet. https://github.com/Azure/azure-sdk-for-net/issues/42146")] public void MultipleSubscriptions() { // ensure deterministic subscription names and directories @@ -203,10 +167,13 @@ public void MultipleSubscriptions() _ = new ResourceGroup(infra, parent: sub1); _ = new ResourceGroup(infra, parent: sub2); infra.Build(GetOutputPath()); + + // Multiple subscriptions are not fully supported yet. https://github.com/Azure/azure-sdk-for-net/issues/42146 + // await ValidateBicepAsync(); } [Test] - public void OutputsSpanningModules() + public async Task OutputsSpanningModules() { var infra = new TestInfrastructure(); var rg1 = new ResourceGroup(infra, "rg1"); @@ -233,6 +200,62 @@ public void OutputsSpanningModules() Assert.AreEqual(0, testFrontEndWebSite.GetParameters().Count()); Assert.AreEqual(1, testFrontEndWebSite.GetOutputs().Count()); + + await ValidateBicepAsync(); + } + + public async Task ValidateBicepAsync(BinaryData? parameters = null) + { + if (TestEnvironment.GlobalIsRunningInCI) + { + return; + } + + var testPath = Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name); + + try + { + var bicepPath = Path.Combine(testPath, "main.bicep"); + var args = Path.Combine( + TestEnvironment.RepositoryRoot, + "eng", + "scripts", + $"Validate-Bicep.ps1 {bicepPath}"); + var processInfo = new ProcessStartInfo("pwsh.exe", args) + { + UseShellExecute = false, RedirectStandardOutput = true, RedirectStandardError = true, + }; + var process = Process.Start(processInfo); + while (!process!.HasExited && !process!.StandardError.EndOfStream) + { + var error = process.StandardError.ReadLine(); + TestContext.Progress.WriteLine(error); + if (error!.StartsWith("ERROR")) + { + Assert.Fail(error); + } + } + + var client = new ArmClient(new DefaultAzureCredential()); + SubscriptionResource subscription = await client.GetSubscriptions().GetAsync(Environment.GetEnvironmentVariable("SUBSCRIPTION_ID")); + + var identifier = ArmDeploymentResource.CreateResourceIdentifier(subscription.Id, TestContext.CurrentContext.Test.Name); + var resource = client.GetArmDeploymentResource(identifier); + await resource.ValidateAsync(WaitUntil.Completed, + new ArmDeploymentContent( + new ArmDeploymentProperties(ArmDeploymentMode.Incremental) + { + Template = new BinaryData(File.ReadAllText(Path.Combine(testPath, "main.json"))), + Parameters = parameters + }) + { + Location = "westus" + }); + } + finally + { + File.Delete(Path.Combine(testPath, "main.json")); + } } private static string GetGitRoot() @@ -264,9 +287,7 @@ private static string GetGitRoot() private string GetOutputPath() { - StackTrace stackTrace = new StackTrace(); - StackFrame stackFrame = stackTrace.GetFrame(1)!; - string output = Path.Combine(_infrastructureRoot, stackFrame.GetMethod()!.Name); + string output = Path.Combine(_infrastructureRoot, TestContext.CurrentContext.Test.Name); if (!Directory.Exists(output)) { Directory.CreateDirectory(output); From d5a3bfe3b0f63f5121f2168c123627b11fe0b349 Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 22 Feb 2024 20:18:35 -0800 Subject: [PATCH 6/7] remove comment --- sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs index 1e100da5bef3..ed60f095e2f0 100644 --- a/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs +++ b/sdk/provisioning/Azure.Provisioning/src/ModuleConstruct.cs @@ -21,7 +21,6 @@ public ModuleConstruct(ModuleResource resource) private static string GetScopeName(Resource resource) { - // for subscriptions we cannot use the Id.Name as var prefix = resource is Subscription ? resource.Name : resource.Id.Name.Replace('-', '_'); return $"{prefix}_module"; } From a0b9c84ae4fc45784a8d81cca24ecf75f327eea9 Mon Sep 17 00:00:00 2001 From: jolov Date: Fri, 23 Feb 2024 00:04:23 -0800 Subject: [PATCH 7/7] fix tests --- .../tests/Infrastructure/MoveNext/main.bicep | 17 ------------- .../rg_TEST_module/rg_TEST_module.bicep | 12 ---------- .../MultipleSubscriptions/main.bicep | 24 +++++++++++++++++++ .../subscription_O0vZNnri3_module.bicep | 10 ++++++++ .../subscription_i7MQMw1U7_module.bicep | 10 ++++++++ .../rg_TEST_module/rg_TEST_module.bicep | 8 +++---- .../rg_TEST_module/rg_TEST_module.bicep | 8 +++---- .../Infrastructure/WebSiteUsingL2/main.bicep | 4 ++-- .../rg_TEST_module/rg_TEST_module.bicep | 4 ++-- .../Infrastructure/WebSiteUsingL3/main.bicep | 4 ++-- .../rg_TEST_module/rg_TEST_module.bicep | 4 ++-- .../tests/ProvisioningTests.cs | 14 +++++++++-- .../tests/TestCommonSqlDatabase.cs | 5 ++-- 13 files changed, 74 insertions(+), 50 deletions(-) delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep delete mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep create mode 100644 sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep deleted file mode 100644 index 079b19cdd46e..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/main.bicep +++ /dev/null @@ -1,17 +0,0 @@ -targetScope = 'subscription' - - -resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { - name: 'rg-TEST' - location: 'westus' - tags: { - 'azd-env-name': 'TEST' - } -} - -module rg_TEST_module './resources/rg_TEST_module/rg_TEST_module.bicep' = { - name: 'rg_TEST_module' - scope: resourceGroup_I6QNkoPsb -} - -output appConfigurationStore_sgecYnln3_endpoint string = rg_TEST_module.outputs.appConfigurationStore_sgecYnln3_endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep deleted file mode 100644 index 12efbf2dc8b0..000000000000 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MoveNext/resources/rg_TEST_module/rg_TEST_module.bicep +++ /dev/null @@ -1,12 +0,0 @@ - -resource appConfigurationStore_sgecYnln3 'Microsoft.AppConfiguration/configurationStores@2023-03-01' = { - name: 'store-TEST' - location: 'westus' - sku: { - name: 'free' - } - properties: { - } -} - -output appConfigurationStore_sgecYnln3_endpoint string = appConfigurationStore_sgecYnln3.properties.endpoint diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep new file mode 100644 index 000000000000..abde52f6b3de --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/main.bicep @@ -0,0 +1,24 @@ +targetScope = 'tenant' + + +resource subscription_O0vZNnri3 'Microsoft.Resources/subscriptions@2022-12-01' = { + id: '/subscriptions/8286d046-9740-a3e4-95cf-ff46699c73c4' + subscriptionId: '8286d046-9740-a3e4-95cf-ff46699c73c4' + tenantId: '00000000-0000-0000-0000-000000000000' +} + +resource subscription_i7MQMw1U7 'Microsoft.Resources/subscriptions@2022-12-01' = { + id: '/subscriptions/3410cda1-5b13-a34e-6f84-a54adf7a0ea0' + subscriptionId: '3410cda1-5b13-a34e-6f84-a54adf7a0ea0' + tenantId: '00000000-0000-0000-0000-000000000000' +} + +module subscription_O0vZNnri3_module './resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep' = { + name: 'subscription_O0vZNnri3_module' + scope: subscription('subscription_O0vZNnri3') +} + +module subscription_i7MQMw1U7_module './resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep' = { + name: 'subscription_i7MQMw1U7_module' + scope: subscription('subscription_i7MQMw1U7') +} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep new file mode 100644 index 000000000000..ebb9a61118ab --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_O0vZNnri3_module/subscription_O0vZNnri3_module.bicep @@ -0,0 +1,10 @@ +targetScope = 'subscription' + + +resource resourceGroup_grHjXx8QF 'Microsoft.Resources/resourceGroups@2023-07-01' = { + name: 'rg-TEST' + location: 'westus' + tags: { + 'azd-env-name': 'TEST' + } +} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep new file mode 100644 index 000000000000..34344c2dc39a --- /dev/null +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/MultipleSubscriptions/resources/subscription_i7MQMw1U7_module/subscription_i7MQMw1U7_module.bicep @@ -0,0 +1,10 @@ +targetScope = 'subscription' + + +resource resourceGroup_U95xWHMzX 'Microsoft.Resources/resourceGroups@2023-07-01' = { + name: 'rg-TEST' + location: 'westus' + tags: { + 'azd-env-name': 'TEST' + } +} diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep index 27ca58eca2ff..82d658009d3b 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,6 +1,6 @@ -resource storageAccount_HyirDMZoD 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacct061c8f62f9864b9' +resource storageAccount_nyqKj4fVa 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacct783bf4edd65646e' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,8 +10,8 @@ resource storageAccount_HyirDMZoD 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_7r8FxNxCI 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_HyirDMZoD +resource blobService_CjbeMfMgo 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_nyqKj4fVa name: 'default' properties: { } diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep index b4bb374fea5f..c935bdba2308 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,6 +1,6 @@ -resource storageAccount_G59l5B2rB 'Microsoft.Storage/storageAccounts@2022-09-01' = { - name: 'photoacctbc21bc86b39b414' +resource storageAccount_PdjzkDDBx 'Microsoft.Storage/storageAccounts@2022-09-01' = { + name: 'photoacct1434f94e82d1418' location: 'westus' sku: { name: 'Premium_LRS' @@ -10,8 +10,8 @@ resource storageAccount_G59l5B2rB 'Microsoft.Storage/storageAccounts@2022-09-01' } } -resource blobService_H0uNWDEc2 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { - parent: storageAccount_G59l5B2rB +resource blobService_uNPuvG8H2 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = { + parent: storageAccount_PdjzkDDBx name: 'default' properties: { deleteRetentionPolicy: { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep index 94848bc983ce..fd23a848138b 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep @@ -2,11 +2,11 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep index cb0f01a5fff9..d76769bb7ecd 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,10 +1,10 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep index d26cc79fe8eb..37563c6295b4 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep @@ -2,11 +2,11 @@ targetScope = 'subscription' @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep index ef87eafde18b..0a06ea2fd14d 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep +++ b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST_module/rg_TEST_module.bicep @@ -1,10 +1,10 @@ @secure() @description('SQL Server administrator password') -param sqlAdminPassword string = 'password' +param sqlAdminPassword string @secure() @description('Application user password') -param appUserPassword string = 'password' +param appUserPassword string resource appServicePlan_kjMZSF1FP 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs index b3bc0c90a5c3..c55f7f06261f 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs @@ -104,7 +104,12 @@ public async Task WebSiteUsingL2() infra.GetSingleResource()!.Properties.Tags.Add("key", "value"); infra.Build(GetOutputPath()); - await ValidateBicepAsync(); + await ValidateBicepAsync(BinaryData.FromObjectAsJson( + new + { + sqlAdminPassword = new { value = "password" }, + appUserPassword = new { value = "password" } + })); } [Test] @@ -117,7 +122,12 @@ public async Task WebSiteUsingL3() infra.GetSingleResourceInScope()!.Properties.Tags.Add("key", "value"); infra.Build(GetOutputPath()); - await ValidateBicepAsync(); + await ValidateBicepAsync(BinaryData.FromObjectAsJson( + new + { + sqlAdminPassword = new { value = "password" }, + appUserPassword = new { value = "password" } + })); } [Test] diff --git a/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs b/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs index b45685586dd5..538308900054 100644 --- a/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs +++ b/sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs @@ -22,9 +22,8 @@ public TestCommonSqlDatabase(IConstruct scope, KeyVault? keyVault = null) keyVault = UseExistingResource(keyVault, () => scope.AddKeyVault(ResourceGroup)); - // specifying the default value for the parameters to allow the ARM validation to pass in our tests - Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true, defaultValue: "password"); - Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true, defaultValue: "password"); + Parameter sqlAdminPasswordParam = new Parameter("sqlAdminPassword", "SQL Server administrator password", isSecure: true); + Parameter appUserPasswordParam = new Parameter("appUserPassword", "Application user password", isSecure: true); AddParameter(sqlAdminPasswordParam); AddParameter(appUserPasswordParam);