From 7dcdf2d48e323141b3fdb84acad8e40ca602d020 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Mon, 26 Feb 2024 20:03:23 -0800 Subject: [PATCH] update loganalytics id (#3446) --- .../testdata/TestAspireBicepGeneration-resources.bicep.snap | 2 +- .../testdata/TestAspireContainerGeneration-resources.bicep.snap | 2 +- .../testdata/TestAspireDockerGeneration-resources.bicep.snap | 2 +- .../testdata/TestAspireStorageGeneration-resources.bicep.snap | 2 +- cli/azd/resources/apphost/templates/resources.bicept | 2 +- .../functional/testdata/snaps/aspire-full/infra/resources.bicep | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/azd/pkg/apphost/testdata/TestAspireBicepGeneration-resources.bicep.snap b/cli/azd/pkg/apphost/testdata/TestAspireBicepGeneration-resources.bicep.snap index bff8ffbefa6..8c2da8416e5 100644 --- a/cli/azd/pkg/apphost/testdata/TestAspireBicepGeneration-resources.bicep.snap +++ b/cli/azd/pkg/apphost/testdata/TestAspireBicepGeneration-resources.bicep.snap @@ -104,7 +104,7 @@ output MANAGED_IDENTITY_CLIENT_ID string = managedIdentity.properties.clientId output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = managedIdentity.id output AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = containerAppEnvironment.id diff --git a/cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-resources.bicep.snap b/cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-resources.bicep.snap index db0dc0a2a5c..d84320a97db 100644 --- a/cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-resources.bicep.snap +++ b/cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-resources.bicep.snap @@ -86,7 +86,7 @@ output MANAGED_IDENTITY_CLIENT_ID string = managedIdentity.properties.clientId output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id output AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = containerAppEnvironment.id output AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN string = containerAppEnvironment.properties.defaultDomain diff --git a/cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-resources.bicep.snap b/cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-resources.bicep.snap index ef909f3e67f..6ce94d6b104 100644 --- a/cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-resources.bicep.snap +++ b/cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-resources.bicep.snap @@ -108,7 +108,7 @@ output MANAGED_IDENTITY_CLIENT_ID string = managedIdentity.properties.clientId output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = managedIdentity.id output AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = containerAppEnvironment.id diff --git a/cli/azd/pkg/apphost/testdata/TestAspireStorageGeneration-resources.bicep.snap b/cli/azd/pkg/apphost/testdata/TestAspireStorageGeneration-resources.bicep.snap index 570e28ce35b..0a60c6ff469 100644 --- a/cli/azd/pkg/apphost/testdata/TestAspireStorageGeneration-resources.bicep.snap +++ b/cli/azd/pkg/apphost/testdata/TestAspireStorageGeneration-resources.bicep.snap @@ -138,7 +138,7 @@ output MANAGED_IDENTITY_CLIENT_ID string = managedIdentity.properties.clientId output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = managedIdentity.id output AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = containerAppEnvironment.id diff --git a/cli/azd/resources/apphost/templates/resources.bicept b/cli/azd/resources/apphost/templates/resources.bicept index 476b8bd70ef..5b3b408c480 100644 --- a/cli/azd/resources/apphost/templates/resources.bicept +++ b/cli/azd/resources/apphost/templates/resources.bicept @@ -440,7 +440,7 @@ output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId {{if .HasLogAnalyticsWorkspace -}} output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id {{end -}} {{if .HasContainerRegistry -}} output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer diff --git a/cli/azd/test/functional/testdata/snaps/aspire-full/infra/resources.bicep b/cli/azd/test/functional/testdata/snaps/aspire-full/infra/resources.bicep index 9d013d2afd1..934dfe9ea0a 100644 --- a/cli/azd/test/functional/testdata/snaps/aspire-full/infra/resources.bicep +++ b/cli/azd/test/functional/testdata/snaps/aspire-full/infra/resources.bicep @@ -162,7 +162,7 @@ output MANAGED_IDENTITY_CLIENT_ID string = managedIdentity.properties.clientId output MANAGED_IDENTITY_NAME string = managedIdentity.name output MANAGED_IDENTITY_PRINCIPAL_ID string = managedIdentity.properties.principalId output AZURE_LOG_ANALYTICS_WORKSPACE_NAME string = logAnalyticsWorkspace.name -output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.properties.customerId +output AZURE_LOG_ANALYTICS_WORKSPACE_ID string = logAnalyticsWorkspace.id output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = managedIdentity.id output AZURE_CONTAINER_APPS_ENVIRONMENT_ID string = containerAppEnvironment.id