Merge branch 'main' into add_cost_cred_for_azure-#218

env0 · Mar 27, 2022 · 2e0247c · 2e0247c
2 parents 4db96df + 22b50a3
commit 2e0247c
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 2 deletions.
diff --git a/docs/resources/notification.md b/docs/resources/notification.md
@@ -13,11 +13,21 @@ description: |-
 ## Example Usage
 
 ```terraform
-resource "env0_notification" "example" {
+resource "env0_project" "example_project" {
+  name = "project-example"
+}
+
+resource "env0_notification" "example_notification" {
   name  = "notification-example"
   type  = "Slack"
   value = "https://www.slack.com/example/webhook"
 }
+
+resource "env0_notification_project_assignment" "test_assignment" {
+  project_id               = env0_project.example_project.id
+  notification_endpoint_id = env0_notification.example_notification.id
+  event_names              = ["environmentMarkedForAutoDestroy", "deploymentCancelled"]
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

diff --git a/env0/resource_configuration_variable.go b/env0/resource_configuration_variable.go
@@ -5,9 +5,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/env0/terraform-provider-env0/client"
+	"github.com/env0/terraform-provider-env0/client/http"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -199,6 +201,13 @@ func resourceConfigurationVariableRead(ctx context.Context, d *schema.ResourceDa
 	variable, err := apiClient.ConfigurationVariablesById(id)
 
 	if err != nil {
+		if frerr, ok := err.(*http.FailedResponseError); ok {
+			if frerr.NotFound() {
+				log.Printf("[WARN] Drift Detected: Terraform will remove %s from state", d.Id())
+				d.SetId("")
+				return nil
+			}
+		}
 		return diag.Errorf("could not get configurationVariable: %v", err)
 	}
 

diff --git a/env0/resource_configuration_variable_test.go b/env0/resource_configuration_variable_test.go
@@ -10,6 +10,7 @@ import (
 	"text/template"
 
 	"github.com/env0/terraform-provider-env0/client"
+	"github.com/env0/terraform-provider-env0/client/http"
 	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
@@ -374,6 +375,30 @@ resource "%s" "test" {
 		})
 	})
 
+	t.Run("Configuration Removed in UI", func(t *testing.T) {
+		createTestCase := resource.TestCase{
+			Steps: []resource.TestStep{
+				{
+					Config: stepConfig,
+				},
+				{
+					Config: stepConfig,
+				},
+			},
+		}
+
+		runUnitTest(t, createTestCase, func(mock *client.MockApiClientInterface) {
+			gomock.InOrder(
+				mock.EXPECT().ConfigurationVariableCreate(configurationVariableCreateParams).Times(1).Return(configVar, nil),
+				mock.EXPECT().ConfigurationVariablesById(configVar.Id).Times(1).Return(configVar, nil),
+				mock.EXPECT().ConfigurationVariablesById(configVar.Id).Times(1).Return(client.ConfigurationVariable{}, http.NewMockFailedResponseError(404)),
+				mock.EXPECT().ConfigurationVariableCreate(configurationVariableCreateParams).Times(1).Return(configVar, nil),
+				mock.EXPECT().ConfigurationVariablesById(configVar.Id).Times(1).Return(configVar, nil),
+				mock.EXPECT().ConfigurationVariableDelete(configVar.Id).Times(1).Return(nil),
+			)
+		})
+	})
+
 	t.Run("Update", func(t *testing.T) {
 		newIsReadonly := false
 		newIsRequired := true

diff --git a/examples/resources/env0_notification/resource.tf b/examples/resources/env0_notification/resource.tf
@@ -1,5 +1,15 @@
-resource "env0_notification" "example" {
+resource "env0_project" "example_project" {
+  name = "project-example"
+}
+
+resource "env0_notification" "example_notification" {
   name  = "notification-example"
   type  = "Slack"
   value = "https://www.slack.com/example/webhook"
 }
+
+resource "env0_notification_project_assignment" "test_assignment" {
+  project_id               = env0_project.example_project.id
+  notification_endpoint_id = env0_notification.example_notification.id
+  event_names              = ["environmentMarkedForAutoDestroy", "deploymentCancelled"]
+}
diff --git a/tests/integration/017_notification/main.tf b/tests/integration/017_notification/main.tf
@@ -3,3 +3,14 @@ resource "env0_notification" "test_notification" {
   type  = var.second_run ? "Slack" : "Teams"
   value = var.second_run ? "https://someotherurl.com" : "https://someurl.com"
 }
+
+resource "env0_project" "test_project" {
+  name        = "Test-Project-For-Notification"
+  description = "Test Description"
+}
+
+resource "env0_notification_project_assignment" "test_assignment" {
+  project_id               = env0_project.test_project.id
+  notification_endpoint_id = env0_notification.test_notification.id
+  event_names              = var.second_run ? ["deploymentCancelled"] : ["environmentMarkedForAutoDestroy"]
+}