changes based on PR comments

client/api_client.go

@@ -66,7 +66,7 @@ type ApiClientInterface interface {
 	Environment(id string) (Environment, error)
 	EnvironmentCreate(payload EnvironmentCreate) (Environment, error)
 	EnvironmentCreateWithoutTemplate(payload EnvironmentCreateWithoutTemplate) (Environment, error)
-	EnvironmentDestroy(id string) (Environment, error)
+	EnvironmentDestroy(id string) (*EnvironmentDestroyResponse, error)
 	EnvironmentMarkAsArchived(id string) error
 	EnvironmentUpdate(id string, payload EnvironmentUpdate) (Environment, error)
 	EnvironmentDeploy(id string, payload DeployRequest) (EnvironmentDeployResponse, error)
@@ -75,6 +75,7 @@ type ApiClientInterface interface {
 	EnvironmentScheduling(environmentId string) (EnvironmentScheduling, error)
 	EnvironmentSchedulingUpdate(environmentId string, payload EnvironmentScheduling) (EnvironmentScheduling, error)
 	EnvironmentSchedulingDelete(environmentId string) error
+	EnvironmentDeployment(id string) (*DeploymentLog, error)
 	WorkflowTrigger(environmentId string) ([]WorkflowTrigger, error)
 	WorkflowTriggerUpsert(environmentId string, request WorkflowTriggerUpsertPayload) ([]WorkflowTrigger, error)
 	EnvironmentDriftDetection(environmentId string) (EnvironmentSchedulingExpression, error)

client/environment.go

@@ -7,6 +7,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+const ENVIRONMENT = "environment"
+
 type ConfigurationVariableType int
 
 func (c *ConfigurationVariableType) ReadResourceData(fieldName string, d *schema.ResourceData) error {
@@ -27,7 +29,7 @@ func (c *ConfigurationVariableType) WriteResourceData(fieldName string, d *schem
 
 	switch val := *c; val {
 	case 0:
-		valStr = "environment"
+		valStr = ENVIRONMENT
 	case 1:
 		valStr = TERRAFORM
 	default:
@@ -91,6 +93,7 @@ type DeploymentLog struct {
 	Output              json.RawMessage `json:"output,omitempty"`
 	Error               json.RawMessage `json:"error,omitempty"`
 	Type                string          `json:"type"`
+	Status              string          `json:"status"`
 	WorkflowFile        *WorkflowFile   `json:"workflowFile,omitempty" tfschema:"-"`
 }
 
@@ -163,6 +166,10 @@ type EnvironmentMoveRequest struct {
 	ProjectId string `json:"projectId"`
 }
 
+type EnvironmentDestroyResponse struct {
+	Id string `json:"id"`
+}
+
 func GetConfigurationVariableType(variableType string) (ConfigurationVariableType, error) {
 	switch variableType {
 	case "terraform":
@@ -256,6 +263,15 @@ func (client *ApiClient) Environment(id string) (Environment, error) {
 	return result, nil
 }
 
+func (client *ApiClient) EnvironmentDeployment(id string) (*DeploymentLog, error) {
+	var result DeploymentLog
+	err := client.http.Get("/environments/deployments/"+id, nil, &result)
+	if err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 func (client *ApiClient) EnvironmentCreate(payload EnvironmentCreate) (Environment, error) {
 	var result Environment
 
@@ -283,13 +299,13 @@ func (client *ApiClient) EnvironmentCreateWithoutTemplate(payload EnvironmentCre
 	return result, nil
 }
 
-func (client *ApiClient) EnvironmentDestroy(id string) (Environment, error) {
-	var result Environment
+func (client *ApiClient) EnvironmentDestroy(id string) (*EnvironmentDestroyResponse, error) {
+	var result EnvironmentDestroyResponse
 	err := client.http.Post("/environments/"+id+"/destroy", nil, &result)
 	if err != nil {
-		return Environment{}, err
+		return nil, err
 	}
-	return result, nil
+	return &result, nil
 }
 
 func (client *ApiClient) EnvironmentUpdate(id string, payload EnvironmentUpdate) (Environment, error) {

client/environment_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/env0/terraform-provider-env0/client"
 	. "github.com/env0/terraform-provider-env0/client"
 	"github.com/jinzhu/copier"
 	. "github.com/onsi/ginkgo"
@@ -280,15 +281,27 @@ var _ = Describe("Environment Client", func() {
 
 	Describe("EnvironmentDelete", func() {
 		var err error
+		var res *client.EnvironmentDestroyResponse
+
+		mockedRes := client.EnvironmentDestroyResponse{
+			Id: "id123",
+		}
 
 		BeforeEach(func() {
-			httpCall = mockHttpClient.EXPECT().Post("/environments/"+mockEnvironment.Id+"/destroy", nil, gomock.Any()).Times(1)
-			_, err = apiClient.EnvironmentDestroy(mockEnvironment.Id)
+			httpCall = mockHttpClient.EXPECT().Post("/environments/"+mockEnvironment.Id+"/destroy", nil, gomock.Any()).Times(1).
+				Do((func(path string, request interface{}, response *EnvironmentDestroyResponse) {
+					*response = mockedRes
+				}))
+			res, err = apiClient.EnvironmentDestroy(mockEnvironment.Id)
 		})
 
 		It("Should not return error", func() {
 			Expect(err).To(BeNil())
 		})
+
+		It("Should return the expected response", func() {
+			Expect(*res).To(Equal(mockedRes))
+		})
 	})
 
 	Describe("EnvironmentMarkAsArchived", func() {
@@ -438,6 +451,34 @@ var _ = Describe("Environment Client", func() {
 			Expect(err).To(BeNil())
 		})
 	})
+
+	Describe("EnvironmentDeployment", func() {
+		var deployment *DeploymentLog
+		var err error
+
+		mockDeployment := DeploymentLog{
+			Id:     "id12345",
+			Status: "IN_PROGRESS",
+		}
+
+		BeforeEach(func() {
+			httpCall = mockHttpClient.EXPECT().
+				Get("/environments/deployments/"+mockDeployment.Id, nil, gomock.Any()).
+				Do(func(path string, request interface{}, response *DeploymentLog) {
+					*response = mockDeployment
+				}).Times(1)
+
+			deployment, err = apiClient.EnvironmentDeployment(mockDeployment.Id)
+		})
+
+		It("Should return deployment", func() {
+			Expect(*deployment).To(Equal(mockDeployment))
+		})
+
+		It("Should not return an error", func() {
+			Expect(err).To(BeNil())
+		})
+	})
 })
 
 func TestMarshalEnvironmentCreateWithoutTemplate(t *testing.T) {

env0/data_configuration_variable.go

@@ -198,37 +198,47 @@ func getConfigurationVariable(params ConfigurationVariableParams, meta interface
 	name, nameOk := params.Name, params.Name != ""
 	typeString, ok := params.ConfigurationType, params.ConfigurationType != ""
 	type_ := -1
+
 	if ok {
 		if !nameOk {
 			return client.ConfigurationVariable{}, diag.Errorf("Specify 'type' only when searching configuration variables by 'name' (not by 'id')")
 		}
+
 		switch typeString {
-		case "environment":
+		case client.ENVIRONMENT:
 			type_ = int(client.ConfigurationVariableTypeEnvironment)
-		case "terraform":
+		case client.TERRAFORM:
 			type_ = int(client.ConfigurationVariableTypeTerraform)
 		default:
 			return client.ConfigurationVariable{}, diag.Errorf("Invalid value for 'type': %s. can be either 'environment' or 'terraform'", typeString)
 		}
 	}
+
 	var variable client.ConfigurationVariable
+
 	for _, candidate := range variables {
 		if idOk && candidate.Id == id {
 			variable = candidate
+
 			break
 		}
+
 		if nameOk && candidate.Name == name {
 			if type_ != -1 {
 				if int(*candidate.Type) != type_ {
 					continue
 				}
 			}
+
 			variable = candidate
+
 			break
 		}
 	}
+
 	if variable.Id == "" {
 		return client.ConfigurationVariable{}, diag.Errorf("Could not find variable")
 	}
+
 	return variable, nil
 }

env0/data_git_token.go

@@ -31,6 +31,7 @@ func dataGitToken() *schema.Resource {
 
 func dataGitTokenRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var gitToken *client.GitToken
+
 	var err error
 
 	id, ok := d.GetOk("id")

env0/errors.go

@@ -28,6 +28,7 @@ func ResourceGetFailure(ctx context.Context, resourceName string, d *schema.Reso
 	if driftDetected(err) {
 		tflog.Warn(ctx, "Drift Detected: Terraform will remove id from state", map[string]interface{}{"id": d.Id()})
 		d.SetId("")
+
 		return nil
 	}
 

env0/provider.go

@@ -193,29 +193,34 @@ func configureProvider(version string, p *schema.Provider) schema.ConfigureConte
 				if r != nil {
 					tflog.SubsystemInfo(subCtx, "env0_api_client", "Sending request", map[string]interface{}{"method": r.Method, "url": r.URL})
 				}
+
 				return nil
 			}).
 			OnAfterResponse(func(c *resty.Client, r *resty.Response) error {
 				tflog.SubsystemInfo(subCtx, "env0_api_client", "Received response", map[string]interface{}{"method": r.Request.Method, "url": r.Request.URL, "status": r.Status()})
+
 				return nil
 			}).
 			AddRetryAfterErrorCondition().
 			AddRetryCondition(func(r *resty.Response, err error) bool {
 				if r == nil {
 					// No response. Possibly a networking issue (E.g. DNS lookup failure).
 					tflog.SubsystemWarn(subCtx, "env0_api_client", "No response, retrying request")
+
 					return true
 				}
 
 				// When running integration tests 404 may occur due to "database eventual consistency".
 				// Retry when there's a 5xx error. Otherwise do not retry.
 				if r.StatusCode() >= 500 || (isIntegrationTest && r.StatusCode() == 404) {
 					tflog.SubsystemWarn(subCtx, "env0_api_client", "Received a failed or not found response, retrying request", map[string]interface{}{"method": r.Request.Method, "url": r.Request.URL, "status code": r.StatusCode()})
+
 					return true
 				}
 
 				if r.StatusCode() == 200 && isIntegrationTest && r.String() == "[]" {
 					tflog.SubsystemWarn(subCtx, "env0_api_client", "Received an empty list , retrying request", map[string]interface{}{"method": r.Request.Method, "url": r.Request.URL})
+
 					return true
 				}
 
@@ -249,6 +254,7 @@ func configureProvider(version string, p *schema.Provider) schema.ConfigureConte
 		if _, err := apiClient.OrganizationId(); err != nil {
 			return nil, diag.Diagnostics{diag.Diagnostic{Severity: diag.Error, Summary: err.Error()}}
 		}
+
 		return apiClient, nil
 	}
 }