Merge branch 'main' into feat-drift-remediation-#1011

Author: TomerHeber

client/cloud_account.go

@@ -21,6 +21,12 @@ type AWSCloudAccountConfiguration struct {
 	ShouldPrefixUnderLogsFolder bool     `json:"shouldPrefixUnderLogsFolder"`
 }
 
+type AzureCloudAccountConfiguration struct {
+	TenantId                string `json:"tenantId"`
+	ClientId                string `json:"clientId"`
+	LogAnalyticsWorkspaceId string `json:"logAnalyticsWorkspaceId"`
+}
+
 type CloudAccount struct {
 	Id            string      `json:"id"`
 	Provider      string      `json:"provider"`

client/cloud_account_test.go

@@ -45,6 +45,30 @@ var _ = Describe("CloudAccount", func() {
 		Configuration: []string{"some random configuration"},
 	}
 
+	azureConfiguration := AzureCloudAccountConfiguration{
+		TenantId:                "tenant123",
+		ClientId:                "client123",
+		LogAnalyticsWorkspaceId: "workspace123",
+	}
+
+	azureConfigurationUpdated := AzureCloudAccountConfiguration{
+		TenantId:                "tenant456",
+		ClientId:                "client456",
+		LogAnalyticsWorkspaceId: "workspace456",
+	}
+
+	azureAccount := CloudAccount{
+		Id:            "id3",
+		Provider:      "Azure",
+		Name:          "azure1",
+		Health:        true,
+		Configuration: &azureConfiguration,
+	}
+
+	azureAccountUpdated := azureAccount
+	azureAccountUpdated.Name = "updatedazure1"
+	azureAccountUpdated.Configuration = azureConfigurationUpdated
+
 	Describe("create", func() {
 		BeforeEach(func() {
 			mockOrganizationIdCall()
@@ -83,6 +107,40 @@ var _ = Describe("CloudAccount", func() {
 		It("should not return error", func() {
 			Expect(err).To(BeNil())
 		})
+
+		Context("when creating an Azure configuration", func() {
+			BeforeEach(func() {
+				payload := CloudAccountCreatePayload{
+					Provider:      azureAccount.Provider,
+					Name:          azureAccount.Name,
+					Configuration: azureAccount.Configuration,
+				}
+
+				payloadWithOrganizationId := struct {
+					*CloudAccountCreatePayload
+					OrganizationId string `json:"organizationId"`
+				}{
+					&payload,
+					organizationId,
+				}
+
+				httpCall = mockHttpClient.EXPECT().
+					Post("/cloud/configurations", &payloadWithOrganizationId, gomock.Any()).
+					Do(func(path string, request interface{}, response *CloudAccount) {
+						*response = azureAccount
+					}).Times(1)
+
+				account, err = apiClient.CloudAccountCreate(&payload)
+			})
+
+			It("should return azure account", func() {
+				Expect(*account).To(Equal(azureAccount))
+			})
+
+			It("should not return error", func() {
+				Expect(err).To(BeNil())
+			})
+		})
 	})
 
 	Describe("update", func() {
@@ -148,6 +206,7 @@ var _ = Describe("CloudAccount", func() {
 		mockedAccounts := []CloudAccount{
 			account1,
 			account2,
+			azureAccount,
 		}
 
 		BeforeEach(func() {

docs/resources/azure_cloud_configuration.md

@@ -0,0 +1,46 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "env0_azure_cloud_configuration Resource - terraform-provider-env0"
+subcategory: ""
+description: |-
+  configure an Azure cloud account (Cloud Compass)
+---
+
+# env0_azure_cloud_configuration (Resource)
+
+configure an Azure cloud account (Cloud Compass)
+
+## Example Usage
+
+```terraform
+resource "env0_azure_cloud_configuration" "example" {
+  name                       = "example"
+  tenant_id                  = "11111111-2222-3333-4444-555555555555"
+  client_id                  = "66666666-7777-8888-9999-000000000000"
+  log_analytics_workspace_id = "12345678-90ab-cdef-1234-567890abcdef"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `client_id` (String) the Azure client ID
+- `log_analytics_workspace_id` (String) the Azure Log Analytics Workspace ID
+- `name` (String) name for the cloud configuration for insights
+- `tenant_id` (String) the Azure tenant ID
+
+### Read-Only
+
+- `health` (Boolean) an indicator if the configuration is valid
+- `id` (String) The ID of this resource.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import env0_azure_cloud_configuration.by_id d31a6b30-5f69-4d24-937c-22322754934e
+terraform import env0_azure_cloud_configuration.by_name "azure cloud configuration name"
+```

env0/cloud_configuration.go

@@ -19,6 +19,8 @@ func getCloudConfigurationFromSchema(d *schema.ResourceData, provider string) (i
 	switch provider {
 	case "AWS":
 		configuration = &client.AWSCloudAccountConfiguration{}
+	case "AzureLAW":
+		configuration = &client.AzureCloudAccountConfiguration{}
 	default:
 		return nil, fmt.Errorf("unhandled provider: %s", provider)
 	}
@@ -69,6 +71,8 @@ func getCloudConfigurationFromApi(apiClient client.ApiClientInterface, id string
 	switch cloudAccount.Provider {
 	case "AWS":
 		configuration = &client.AWSCloudAccountConfiguration{}
+	case "AzureLAW":
+		configuration = &client.AzureCloudAccountConfiguration{}
 	default:
 		return nil, fmt.Errorf("unhandled provider: %s", cloudAccount.Provider)
 	}

env0/provider.go

@@ -162,6 +162,7 @@ func Provider(version string) plugin.ProviderFunc {
 				"env0_variable_set_assignment":                   resourceVariableSetAssignment(),
 				"env0_environment_output_configuration_variable": resourceEnvironmentOutputConfigurationVariable(),
 				"env0_aws_cloud_configuration":                   resourceAwsCloudConfiguration(),
+				"env0_azure_cloud_configuration":                 resourceAzureCloudConfiguration(),
 				"env0_vcs_connection":                            resourceVcsConnection(),
 			},
 		}

env0/resource_azure_cloud_configuration.go

@@ -0,0 +1,57 @@
+package env0
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func resourceAzureCloudConfiguration() *schema.Resource {
+	return &schema.Resource{
+		CreateContext: resourceAzureCloudConfigurationCreate,
+		UpdateContext: resourceAzureCloudConfigurationUpdate,
+		ReadContext:   readCloudConfiguration,
+		DeleteContext: deleteCloudConfiguration,
+
+		Importer: &schema.ResourceImporter{StateContext: importCloudConfiguration},
+
+		Description: "configure an Azure cloud account (Cloud Compass)",
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Description: "name for the cloud configuration for insights",
+				Required:    true,
+			},
+			"tenant_id": {
+				Type:        schema.TypeString,
+				Description: "the Azure tenant ID",
+				Required:    true,
+			},
+			"client_id": {
+				Type:        schema.TypeString,
+				Description: "the Azure client ID",
+				Required:    true,
+			},
+			"log_analytics_workspace_id": {
+				Type:        schema.TypeString,
+				Description: "the Azure Log Analytics Workspace ID",
+				Required:    true,
+			},
+			"health": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "an indicator if the configuration is valid",
+			},
+		},
+	}
+}
+
+func resourceAzureCloudConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	return createCloudConfiguration(d, meta, "AzureLAW")
+}
+
+func resourceAzureCloudConfigurationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	return updateCloudConfiguration(d, meta, "AzureLAW")
+}