From 5e822d14420fd75c27c99028025df866c1686ca1 Mon Sep 17 00:00:00 2001 From: Vladimir Lazarenko Date: Thu, 3 Dec 2020 12:03:10 +0100 Subject: [PATCH 1/2] Fix LAW capitalization --- .../resource_arm_security_center_workspace.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go index 1ef8303ab12e..c7d9842a7917 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go @@ -6,6 +6,8 @@ import ( "log" "time" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loganalytics/parse" + "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -87,10 +89,15 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta return fmt.Errorf("Security Center Subscription workspace cannot be set when pricing tier is `Free`") } + workspaceID, err := parse.LogAnalyticsWorkspaceID(d.Get("workspace_id").(string)) + if err != nil { + return fmt.Errorf("%v", err) + } + contact := security.WorkspaceSetting{ WorkspaceSettingProperties: &security.WorkspaceSettingProperties{ Scope: utils.String(d.Get("scope").(string)), - WorkspaceID: utils.String(d.Get("workspace_id").(string)), + WorkspaceID: utils.String(workspaceID.ID("")), }, } From 8531b2dd8b45be5335ba2b8660dd2d843cb32e08 Mon Sep 17 00:00:00 2001 From: Vladimir Lazarenko Date: Thu, 3 Dec 2020 13:43:12 +0100 Subject: [PATCH 2/2] Update azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go Co-authored-by: Tom Harvey --- .../securitycenter/resource_arm_security_center_workspace.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go index c7d9842a7917..e114a95ea89c 100644 --- a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go +++ b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go @@ -91,7 +91,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta workspaceID, err := parse.LogAnalyticsWorkspaceID(d.Get("workspace_id").(string)) if err != nil { - return fmt.Errorf("%v", err) + return err } contact := security.WorkspaceSetting{