Merge branch 'main' of https://github.com/env0/terraform-provider-env0 …

…into fix-handle_drift_withIsDeleted-#225

.github/workflows/ci.yml

@@ -16,8 +16,12 @@ jobs:
           go-version: ${{ secrets.GO_VERSION }}
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Generate mocks
+        run: |
+          go install github.com/golang/mock/mockgen@v1.6.0
+          go generate client/api_client.go
       - name: Go fmt
         run: |
-            ! go fmt ./... | read
+          ! go fmt ./... | read
       - name: Go Test
         run: go test -v ./...

client/api_client.go

@@ -63,6 +63,9 @@ type ApiClientInterface interface {
 	EnvironmentSchedulingDelete(environmentId string) error
 	WorkflowTrigger(environmentId string) ([]WorkflowTrigger, error)
 	WorkflowTriggerUpsert(environmentId string, request WorkflowTriggerUpsertPayload) ([]WorkflowTrigger, error)
+	EnvironmentDriftDetection(environmentId string) (EnvironmentSchedulingExpression, error)
+	EnvironmentUpdateDriftDetection(environmentId string, payload EnvironmentSchedulingExpression) (EnvironmentSchedulingExpression, error)
+	EnvironmentStopDriftDetection(environmentId string) error
 }
 
 func NewApiClient(client http.HttpClientInterface) ApiClientInterface {

client/environment_drift_detection.go

@@ -0,0 +1,31 @@
+package client
+
+func (self *ApiClient) EnvironmentDriftDetection(environmentId string) (EnvironmentSchedulingExpression, error) {
+	var result EnvironmentSchedulingExpression
+
+	err := self.http.Get("/scheduling/drift-detection/environments/"+environmentId, nil, &result)
+	if err != nil {
+		return result, err
+	}
+	return result, nil
+}
+
+func (self *ApiClient) EnvironmentUpdateDriftDetection(environmentId string, payload EnvironmentSchedulingExpression) (EnvironmentSchedulingExpression, error) {
+	var result EnvironmentSchedulingExpression
+
+	err := self.http.Patch("/scheduling/drift-detection/environments/"+environmentId, payload, &result)
+	if err != nil {
+		return EnvironmentSchedulingExpression{}, err
+	}
+
+	return result, nil
+}
+
+func (self *ApiClient) EnvironmentStopDriftDetection(environmentId string) error {
+	err := self.http.Patch("/scheduling/drift-detection/environments/"+environmentId, EnvironmentSchedulingExpression{Enabled: false}, &EnvironmentScheduling{})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

client/environment_drift_detection_test.go

@@ -0,0 +1,114 @@
+package client_test
+
+import (
+	"errors"
+	. "github.com/env0/terraform-provider-env0/client"
+	"github.com/golang/mock/gomock"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("EnvironmentDriftDetection", func() {
+	environmentId := "env"
+	path := "/scheduling/drift-detection/environments/" + environmentId
+	mockError := errors.New("I don't like milk")
+	schedulingExpression := EnvironmentSchedulingExpression{Cron: "0 * * * *", Enabled: true}
+	var driftResponse EnvironmentSchedulingExpression
+
+	Describe("Get", func() {
+		Describe("Success", func() {
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Get(path, nil, gomock.Any()).
+					Do(func(path string, request interface{}, response *EnvironmentSchedulingExpression) {
+						*response = schedulingExpression
+					})
+				driftResponse, _ = apiClient.EnvironmentDriftDetection(environmentId)
+			})
+
+			It("Should return the drift scheduling response", func() {
+				Expect(driftResponse).To(Equal(schedulingExpression))
+			})
+		})
+
+		Describe("Fail", func() {
+			var err error
+
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Get(path, gomock.Any(), gomock.Any()).
+					Return(mockError)
+
+				_, err = apiClient.EnvironmentDriftDetection(environmentId)
+
+			})
+
+			It("Should fail if API call fails", func() {
+				Expect(err).To(Equal(mockError))
+			})
+		})
+	})
+	Describe("Update", func() {
+		Describe("Success", func() {
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Patch(path, schedulingExpression, gomock.Any()).
+					Do(func(path string, request interface{}, response *EnvironmentSchedulingExpression) {
+						*response = schedulingExpression
+					})
+				driftResponse, _ = apiClient.EnvironmentUpdateDriftDetection(environmentId, schedulingExpression)
+			})
+
+			It("Should return the drift scheduling response", func() {
+				Expect(driftResponse).To(Equal(schedulingExpression))
+			})
+		})
+
+		Describe("Fail", func() {
+			var err error
+
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Patch(path, schedulingExpression, gomock.Any()).
+					Return(mockError)
+
+				_, err = apiClient.EnvironmentUpdateDriftDetection(environmentId, schedulingExpression)
+
+			})
+
+			It("Should fail if API call fails", func() {
+				Expect(err).To(Equal(mockError))
+			})
+		})
+	})
+	Describe("Delete", func() {
+		Describe("Success", func() {
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Patch(path, EnvironmentSchedulingExpression{Enabled: false}, gomock.Any()).
+					Do(func(path string, request interface{}, response *EnvironmentSchedulingExpression) {
+						*response = schedulingExpression
+					})
+				_ = apiClient.EnvironmentStopDriftDetection(environmentId)
+			})
+		})
+
+		Describe("Fail", func() {
+			var err error
+
+			BeforeEach(func() {
+				httpCall = mockHttpClient.EXPECT().
+					Patch(path, EnvironmentSchedulingExpression{Enabled: false}, gomock.Any()).
+					Return(mockError)
+
+				err = apiClient.EnvironmentStopDriftDetection(environmentId)
+
+			})
+
+			It("Should fail if API call fails", func() {
+				Expect(err).To(Equal(mockError))
+			})
+		})
+	})
+
+})

