Update snapshots for Hosting.Azure tests

captainsafia · captainsafia · commit 084578d2e65e · 2025-12-05T13:14:43.000-08:00
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.MultipleAzureAppServiceEnvironmentsSupported.verified.json b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.MultipleAzureAppServiceEnvironmentsSupported.verified.json
@@ -1,10 +1,6 @@
 ﻿{
   "$schema": "https://json.schemastore.org/aspire-8.0.json",
   "resources": {
-    "env1-acr": {
-      "type": "azure.bicep.v0",
-      "path": "env1-acr.module.bicep"
-    },
     "env1": {
       "type": "azure.bicep.v0",
       "path": "env1.module.bicep",
@@ -13,10 +9,6 @@
         "userPrincipalId": ""
       }
     },
-    "env2-acr": {
-      "type": "azure.bicep.v0",
-      "path": "env2-acr.module.bicep"
-    },
     "env2": {
       "type": "azure.bicep.v0",
       "path": "env2.module.bicep",
@@ -102,6 +94,14 @@
           "external": true
         }
       }
+    },
+    "env1-acr": {
+      "type": "azure.bicep.v0",
+      "path": "env1-acr.module.bicep"
+    },
+    "env2-acr": {
+      "type": "azure.bicep.v0",
+      "path": "env2-acr.module.bicep"
     }
   }
 }
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureContainerAppsTests.MultipleAzureContainerAppEnvironmentsSupported.verified.json b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureContainerAppsTests.MultipleAzureContainerAppEnvironmentsSupported.verified.json
@@ -9,10 +9,6 @@
         "userPrincipalId": ""
       }
     },
-    "env1-acr": {
-      "type": "azure.bicep.v0",
-      "path": "env1-acr.module.bicep"
-    },
     "env2": {
       "type": "azure.bicep.v0",
       "path": "env2.module.bicep",
@@ -21,10 +17,6 @@
         "userPrincipalId": ""
       }
     },
-    "env2-acr": {
-      "type": "azure.bicep.v0",
-      "path": "env2-acr.module.bicep"
-    },
     "api1": {
       "type": "container.v1",
       "image": "myimage:latest",
@@ -48,6 +40,14 @@
           "env2_outputs_azure_container_apps_environment_id": "{env2.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"
         }
       }
+    },
+    "env1-acr": {
+      "type": "azure.bicep.v0",
+      "path": "env1-acr.module.bicep"
+    },
+    "env2-acr": {
+      "type": "azure.bicep.v0",
+      "path": "env2-acr.module.bicep"
     }
   }
 }
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.AzurePublishingContext_CapturesParametersAndOutputsCorrectly_WithSnapshot#00.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.AzurePublishingContext_CapturesParametersAndOutputsCorrectly_WithSnapshot#00.verified.bicep
@@ -15,14 +15,6 @@ resource rg 'Microsoft.Resources/resourceGroups@2023-07-01' = {
   location: location
 }
 
-module acaEnv_acr 'acaEnv-acr/acaEnv-acr.bicep' = {
-  name: 'acaEnv-acr'
-  scope: rg
-  params: {
-    location: location
-  }
-}
-
 module acaEnv 'acaEnv/acaEnv.bicep' = {
   name: 'acaEnv'
   scope: rg
@@ -59,6 +51,14 @@ module storage 'storage/storage.bicep' = {
   }
 }
 
