diff --git a/Directory.Packages.props b/Directory.Packages.props index db1e21ecd9a..512c276abee 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,10 +36,10 @@ - + - + @@ -164,7 +164,7 @@ - + diff --git a/src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryExtensions.cs b/src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryExtensions.cs index 6fac08a25e3..f213b493bc9 100644 --- a/src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryExtensions.cs +++ b/src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryExtensions.cs @@ -388,10 +388,10 @@ private static void ConfigureInfrastructure(AzureResourceInfrastructure infrastr infrastructure.Add(new ProvisioningOutput("endpoint", typeof(string)) { - Value = cogServicesAccount.Properties.Endpoint + Value = cogServicesAccount.Properties.Endpoint.ToBicepExpression() }); - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cogServicesAccount.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cogServicesAccount.Name.ToBicepExpression() }); var resource = (AzureAIFoundryResource)infrastructure.AspireResource; diff --git a/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs b/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs index 96a693846a3..9ad605bcc5f 100644 --- a/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs +++ b/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs @@ -50,10 +50,10 @@ public static IResourceBuilder AddAzureAppConfigu Tags = { { "aspire-resource-name", infrastructure.AspireResource.Name } } }); - infrastructure.Add(new ProvisioningOutput("appConfigEndpoint", typeof(string)) { Value = store.Endpoint }); + infrastructure.Add(new ProvisioningOutput("appConfigEndpoint", typeof(string)) { Value = store.Endpoint.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = store.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = store.Name.ToBicepExpression() }); }; var resource = new AzureAppConfigurationResource(name, configureInfrastructure); diff --git a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs index 1aa6f9c6e3d..ba314d3ee61 100644 --- a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs +++ b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs @@ -109,12 +109,12 @@ public static IResourceBuilder AddAzureAppSe infra.Add(new ProvisioningOutput("name", typeof(string)) { - Value = plan.Name + Value = plan.Name.ToBicepExpression() }); infra.Add(new ProvisioningOutput("planId", typeof(string)) { - Value = plan.Id + Value = plan.Id.ToBicepExpression() }); infra.Add(new ProvisioningOutput("webSiteSuffix", typeof(string)) @@ -124,23 +124,23 @@ public static IResourceBuilder AddAzureAppSe infra.Add(new ProvisioningOutput("AZURE_CONTAINER_REGISTRY_NAME", typeof(string)) { - Value = containerRegistry.Name + Value = containerRegistry.Name.ToBicepExpression() }); // AZD looks for this output to find the container registry endpoint infra.Add(new ProvisioningOutput("AZURE_CONTAINER_REGISTRY_ENDPOINT", typeof(string)) { - Value = containerRegistry.LoginServer + Value = containerRegistry.LoginServer.ToBicepExpression() }); infra.Add(new ProvisioningOutput("AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID", typeof(string)) { - Value = identity.Id + Value = identity.Id.ToBicepExpression() }); infra.Add(new ProvisioningOutput("AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID", typeof(string)) { - Value = identity.ClientId + Value = identity.ClientId.ToBicepExpression() }); if (resource.EnableDashboard) @@ -200,12 +200,12 @@ public static IResourceBuilder AddAzureAppSe infra.Add(new ProvisioningOutput("AZURE_APPLICATION_INSIGHTS_INSTRUMENTATIONKEY", typeof(string)) { - Value = applicationInsights.InstrumentationKey + Value = applicationInsights.InstrumentationKey.ToBicepExpression() }); infra.Add(new ProvisioningOutput("AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING", typeof(string)) { - Value = applicationInsights.ConnectionString + Value = applicationInsights.ConnectionString.ToBicepExpression() }); } }); diff --git a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentUtility.cs b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentUtility.cs index 2190551bb95..0317f708a38 100644 --- a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentUtility.cs +++ b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentUtility.cs @@ -104,12 +104,12 @@ public static WebSite AddDashboard(AzureResourceInfrastructure infra, // This identity needs website contributor access on the websites for resource server to work infra.Add(new ProvisioningOutput("AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_ID", typeof(string)) { - Value = contributorIdentity.Id + Value = contributorIdentity.Id.ToBicepExpression() }); infra.Add(new ProvisioningOutput("AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_PRINCIPAL_ID", typeof(string)) { - Value = contributorIdentity.PrincipalId + Value = contributorIdentity.PrincipalId.ToBicepExpression() }); return dashboard; diff --git a/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs b/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs index c3b4359e65f..d6e9e068910 100644 --- a/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs +++ b/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs @@ -99,10 +99,10 @@ public static IResourceBuilder AddAzureApplica return appInsights; }); - infrastructure.Add(new ProvisioningOutput("appInsightsConnectionString", typeof(string)) { Value = appInsights.ConnectionString }); + infrastructure.Add(new ProvisioningOutput("appInsightsConnectionString", typeof(string)) { Value = appInsights.ConnectionString.ToBicepExpression() }); // Add name output for the resource to externalize role assignments - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = appInsights.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = appInsights.Name.ToBicepExpression() }); }; var resource = new AzureApplicationInsightsResource(name, configureInfrastructure); diff --git a/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs b/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs index 91bcc823725..fa01303ac19 100644 --- a/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs +++ b/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs @@ -66,7 +66,7 @@ public static IResourceBuilder AddAzureOpenAI(this IDistrib }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cogServicesAccount.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cogServicesAccount.Name.ToBicepExpression() }); var resource = (AzureOpenAIResource)infrastructure.AspireResource; diff --git a/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs b/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs index 0c888dbd27d..1ed335b30f5 100644 --- a/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs +++ b/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs @@ -45,8 +45,8 @@ public static IResourceBuilder AddAzureContainer infrastructure.Add(registry); - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = registry.Name }); - infrastructure.Add(new ProvisioningOutput("loginServer", typeof(string)) { Value = registry.LoginServer }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = registry.Name.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("loginServer", typeof(string)) { Value = registry.LoginServer.ToBicepExpression() }); }; var resource = new AzureContainerRegistryResource(name, configureInfrastructure); diff --git a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs index 1bf17057079..fdd4c72e667 100644 --- a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs +++ b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs @@ -563,12 +563,12 @@ private static void ConfigureCosmosDBInfrastructure(AzureResourceInfrastructure infrastructure.Add(new ProvisioningOutput("connectionString", typeof(string)) { - Value = cosmosAccount.DocumentEndpoint + Value = cosmosAccount.DocumentEndpoint.ToBicepExpression() }); } // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cosmosAccount.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cosmosAccount.Name.ToBicepExpression() }); } internal static void AddContributorRoleAssignment(AzureResourceInfrastructure infra, CosmosDBAccount cosmosAccount, BicepValue principalId) diff --git a/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs b/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs index 862ddf7fba1..51012b1eced 100644 --- a/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs +++ b/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs @@ -71,10 +71,10 @@ public static IResourceBuilder AddAzureEventHubs( return resource; }); - infrastructure.Add(new ProvisioningOutput("eventHubsEndpoint", typeof(string)) { Value = eventHubsNamespace.ServiceBusEndpoint }); + infrastructure.Add(new ProvisioningOutput("eventHubsEndpoint", typeof(string)) { Value = eventHubsNamespace.ServiceBusEndpoint.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = eventHubsNamespace.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = eventHubsNamespace.Name.ToBicepExpression() }); var azureResource = (AzureEventHubsResource)infrastructure.AspireResource; diff --git a/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs b/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs index 3c2bfb0c6c4..cb30d4e06e9 100644 --- a/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs +++ b/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs @@ -89,7 +89,7 @@ public static IResourceBuilder AddAzureKeyVault(this IDis infrastructure.Add(new ProvisioningOutput("vaultUri", typeof(string)) { - Value = keyVault.Properties.VaultUri + Value = keyVault.Properties.VaultUri.ToBicepExpression() }); // Process all secret resources @@ -117,7 +117,7 @@ public static IResourceBuilder AddAzureKeyVault(this IDis } // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = keyVault.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = keyVault.Name.ToBicepExpression() }); }; var resource = new AzureKeyVaultResource(name, configureInfrastructure); diff --git a/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs b/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs index 547068cf1f1..e05aebd3beb 100644 --- a/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs +++ b/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs @@ -71,10 +71,10 @@ public static IResourceBuilder AddAzureKustoCluster(t }); // Add cluster URI output for connection strings - infrastructure.Add(new ProvisioningOutput("clusterUri", typeof(string)) { Value = cluster.ClusterUri }); + infrastructure.Add(new ProvisioningOutput("clusterUri", typeof(string)) { Value = cluster.ClusterUri.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cluster.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = cluster.Name.ToBicepExpression() }); var azureResource = (AzureKustoClusterResource)infrastructure.AspireResource; diff --git a/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs b/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs index 7a720b9be5c..732f4c3d024 100644 --- a/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs +++ b/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs @@ -46,13 +46,13 @@ public static IResourceBuilder AddAzureLogAn infrastructure.Add(new ProvisioningOutput("logAnalyticsWorkspaceId", typeof(string)) { - Value = workspace.Id + Value = workspace.Id.ToBicepExpression() }); // Add name output for the resource to externalize role assignments infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { - Value = workspace.Name + Value = workspace.Name.ToBicepExpression() }); }; diff --git a/src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresExtensions.cs b/src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresExtensions.cs index a1b2f0d5390..9af4f498a14 100644 --- a/src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresExtensions.cs +++ b/src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresExtensions.cs @@ -505,10 +505,10 @@ private static void ConfigurePostgreSqlInfrastructure(AzureResourceInfrastructur } // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = postgres.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = postgres.Name.ToBicepExpression() }); // Always output the hostName for the PostgreSQL server. - infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = postgres.FullyQualifiedDomainName }); + infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = postgres.FullyQualifiedDomainName.ToBicepExpression() }); } internal static PostgreSqlFlexibleServerActiveDirectoryAdministrator AddActiveDirectoryAdministrator(AzureResourceInfrastructure infra, PostgreSqlFlexibleServer postgres, BicepValue principalId, BicepValue principalType, BicepValue principalName) diff --git a/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs b/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs index 0258c4ef2e5..171eadc5793 100644 --- a/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs +++ b/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs @@ -253,9 +253,9 @@ private static void ConfigureRedisInfrastructure(AzureResourceInfrastructure inf } // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = redis.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = redis.Name.ToBicepExpression() }); // Always output the hostName for the Redis server. - infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = redis.HostName }); + infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = redis.HostName.ToBicepExpression() }); } } diff --git a/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs b/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs index 37712078183..67ffdd24aa0 100644 --- a/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs +++ b/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs @@ -312,10 +312,10 @@ private static void ConfigureRedisInfrastructure(AzureResourceInfrastructure inf } // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = redis.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = redis.Name.ToBicepExpression() }); // Always output the hostName for the Redis server. - infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = redis.HostName }); + infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = redis.HostName.ToBicepExpression() }); } internal static void AddContributorPolicyAssignment(AzureResourceInfrastructure infra, CdkRedisResource redis, BicepValue principalId, BicepValue principalName) diff --git a/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs b/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs index f8ab66306ec..761997c94a4 100644 --- a/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs +++ b/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs @@ -69,7 +69,7 @@ void ConfigureSearch(AzureResourceInfrastructure infrastructure) }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = search.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = search.Name.ToBicepExpression() }); } } diff --git a/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs b/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs index 20117563d7b..b9cf3b96852 100644 --- a/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs +++ b/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs @@ -69,10 +69,10 @@ public static IResourceBuilder AddAzureServiceBus(this return resource; }); - infrastructure.Add(new ProvisioningOutput("serviceBusEndpoint", typeof(string)) { Value = serviceBusNamespace.ServiceBusEndpoint }); + infrastructure.Add(new ProvisioningOutput("serviceBusEndpoint", typeof(string)) { Value = serviceBusNamespace.ServiceBusEndpoint.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = serviceBusNamespace.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = serviceBusNamespace.Name.ToBicepExpression() }); var azureResource = (AzureServiceBusResource)infrastructure.AspireResource; diff --git a/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs b/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs index 1d443ba3567..30b3118f549 100644 --- a/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs +++ b/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs @@ -87,10 +87,10 @@ public static IResourceBuilder AddAzureSignalR(this IDistr DisableLocalAuth = true, }); - infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = service.HostName }); + infrastructure.Add(new ProvisioningOutput("hostName", typeof(string)) { Value = service.HostName.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = service.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = service.Name.ToBicepExpression() }); }; List defaultRoles = [SignalRBuiltInRole.SignalRAppServer]; diff --git a/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs b/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs index c28007bce28..e22f0e0e6b3 100644 --- a/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs +++ b/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs @@ -327,11 +327,12 @@ private static SqlServer CreateSqlServerResourceOnly(AzureResourceInfrastructure }); } - infrastructure.Add(new ProvisioningOutput("sqlServerFqdn", typeof(string)) { Value = sqlServer.FullyQualifiedDomainName }); + infrastructure.Add(new ProvisioningOutput("sqlServerFqdn", typeof(string)) { Value = sqlServer.FullyQualifiedDomainName.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = sqlServer.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = sqlServer.Name.ToBicepExpression() }); + // don't use ToBicepExpression() here because it is being set to an IdentifierExpression above and we want the bicep to say 'sql.properties.administrators.login' infrastructure.Add(new ProvisioningOutput("sqlServerAdminName", typeof(string)) { Value = sqlServer.Administrators.Login }); return sqlServer; diff --git a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs index 69823750c69..852e3fbeb2b 100644 --- a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs +++ b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs @@ -120,12 +120,12 @@ public static IResourceBuilder AddAzureStorage(this IDistr infrastructure.Add(tableService); } - infrastructure.Add(new ProvisioningOutput("blobEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.BlobUri }); - infrastructure.Add(new ProvisioningOutput("queueEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.QueueUri }); - infrastructure.Add(new ProvisioningOutput("tableEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.TableUri }); + infrastructure.Add(new ProvisioningOutput("blobEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.BlobUri.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("queueEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.QueueUri.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("tableEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.TableUri.ToBicepExpression() }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = storageAccount.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = storageAccount.Name.ToBicepExpression() }); }; var resource = new AzureStorageResource(name, configureInfrastructure); diff --git a/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs b/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs index 20a2a03da03..07d3150960e 100644 --- a/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs +++ b/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs @@ -78,7 +78,7 @@ public static IResourceBuilder AddAzureWebPubSub(this ID infrastructure.Add(new ProvisioningOutput("endpoint", typeof(string)) { Value = BicepFunction.Interpolate($"https://{service.HostName}") }); // We need to output name to externalize role assignments. - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = service.Name }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = service.Name.ToBicepExpression() }); var resource = (AzureWebPubSubResource)infrastructure.AspireResource; foreach (var setting in resource.Hubs) diff --git a/src/Aspire.Hosting.Azure/AzureUserAssignedIdentityResource.cs b/src/Aspire.Hosting.Azure/AzureUserAssignedIdentityResource.cs index e987dedd0de..570fd7faf65 100644 --- a/src/Aspire.Hosting.Azure/AzureUserAssignedIdentityResource.cs +++ b/src/Aspire.Hosting.Azure/AzureUserAssignedIdentityResource.cs @@ -56,11 +56,11 @@ private static void ConfigureAppIdentityInfrastructure(AzureResourceInfrastructu infrastructure.Add(userAssignedIdentity); - infrastructure.Add(new ProvisioningOutput("id", typeof(string)) { Value = userAssignedIdentity.Id }); - infrastructure.Add(new ProvisioningOutput("clientId", typeof(string)) { Value = userAssignedIdentity.ClientId }); - infrastructure.Add(new ProvisioningOutput("principalId", typeof(string)) { Value = userAssignedIdentity.PrincipalId }); - infrastructure.Add(new ProvisioningOutput("principalName", typeof(string)) { Value = userAssignedIdentity.Name }); - infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = userAssignedIdentity.Name }); + infrastructure.Add(new ProvisioningOutput("id", typeof(string)) { Value = userAssignedIdentity.Id.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("clientId", typeof(string)) { Value = userAssignedIdentity.ClientId.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("principalId", typeof(string)) { Value = userAssignedIdentity.PrincipalId.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("principalName", typeof(string)) { Value = userAssignedIdentity.Name.ToBicepExpression() }); + infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = userAssignedIdentity.Name.ToBicepExpression() }); } /// diff --git a/src/Components/Aspire.Azure.AI.Inference/ConfigurationSchema.json b/src/Components/Aspire.Azure.AI.Inference/ConfigurationSchema.json index 2c4c23b2528..19784762f63 100644 --- a/src/Components/Aspire.Azure.AI.Inference/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.AI.Inference/ConfigurationSchema.json @@ -106,7 +106,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Data.Tables/ConfigurationSchema.json b/src/Components/Aspire.Azure.Data.Tables/ConfigurationSchema.json index d8cdcc7f54e..54033a81e53 100644 --- a/src/Components/Aspire.Azure.Data.Tables/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Data.Tables/ConfigurationSchema.json @@ -110,7 +110,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Messaging.WebPubSub/ConfigurationSchema.json b/src/Components/Aspire.Azure.Messaging.WebPubSub/ConfigurationSchema.json index 6a4c1c62ad9..ec72defac7d 100644 --- a/src/Components/Aspire.Azure.Messaging.WebPubSub/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Messaging.WebPubSub/ConfigurationSchema.json @@ -109,7 +109,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Search.Documents/ConfigurationSchema.json b/src/Components/Aspire.Azure.Search.Documents/ConfigurationSchema.json index 12e8ba3e215..fe18312628c 100644 --- a/src/Components/Aspire.Azure.Search.Documents/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Search.Documents/ConfigurationSchema.json @@ -109,7 +109,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Security.KeyVault/ConfigurationSchema.json b/src/Components/Aspire.Azure.Security.KeyVault/ConfigurationSchema.json index 976c7736d9e..7983b164843 100644 --- a/src/Components/Aspire.Azure.Security.KeyVault/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Security.KeyVault/ConfigurationSchema.json @@ -110,7 +110,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Storage.Blobs/ConfigurationSchema.json b/src/Components/Aspire.Azure.Storage.Blobs/ConfigurationSchema.json index d33f90281bb..13cf2292557 100644 --- a/src/Components/Aspire.Azure.Storage.Blobs/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Storage.Blobs/ConfigurationSchema.json @@ -142,7 +142,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/src/Components/Aspire.Azure.Storage.Queues/ConfigurationSchema.json b/src/Components/Aspire.Azure.Storage.Queues/ConfigurationSchema.json index 22cd498c4f0..c1d439fc4bb 100644 --- a/src/Components/Aspire.Azure.Storage.Queues/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.Storage.Queues/ConfigurationSchema.json @@ -122,7 +122,7 @@ "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", - "description": "The timeout applied to an individual network operations." + "description": "The timeout applied to individual network operations." } }, "description": "Gets the client retry options." diff --git a/tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs b/tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs index 00e58944b30..d746f8799f4 100644 --- a/tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs +++ b/tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs @@ -39,7 +39,7 @@ static void CreateInfrastructure(AzureResourceInfrastructure infrastructure) { var id = new UserAssignedIdentity("id"); infrastructure.Add(id); - infrastructure.Add(new ProvisioningOutput("cid", typeof(string)) { Value = id.ClientId }); + infrastructure.Add(new ProvisioningOutput("cid", typeof(string)) { Value = id.ClientId.ToBicepExpression() }); } return new() diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceEnvironmentExtensionsTests.AddAsExistingResource_RespectsExistingAzureResourceAnnotation_ForAzureAppServiceEnvironmentResource.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceEnvironmentExtensionsTests.AddAsExistingResource_RespectsExistingAzureResourceAnnotation_ForAzureAppServiceEnvironmentResource.verified.bicep index fdabf9e49b0..d746ea3bcec 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceEnvironmentExtensionsTests.AddAsExistingResource_RespectsExistingAzureResourceAnnotation_ForAzureAppServiceEnvironmentResource.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceEnvironmentExtensionsTests.AddAsExistingResource_RespectsExistingAzureResourceAnnotation_ForAzureAppServiceEnvironmentResource.verified.bicep @@ -1,11 +1,11 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param existing_appenv_name string param existing_appenv_rg string -resource test_app_service_env 'Microsoft.Web/serverfarms@2024-11-01' existing = { +resource test_app_service_env 'Microsoft.Web/serverfarms@2025-03-01' existing = { name: existing_appenv_name scope: resourceGroup(existing_appenv_rg) -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceContainerWithoutTargetPortUsesDefaultPort.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceContainerWithoutTargetPortUsesDefaultPort.verified.bicep index 1184bf8c04a..3c1d134905e 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceContainerWithoutTargetPortUsesDefaultPort.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceContainerWithoutTargetPortUsesDefaultPort.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('container1')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -91,4 +91,4 @@ resource container1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04- principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceEnvironmentWithoutDashboardAddsEnvironmentResource.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceEnvironmentWithoutDashboardAddsEnvironmentResource.verified.bicep index 61c5be70a3d..228eb6845b4 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceEnvironmentWithoutDashboardAddsEnvironmentResource.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceEnvironmentWithoutDashboardAddsEnvironmentResource.verified.bicep @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -58,4 +58,4 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = env_acr.properties.loginServer output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env_mi.id -output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId \ No newline at end of file +output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithApplicationInsightsSetsAppSettings.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithApplicationInsightsSetsAppSettings.verified.bicep index ad242e283c4..f47d8135379 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithApplicationInsightsSetsAppSettings.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithApplicationInsightsSetsAppSettings.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -23,7 +23,7 @@ param env_outputs_azure_application_insights_instrumentationkey string param env_outputs_azure_application_insights_connection_string string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -35,7 +35,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project1')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -129,4 +129,4 @@ resource project1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01 principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithoutTargetPortUsesContainerPort.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithoutTargetPortUsesContainerPort.verified.bicep index 0088ed9e60a..29eb4d0b065 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithoutTargetPortUsesContainerPort.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceProjectWithoutTargetPortUsesContainerPort.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -31,7 +31,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project1')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -113,4 +113,4 @@ resource project1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01 principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithAutomaticScaling.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithAutomaticScaling.verified.bicep index 04a7112eac6..296e41ce3a7 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithAutomaticScaling.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithAutomaticScaling.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param userPrincipalId string = '' @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -146,4 +146,4 @@ output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_ID string = env_contributor_mi output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_PRINCIPAL_ID string = env_contributor_mi.properties.principalId -output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' \ No newline at end of file +output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithoutDashboard.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithoutDashboard.verified.bicep index dd305ae28a4..edc1e005dc4 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithoutDashboard.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceToEnvironmentWithoutDashboard.verified.bicep @@ -13,7 +13,7 @@ param project2_containerimage string param project2_containerport string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -25,7 +25,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsDefaultLocation.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsDefaultLocation.verified.bicep index 19794f9e4b1..22da556a62b 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsDefaultLocation.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsDefaultLocation.verified.bicep @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -171,4 +171,4 @@ output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env' output AZURE_APPLICATION_INSIGHTS_INSTRUMENTATIONKEY string = env_ai.properties.InstrumentationKey -output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = env_ai.properties.ConnectionString +output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = env_ai.properties.ConnectionString \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocation.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocation.verified.bicep index 5c02ac261fd..3cf1cf27357 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocation.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocation.verified.bicep @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocationParam.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocationParam.verified.bicep index ace2e80b73d..b96a815ab93 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocationParam.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithApplicationInsightsLocationParam.verified.bicep @@ -32,7 +32,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -62,7 +62,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithArgs.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithArgs.verified.bicep index 449011b0714..d350d4a1b63 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithArgs.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithArgs.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -35,7 +35,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -125,4 +125,4 @@ resource project2_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01 principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithExistingApplicationInsights.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithExistingApplicationInsights.verified.bicep index 8557885829e..24abfa2041c 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithExistingApplicationInsights.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithExistingApplicationInsights.verified.bicep @@ -32,7 +32,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -62,7 +62,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -156,4 +156,4 @@ output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env' output AZURE_APPLICATION_INSIGHTS_INSTRUMENTATIONKEY string = existingAppInsights.properties.InstrumentationKey -output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = existingAppInsights.properties.ConnectionString \ No newline at end of file +output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = existingAppInsights.properties.ConnectionString diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPort.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPort.verified.bicep index b3ba898439c..b80d44a2621 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPort.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPort.verified.bicep @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPortMultipleEndpoints.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPortMultipleEndpoints.verified.bicep index aa70e49d644..486fc0e276d 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPortMultipleEndpoints.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceWithTargetPortMultipleEndpoints.verified.bicep @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep index 7edbd21c53b..af2c4f73cb1 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -31,7 +31,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -114,4 +114,4 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep index 926a9160fdd..da9477914fa 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -146,4 +146,4 @@ output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_ID string = env_contributor_mi output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_PRINCIPAL_ID string = env_contributor_mi.properties.principalId -output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' \ No newline at end of file +output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.bicep index f7eaa081a05..041e76b6193 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -95,4 +95,4 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceEnvironmentCanReferenceExistingAppServicePlan.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceEnvironmentCanReferenceExistingAppServicePlan.verified.bicep index 926a9160fdd..da9477914fa 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceEnvironmentCanReferenceExistingAppServicePlan.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceEnvironmentCanReferenceExistingAppServicePlan.verified.bicep @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04 scope: env_acr } -resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = { +resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = { name: take('envasplan-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { } } -resource dashboard 'Microsoft.Web/sites@2024-11-01' = { +resource dashboard 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -146,4 +146,4 @@ output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_ID string = env_contributor_mi output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_PRINCIPAL_ID string = env_contributor_mi.properties.principalId -output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' \ No newline at end of file +output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net' diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceSupportBaitAndSwitchResources.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceSupportBaitAndSwitchResources.verified.bicep index 8cb538e8520..98b87f327f6 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceSupportBaitAndSwitchResources.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AzureAppServiceSupportBaitAndSwitchResources.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -111,4 +111,4 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.EndpointReferencesAreResolvedAcrossProjects.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.EndpointReferencesAreResolvedAcrossProjects.verified.bicep index 053ddceac2a..1691a1b6beb 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.EndpointReferencesAreResolvedAcrossProjects.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.EndpointReferencesAreResolvedAcrossProjects.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -31,7 +31,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -121,4 +121,4 @@ resource project2_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01 principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.KeyvaultReferenceHandling.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.KeyvaultReferenceHandling.verified.bicep index 4338bba5136..ebc76bd3f6d 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.KeyvaultReferenceHandling.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.KeyvaultReferenceHandling.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -48,7 +48,7 @@ resource existingKv_secret 'Microsoft.KeyVault/vaults/secrets@2024-11-01' existi parent: existingKv } -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -60,7 +60,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -152,4 +152,4 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.ResourceWithProbes.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.ResourceWithProbes.verified.bicep index d55cd08d401..6354c2b24b7 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.ResourceWithProbes.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.ResourceWithProbes.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -31,7 +31,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('project1')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -114,4 +114,4 @@ resource project1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01 principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.UnknownManifestExpressionProviderIsHandledWithAllocateParameter.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.UnknownManifestExpressionProviderIsHandledWithAllocateParameter.verified.bicep index ee2b765565e..939ed971271 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.UnknownManifestExpressionProviderIsHandledWithAllocateParameter.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.UnknownManifestExpressionProviderIsHandledWithAllocateParameter.verified.bicep @@ -1,4 +1,4 @@ -@description('The location for the resource(s) to be deployed.') +@description('The location for the resource(s) to be deployed.') param location string = resourceGroup().location param env_outputs_azure_container_registry_endpoint string @@ -21,7 +21,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string param env_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -33,7 +33,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { @@ -119,4 +119,4 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = { principalType: 'ServicePrincipal' } scope: webapp -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureCosmosDBExtensionsTests.AddAzureCosmosDBViaPublishMode_WithDefaultAzureSku.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureCosmosDBExtensionsTests.AddAzureCosmosDBViaPublishMode_WithDefaultAzureSku.verified.bicep index dd35c4534eb..754aa4d3bd2 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureCosmosDBExtensionsTests.AddAzureCosmosDBViaPublishMode_WithDefaultAzureSku.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureCosmosDBExtensionsTests.AddAzureCosmosDBViaPublishMode_WithDefaultAzureSku.verified.bicep @@ -11,6 +11,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { failoverPriority: 0 } ] + capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' } diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureUserAssignedIdentityTests.WithAzureUserAssignedIdentity_WithRoleAssignments_AzureAppService_Works#00.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureUserAssignedIdentityTests.WithAzureUserAssignedIdentity_WithRoleAssignments_AzureAppService_Works#00.verified.bicep index c9845890936..19828e5fb9c 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureUserAssignedIdentityTests.WithAzureUserAssignedIdentity_WithRoleAssignments_AzureAppService_Works#00.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureUserAssignedIdentityTests.WithAzureUserAssignedIdentity_WithRoleAssignments_AzureAppService_Works#00.verified.bicep @@ -23,7 +23,7 @@ param appservice_outputs_azure_website_contributor_managed_identity_id string param appservice_outputs_azure_website_contributor_managed_identity_principal_id string -resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { +resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = { name: 'main' properties: { authType: 'UserAssigned' @@ -35,7 +35,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = { parent: webapp } -resource webapp 'Microsoft.Web/sites@2024-11-01' = { +resource webapp 'Microsoft.Web/sites@2025-03-01' = { name: take('${toLower('myapp')}-${uniqueString(resourceGroup().id)}', 60) location: location properties: { diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInPublishMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInPublishMode.verified.bicep index 155a63b7ed3..de698c27418 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInPublishMode.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInPublishMode.verified.bicep @@ -14,4 +14,4 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2024-01-01' = { output serviceBusEndpoint string = messaging.properties.serviceBusEndpoint -output name string = existingResourceName \ No newline at end of file +output name string = messaging.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInRunMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInRunMode.verified.bicep index 155a63b7ed3..de698c27418 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInRunMode.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.AddExistingAzureServiceBusInRunMode.verified.bicep @@ -14,4 +14,4 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2024-01-01' = { output serviceBusEndpoint string = messaging.properties.serviceBusEndpoint -output name string = existingResourceName \ No newline at end of file +output name string = messaging.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAppConfigurationWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAppConfigurationWithResourceGroup.verified.bicep index d9c568294bf..bd20e1b25de 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAppConfigurationWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAppConfigurationWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource appConfig 'Microsoft.AppConfiguration/configurationStores@2024-06-01' e output appConfigEndpoint string = appConfig.properties.endpoint -output name string = existingResourceName \ No newline at end of file +output name string = appConfig.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureApplicationInsightsWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureApplicationInsightsWithResourceGroup.verified.bicep index b8f5084ff1c..b1bf44af844 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureApplicationInsightsWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureApplicationInsightsWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource appInsights 'Microsoft.Insights/components@2020-02-02' existing = { output appInsightsConnectionString string = appInsights.properties.ConnectionString -output name string = existingResourceName \ No newline at end of file +output name string = appInsights.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInPublishMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInPublishMode.verified.bicep index bcacaa60a0c..26c50d4c538 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInPublishMode.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInPublishMode.verified.bicep @@ -7,6 +7,6 @@ resource acr 'Microsoft.ContainerRegistry/registries@2025-04-01' existing = { name: existingResourceName } -output name string = existingResourceName +output name string = acr.name output loginServer string = acr.properties.loginServer \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInRunMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInRunMode.verified.bicep index bcacaa60a0c..26c50d4c538 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInRunMode.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureContainerRegistryInRunMode.verified.bicep @@ -7,6 +7,6 @@ resource acr 'Microsoft.ContainerRegistry/registries@2025-04-01' existing = { name: existingResourceName } -output name string = existingResourceName +output name string = acr.name output loginServer string = acr.properties.loginServer \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroup.verified.bicep index fb2c5286abc..0c9250e6bfd 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroup.verified.bicep @@ -37,4 +37,4 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container output connectionString string = cosmos.properties.documentEndpoint -output name string = existingResourceName +output name string = cosmos.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroupAccessKey.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroupAccessKey.verified.bicep index a9c0c762e05..6bafc15fa85 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroupAccessKey.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureCosmosDBWithResourceGroupAccessKey.verified.bicep @@ -65,4 +65,4 @@ resource container_connectionString 'Microsoft.KeyVault/vaults/secrets@2024-11-0 parent: keyVault } -output name string = existingResourceName \ No newline at end of file +output name string = cosmos.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureOpenAIWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureOpenAIWithResourceGroup.verified.bicep index 48f2a126326..40db65337ab 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureOpenAIWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureOpenAIWithResourceGroup.verified.bicep @@ -25,4 +25,4 @@ resource mymodel 'Microsoft.CognitiveServices/accounts/deployments@2024-10-01' = output connectionString string = 'Endpoint=${openAI.properties.endpoint}' -output name string = existingResourceName \ No newline at end of file +output name string = openAI.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisEnterpriseWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisEnterpriseWithResourceGroup.verified.bicep index 88222747d2f..276e62cf7e6 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisEnterpriseWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisEnterpriseWithResourceGroup.verified.bicep @@ -9,6 +9,6 @@ resource redis 'Microsoft.Cache/redisEnterprise@2025-04-01' existing = { output connectionString string = '${redis.properties.hostName}:10000,ssl=true' -output name string = existingResourceName +output name string = redis.name output hostName string = redis.properties.hostName \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisWithResourceGroup.verified.bicep index 1285da0998d..a56aa1f7beb 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureRedisWithResourceGroup.verified.bicep @@ -9,6 +9,6 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' existing = { output connectionString string = '${redis.properties.hostName},ssl=true' -output name string = existingResourceName +output name string = redis.name output hostName string = redis.properties.hostName \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSearchWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSearchWithResourceGroup.verified.bicep index 88275157a9d..dcb59851553 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSearchWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSearchWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource search 'Microsoft.Search/searchServices@2023-11-01' existing = { output connectionString string = 'Endpoint=https://${existingResourceName}.search.windows.net' -output name string = existingResourceName \ No newline at end of file +output name string = search.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSignalRWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSignalRWithResourceGroup.verified.bicep index 7581aa0ce57..47ea51b2770 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSignalRWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSignalRWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource signalR 'Microsoft.SignalRService/signalR@2024-03-01' existing = { output hostName string = signalR.properties.hostName -output name string = existingResourceName \ No newline at end of file +output name string = signalR.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerInRunMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerInRunMode.verified.bicep index 8c773e05aaa..42faef05e83 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerInRunMode.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerInRunMode.verified.bicep @@ -27,6 +27,6 @@ resource sqlFirewallRule_AllowAllIps 'Microsoft.Sql/servers/firewallRules@2023-0 output sqlServerFqdn string = sqlServer.properties.fullyQualifiedDomainName -output name string = existingResourceName +output name string = sqlServer.name output sqlServerAdminName string = sqlServer.properties.administrators.login \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerWithResourceGroup.verified.bicep index df2cdb05e10..b5a8aba35ca 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureSqlServerWithResourceGroup.verified.bicep @@ -18,6 +18,6 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2 output sqlServerFqdn string = sqlServer.properties.fullyQualifiedDomainName -output name string = existingResourceName +output name string = sqlServer.name output sqlServerAdminName string = sqlServer.properties.administrators.login \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureWebPubSubWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureWebPubSubWithResourceGroup.verified.bicep index af500ec4ada..eff38edfb13 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureWebPubSubWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingAzureWebPubSubWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2024-03-01' existing = { output endpoint string = 'https://${webPubSub.properties.hostName}' -output name string = existingResourceName \ No newline at end of file +output name string = webPubSub.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingEventHubsWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingEventHubsWithResourceGroup.verified.bicep index 5b0c7cfd24b..2f75779ee8a 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingEventHubsWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingEventHubsWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource eventHubs 'Microsoft.EventHub/namespaces@2024-01-01' existing = { output eventHubsEndpoint string = eventHubs.properties.serviceBusEndpoint -output name string = existingResourceName \ No newline at end of file +output name string = eventHubs.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingKeyVaultWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingKeyVaultWithResourceGroup.verified.bicep index ebf2e369c89..e19f847a774 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingKeyVaultWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingKeyVaultWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource keyVault 'Microsoft.KeyVault/vaults@2024-11-01' existing = { output vaultUri string = keyVault.properties.vaultUri -output name string = existingResourceName \ No newline at end of file +output name string = keyVault.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingLogAnalyticsWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingLogAnalyticsWithResourceGroup.verified.bicep index 00d10410c56..59c91a4d85b 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingLogAnalyticsWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingLogAnalyticsWithResourceGroup.verified.bicep @@ -9,4 +9,4 @@ resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2025-02-01' exis output logAnalyticsWorkspaceId string = logAnalytics.id -output name string = existingResourceName \ No newline at end of file +output name string = logAnalytics.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroup.verified.bicep index fc8589c2a03..5edf04c650c 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroup.verified.bicep @@ -18,6 +18,6 @@ resource postgreSqlFirewallRule_AllowAllAzureIps 'Microsoft.DBforPostgreSQL/flex output connectionString string = 'Host=${postgresSql.properties.fullyQualifiedDomainName}' -output name string = existingResourceName +output name string = postgresSql.name output hostName string = postgresSql.properties.fullyQualifiedDomainName \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroupWithPasswordAuth.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroupWithPasswordAuth.verified.bicep index 04b1eaf65c8..b0ad0df8db3 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroupWithPasswordAuth.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingPostgresSqlWithResourceGroupWithPasswordAuth.verified.bicep @@ -35,6 +35,6 @@ resource connectionString 'Microsoft.KeyVault/vaults/secrets@2024-11-01' = { parent: keyVault } -output name string = existingResourceName +output name string = postgresSql.name output hostName string = postgresSql.properties.fullyQualifiedDomainName \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingServiceBusWithResourceGroupInPublishMode#00.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingServiceBusWithResourceGroupInPublishMode#00.verified.bicep index 155a63b7ed3..de698c27418 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingServiceBusWithResourceGroupInPublishMode#00.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingServiceBusWithResourceGroupInPublishMode#00.verified.bicep @@ -14,4 +14,4 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2024-01-01' = { output serviceBusEndpoint string = messaging.properties.serviceBusEndpoint -output name string = existingResourceName \ No newline at end of file +output name string = messaging.name \ No newline at end of file diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep index e08f824468e..a3491b8175a 100644 --- a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep +++ b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep @@ -13,4 +13,4 @@ output queueEndpoint string = storage.properties.primaryEndpoints.queue output tableEndpoint string = storage.properties.primaryEndpoints.table -output name string = existingResourceName \ No newline at end of file +output name string = storage.name \ No newline at end of file