client/model.go

@@ -393,7 +393,7 @@ type PolicyUpdatePayload struct {
 }
 
 type EnvironmentSchedulingExpression struct {
-	Cron    string `json:"cron"`
+	Cron    string `json:"cron,omitempty"`
 	Enabled bool   `json:"enabled"`
 }
 

env0/data_configuration_variable_test.go

@@ -65,7 +65,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 			func(mock *client.MockApiClientInterface) {
 				mock.EXPECT().ConfigurationVariablesById(configurationVariable.Id).AnyTimes().
 					Return(configurationVariable, nil)
-				mock.EXPECT().ConfigurationVariables(client.ScopeGlobal, "").AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeGlobal, "").AnyTimes().
 					Return([]client.ConfigurationVariable{configurationVariable}, nil)
 			})
 	})
@@ -112,7 +112,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 			func(mock *client.MockApiClientInterface) {
 				mock.EXPECT().ConfigurationVariablesById(configurationVariable.Id).AnyTimes().
 					Return(configurationVariable, nil)
-				mock.EXPECT().ConfigurationVariables(client.ScopeGlobal, "").AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeGlobal, "").AnyTimes().
 					Return([]client.ConfigurationVariable{configurationVariable}, nil)
 			})
 	})
@@ -128,7 +128,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 				},
 			},
 			func(mock *client.MockApiClientInterface) {
-				mock.EXPECT().ConfigurationVariables(client.ScopeTemplate, "template_id").AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeTemplate, "template_id").AnyTimes().
 					Return([]client.ConfigurationVariable{configurationVariable}, nil)
 			})
 	})
@@ -144,7 +144,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 				},
 			},
 			func(mock *client.MockApiClientInterface) {
-				mock.EXPECT().ConfigurationVariables(client.ScopeEnvironment, configurationVariable.Id).AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeEnvironment, configurationVariable.Id).AnyTimes().
 					Return([]client.ConfigurationVariable{configurationVariable}, nil)
 			})
 	})
@@ -160,7 +160,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 				},
 			},
 			func(mock *client.MockApiClientInterface) {
-				mock.EXPECT().ConfigurationVariables(client.ScopeGlobal, "").AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeGlobal, "").AnyTimes().
 					Return(nil, errors.New("not found"))
 			})
 	})
@@ -176,7 +176,7 @@ func TestUnitConfigurationVariableData(t *testing.T) {
 				},
 			},
 			func(mock *client.MockApiClientInterface) {
-				mock.EXPECT().ConfigurationVariables(client.ScopeGlobal, "").AnyTimes().
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeGlobal, "").AnyTimes().
 					Return([]client.ConfigurationVariable{configurationVariable}, nil)
 			})
 	})