From bd4eb3928ad1cd35eda6b07973e5b3030652d5ec Mon Sep 17 00:00:00 2001 From: ziyeqf <51212351+ziyeqf@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:46:15 +0800 Subject: [PATCH] get log analytics workspace name Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com> --- .../container_app_environment_data_source.go | 34 ++++++++++++++++++- ...tainer_app_environment_data_source_test.go | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/internal/services/containerapps/container_app_environment_data_source.go b/internal/services/containerapps/container_app_environment_data_source.go index 9f5281c38adf..ebda8eb38d84 100644 --- a/internal/services/containerapps/container_app_environment_data_source.go +++ b/internal/services/containerapps/container_app_environment_data_source.go @@ -10,10 +10,12 @@ import ( "github.com/hashicorp/go-azure-helpers/lang/pointer" "github.com/hashicorp/go-azure-helpers/lang/response" + "github.com/hashicorp/go-azure-helpers/resourcemanager/commonids" "github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema" "github.com/hashicorp/go-azure-helpers/resourcemanager/location" "github.com/hashicorp/go-azure-helpers/resourcemanager/tags" "github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2023-05-01/managedenvironments" + "github.com/hashicorp/go-azure-sdk/resource-manager/operationalinsights/2020-08-01/workspaces" "github.com/hashicorp/terraform-provider-azurerm/internal/sdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" @@ -155,7 +157,12 @@ func (r ContainerAppEnvironmentDataSource) Read() sdk.ResourceFunc { } if appsLogs := props.AppLogsConfiguration; appsLogs != nil && appsLogs.LogAnalyticsConfiguration != nil { - environment.LogAnalyticsWorkspaceName = pointer.From(appsLogs.LogAnalyticsConfiguration.CustomerId) + lawClient := metadata.Client.LogAnalytics.SharedKeyWorkspacesClient + lawName, err := findLogAnalyticsWorkspaceName(ctx, lawClient, subscriptionId, pointer.From(appsLogs.LogAnalyticsConfiguration.CustomerId)) + if err != nil { + return fmt.Errorf("retrieving Log Analytics Workspace: %+v", err) + } + environment.LogAnalyticsWorkspaceName = lawName } environment.StaticIP = pointer.From(props.StaticIP) @@ -169,3 +176,28 @@ func (r ContainerAppEnvironmentDataSource) Read() sdk.ResourceFunc { }, } } + +func findLogAnalyticsWorkspaceName(ctx context.Context, client *workspaces.WorkspacesClient, subscriptionId, targetCustomerId string) (string, error) { + parsedSubscriptionId := commonids.NewSubscriptionID(subscriptionId) + + resp, err := client.List(ctx, parsedSubscriptionId) + if err != nil { + return "", err + } + + if resp.Model == nil { + return "", fmt.Errorf("model was nil") + } + + if resp.Model.Value == nil { + return "", fmt.Errorf("value was nil") + } + + for _, law := range *resp.Model.Value { + if law.Properties != nil && law.Properties.CustomerId != nil && *law.Properties.CustomerId == targetCustomerId && law.Name != nil { + return *law.Name, nil + } + } + + return "", fmt.Errorf("no matching workspace found") +} diff --git a/internal/services/containerapps/container_app_environment_data_source_test.go b/internal/services/containerapps/container_app_environment_data_source_test.go index 77ae2fe4237d..20eac4d9f338 100644 --- a/internal/services/containerapps/container_app_environment_data_source_test.go +++ b/internal/services/containerapps/container_app_environment_data_source_test.go @@ -21,7 +21,7 @@ func TestAccContainerAppEnvironmentDataSource_basic(t *testing.T) { { Config: r.basic(data), Check: acceptance.ComposeTestCheckFunc( - check.That(data.ResourceName).Key("log_analytics_workspace_name").IsSet(), + check.That(data.ResourceName).Key("log_analytics_workspace_name").HasValue(fmt.Sprintf("acctestLAW-%d", data.RandomInteger)), check.That(data.ResourceName).Key("location").IsSet(), check.That(data.ResourceName).Key("internal_load_balancer_enabled").HasValue("true"), ),