+module acaEnv_acr 'acaEnv-acr/acaEnv-acr.bicep' = {
+  name: 'acaEnv-acr'
+  scope: rg
+  params: {
+    location: location
+  }
+}
+
 module fe_identity 'fe-identity/fe-identity.bicep' = {
   name: 'fe-identity'
   scope: rg
@@ -91,14 +91,14 @@ output acaEnv_acr_name string = acaEnv_acr.outputs.name
 
 output acaEnv_acr_loginServer string = acaEnv_acr.outputs.loginServer
 
+output acaEnv_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
+
 output acaEnv_AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN string = acaEnv.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN
 
 output acaEnv_AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = acaEnv.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID
 
 output acaEnv_AZURE_CONTAINER_REGISTRY_ENDPOINT string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT
 
-output acaEnv_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
-
 output fe_identity_id string = fe_identity.outputs.id
 
 output storage_blobEndpoint string = storage.outputs.blobEndpoint
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.PublishAsync_GeneratesMainBicep_WithSnapshots.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.PublishAsync_GeneratesMainBicep_WithSnapshots.verified.bicep
@@ -19,14 +19,6 @@ resource rg 'Microsoft.Resources/resourceGroups@2023-07-01' = {
   location: location
 }
 
-module acaEnv_acr 'acaEnv-acr/acaEnv-acr.bicep' = {
-  name: 'acaEnv-acr'
-  scope: rg
-  params: {
-    location: location
-  }
-}
-
 module acaEnv 'acaEnv/acaEnv.bicep' = {
   name: 'acaEnv'
   scope: rg
@@ -89,6 +81,14 @@ module mod 'mod/mod.bicep' = {
   }
 }
 
+module acaEnv_acr 'acaEnv-acr/acaEnv-acr.bicep' = {
+  name: 'acaEnv-acr'
+  scope: rg
+  params: {
+    location: location
+  }
+}
+
 module myapp_identity 'myapp-identity/myapp-identity.bicep' = {
   name: 'myapp-identity'
   scope: rg
@@ -129,6 +129,8 @@ output acaEnv_acr_name string = acaEnv_acr.outputs.name
 
 output acaEnv_acr_loginServer string = acaEnv_acr.outputs.loginServer
 
+output acaEnv_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
+
 output acaEnv_AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN string = acaEnv.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN
 
 output acaEnv_AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = acaEnv.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID
@@ -141,8 +143,6 @@ output myapp_identity_clientId string = myapp_identity.outputs.clientId
 
 output acaEnv_AZURE_CONTAINER_REGISTRY_ENDPOINT string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT
 
-output acaEnv_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = acaEnv.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
-
 output fe_identity_id string = fe_identity.outputs.id
 
 output storage_blobEndpoint string = storage.outputs.blobEndpoint
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.WhenUsedWithAzureContainerAppsEnvironment_GeneratesProperBicep#00.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.WhenUsedWithAzureContainerAppsEnvironment_GeneratesProperBicep#00.verified.bicep
@@ -11,28 +11,30 @@ resource rg 'Microsoft.Resources/resourceGroups@2023-07-01' = {
   location: location
 }
 
-module env_acr 'env-acr/env-acr.bicep' = {
-  name: 'env-acr'
+module env 'env/env.bicep' = {
+  name: 'env'
   scope: rg
   params: {
     location: location
+    env_acr_outputs_name: env_acr.outputs.name
+    userPrincipalId: principalId
   }
 }
 
-module env 'env/env.bicep' = {
-  name: 'env'
+module env_acr 'env-acr/env-acr.bicep' = {
+  name: 'env-acr'
   scope: rg
   params: {
     location: location
-    env_acr_outputs_name: env_acr.outputs.name
-    userPrincipalId: principalId
   }
 }
 
 output env_acr_name string = env_acr.outputs.name
 
 output env_acr_loginServer string = env_acr.outputs.loginServer
 
+output env_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
+
 output env_AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN string = env.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN
 
 output env_AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = env.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.WhenUsedWithAzureContainerAppsEnvironment_RespectsStronglyTypedProperties.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.WhenUsedWithAzureContainerAppsEnvironment_RespectsStronglyTypedProperties.verified.bicep
@@ -11,28 +11,30 @@ resource rg 'Microsoft.Resources/resourceGroups@2023-07-01' = {
   location: location
 }
 
-module env_acr 'env-acr/env-acr.bicep' = {
-  name: 'env-acr'
+module env 'env/env.bicep' = {
+  name: 'env'
   scope: rg
   params: {
     location: location
+    env_acr_outputs_name: env_acr.outputs.name
+    userPrincipalId: principalId
   }
 }
 
-module env 'env/env.bicep' = {
-  name: 'env'
+module env_acr 'env-acr/env-acr.bicep' = {
+  name: 'env-acr'
   scope: rg
   params: {
     location: location
-    env_acr_outputs_name: env_acr.outputs.name
-    userPrincipalId: principalId
   }
 }
 
 output env_acr_name string = env_acr.outputs.name
 
 output env_acr_loginServer string = env_acr.outputs.loginServer
 
+output env_AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID
+
 output env_AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN string = env.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN
 
 output env_AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = env.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json.schemastore.org/aspire-8.0.json",`
`3`	`3`	`"resources": {`
`4`		`- "env1-acr": {`
`5`		`- "type": "azure.bicep.v0",`
`6`		`- "path": "env1-acr.module.bicep"`
`7`		`- },`
`8`	`4`	`"env1": {`
`9`	`5`	`"type": "azure.bicep.v0",`
`10`	`6`	`"path": "env1.module.bicep",`
`@@ -13,10 +9,6 @@`
`13`	`9`	`"userPrincipalId": ""`
`14`	`10`	`}`
`15`	`11`	`},`
`16`		`- "env2-acr": {`
`17`		`- "type": "azure.bicep.v0",`
`18`		`- "path": "env2-acr.module.bicep"`
`19`		`- },`
`20`	`12`	`"env2": {`
`21`	`13`	`"type": "azure.bicep.v0",`
`22`	`14`	`"path": "env2.module.bicep",`
`@@ -102,6 +94,14 @@`
`102`	`94`	`"external": true`
`103`	`95`	`}`
`104`	`96`	`}`
	`97`	`+ },`
	`98`	`+ "env1-acr": {`
	`99`	`+ "type": "azure.bicep.v0",`
	`100`	`+ "path": "env1-acr.module.bicep"`
	`101`	`+ },`
	`102`	`+ "env2-acr": {`
	`103`	`+ "type": "azure.bicep.v0",`
	`104`	`+ "path": "env2-acr.module.bicep"`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,6 @@`
`9`	`9`	`"userPrincipalId": ""`
`10`	`10`	`}`
`11`	`11`	`},`
`12`		`- "env1-acr": {`
`13`		`- "type": "azure.bicep.v0",`
`14`		`- "path": "env1-acr.module.bicep"`
`15`		`- },`
`16`	`12`	`"env2": {`
`17`	`13`	`"type": "azure.bicep.v0",`
`18`	`14`	`"path": "env2.module.bicep",`
`@@ -21,10 +17,6 @@`
`21`	`17`	`"userPrincipalId": ""`
`22`	`18`	`}`
`23`	`19`	`},`
`24`		`- "env2-acr": {`
`25`		`- "type": "azure.bicep.v0",`
`26`		`- "path": "env2-acr.module.bicep"`
`27`		`- },`
`28`	`20`	`"api1": {`
`29`	`21`	`"type": "container.v1",`
`30`	`22`	`"image": "myimage:latest",`
`@@ -48,6 +40,14 @@`
`48`	`40`	`"env2_outputs_azure_container_apps_environment_id": "{env2.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"`
`49`	`41`	`}`
`50`	`42`	`}`
	`43`	`+ },`
	`44`	`+ "env1-acr": {`
	`45`	`+ "type": "azure.bicep.v0",`
	`46`	`+ "path": "env1-acr.module.bicep"`
	`47`	`+ },`
	`48`	`+ "env2-acr": {`
	`49`	`+ "type": "azure.bicep.v0",`
	`50`	`+ "path": "env2-acr.module.bicep"`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`