Chore: run acceptance tests in parallel

env0/provider.go

@@ -13,6 +13,18 @@ import (
 
 func Provider(version string) plugin.ProviderFunc {
 	return func() *schema.Provider {
+		apiKeyEnv := "ENV0_API_KEY"
+		apiSecretEnv := "ENV0_API_SECRET"
+
+		// version "TEST" is used for acceptance testing.
+		// Due to race conditions related to env variables:
+		// Using different env variables during testing prevetns the race conditions.
+		if version == "TEST" {
+			version = ""
+			apiKeyEnv = "ENV0_API_KEY_TEST"
+			apiSecretEnv = "ENV0_API_SECRET_TEST"
+		}
+
 		provider := &schema.Provider{
 			Schema: map[string]*schema.Schema{
 				"api_endpoint": {
@@ -24,14 +36,14 @@ func Provider(version string) plugin.ProviderFunc {
 				"api_key": {
 					Type:        schema.TypeString,
 					Description: "env0 api key (https://developer.env0.com/docs/api/YXBpOjY4Njc2-env0-api#creating-an-api-key)",
-					DefaultFunc: schema.EnvDefaultFunc("ENV0_API_KEY", nil),
+					DefaultFunc: schema.EnvDefaultFunc(apiKeyEnv, nil),
 					Required:    true,
 					Sensitive:   true,
 				},
 				"api_secret": {
 					Type:        schema.TypeString,
 					Description: "env0 api key secret",
-					DefaultFunc: schema.EnvDefaultFunc("ENV0_API_SECRET", nil),
+					DefaultFunc: schema.EnvDefaultFunc(apiSecretEnv, nil),
 					Required:    true,
 					Sensitive:   true,
 				},

env0/provider_test.go

@@ -3,55 +3,48 @@ package env0
 import (
 	"context"
 	"fmt"
+	"os"
+	"strings"
+	"testing"
+
 	"github.com/env0/terraform-provider-env0/client"
 	"github.com/env0/terraform-provider-env0/utils"
 	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-	"os"
-	"strings"
-	"testing"
 )
 
-var (
-	apiClientMock *client.MockApiClientInterface
-	ctrl          *gomock.Controller
-)
-
-var testUnitProviders = map[string]func() (*schema.Provider, error){
-	"env0": func() (*schema.Provider, error) {
-		provider := Provider("")()
-		provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-			return apiClientMock, nil
-		}
-		return provider, nil
-	},
-}
-
 func runUnitTest(t *testing.T, testCase resource.TestCase, mockFunc func(mockFunc *client.MockApiClientInterface)) {
+	os.Setenv("TF_ACC", "1")
+	os.Setenv("ENV0_API_KEY", "value")
+	os.Setenv("ENV0_API_SECRET", "value")
+
 	testPattern := os.Getenv("TEST_PATTERN")
 	if testPattern != "" && !strings.Contains(t.Name(), testPattern) {
 		t.SkipNow()
 		return
 	}
 
 	testReporter := utils.TestReporter{T: t}
-	ctrl = gomock.NewController(&testReporter)
+	ctrl := gomock.NewController(&testReporter)
 	defer ctrl.Finish()
 
-	os.Setenv("ENV0_API_KEY", "value")
-	os.Setenv("ENV0_API_SECRET", "value")
-	defer os.Setenv("ENV0_API_KEY", "")
-	defer os.Setenv("ENV0_API_SECRET", "")
-
-	apiClientMock = client.NewMockApiClientInterface(ctrl)
+	apiClientMock := client.NewMockApiClientInterface(ctrl)
 	mockFunc(apiClientMock)
 
-	testCase.ProviderFactories = testUnitProviders
+	testCase.ProviderFactories = map[string]func() (*schema.Provider, error){
+		"env0": func() (*schema.Provider, error) {
+			provider := Provider("")()
+			provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
+				return apiClientMock, nil
+			}
+			return provider, nil
+		},
+	}
 	testCase.PreventPostDestroyRefresh = true
-	resource.UnitTest(&testReporter, testCase)
+	resource.ParallelTest(&testReporter, testCase)
 }
 
 func TestProvider(t *testing.T) {
@@ -80,12 +73,12 @@ func testMissingEnvVar(t *testing.T, envVars map[string]string, expectedKey stri
 		defer os.Setenv(key, "")
 	}
 
-	diags := Provider("")().Validate(&terraform.ResourceConfig{})
+	diags := Provider("TEST")().Validate(&terraform.ResourceConfig{})
 	testExpectedProviderError(t, diags, expectedKey)
 }
 
 func testMissingConfig(t *testing.T, config map[string]interface{}, expectedKey string) {
-	diags := Provider("")().Validate(terraform.NewResourceConfigRaw(config))
+	diags := Provider("TEST")().Validate(terraform.NewResourceConfigRaw(config))
 	testExpectedProviderError(t, diags, expectedKey)
 }
 
@@ -108,10 +101,10 @@ func TestMissingConfigurations(t *testing.T) {
 
 	envVarsTestCases := map[string]map[string]string{
 		expectedApiKeyConfig: {
-			"ENV0_API_SECRET": "value",
+			"ENV0_API_SECRET_TEST": "value",
 		},
 		expectedApiSecretConfig: {
-			"ENV0_API_KEY": "value",
+			"ENV0_API_KEY_TEST": "value",
 		},
 	}
 

env0/resource_azure_credentials_test.go

@@ -135,15 +135,18 @@ func TestUnitAzureCredentialsResource(t *testing.T) {
 	})
 
 	t.Run("validate missing arguments", func(t *testing.T) {
-		missingArgumentsTestCases := []resource.TestCase{
-			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, "client_id"),
-			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, "client_secret"),
-			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, "subscription_id"),
-			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, "tenant_id"),
-			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, "name"),
+		arguments := []string{
+			"client_id",
+			"client_secret",
+			"subscription_id",
+			"tenant_id",
+			"name",
 		}
-		for _, testCase := range missingArgumentsTestCases {
-			runUnitTest(t, testCase, func(mock *client.MockApiClientInterface) {
+
+		for _, argument := range arguments {
+			tc := missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{}, argument)
+			t.Run("validate missing arrguments "+argument, func(t *testing.T) {
+				runUnitTest(t, tc, func(mock *client.MockApiClientInterface) {})
 			})
 		}
 	})

env0/resource_environment.go

@@ -185,10 +185,10 @@ func setEnvironmentSchema(d *schema.ResourceData, environment client.Environment
 	d.Set("id", environment.Id)
 	d.Set("name", environment.Name)
 	d.Set("project_id", environment.ProjectId)
-	d.Set("workspace", environment.WorkspaceName)
-	d.Set("auto_deploy_by_custom_glob", environment.AutoDeployByCustomGlob)
-	d.Set("ttl", environment.LifespanEndAt)
-	d.Set("terragrunt_working_directory", environment.TerragruntWorkingDirectory)
+	safeSet(d, "workspace", environment.WorkspaceName)
+	safeSet(d, "auto_deploy_by_custom_glob", environment.AutoDeployByCustomGlob)
+	safeSet(d, "ttl", environment.LifespanEndAt)
+	safeSet(d, "terragrunt_working_directory", environment.TerragruntWorkingDirectory)
 	if environment.LatestDeploymentLog != (client.DeploymentLog{}) {
 		d.Set("template_id", environment.LatestDeploymentLog.BlueprintId)
 		d.Set("revision", environment.LatestDeploymentLog.BlueprintRevision)
@@ -209,11 +209,17 @@ func setEnvironmentSchema(d *schema.ResourceData, environment client.Environment
 }
 
 func setEnvironmentConfigurationSchema(d *schema.ResourceData, configurationVariables []client.ConfigurationVariable) {
-	for index, configurationVariable := range configurationVariables {
+	var variables []interface{}
+
+	for _, configurationVariable := range configurationVariables {
 		variable := make(map[string]interface{})
 		variable["name"] = configurationVariable.Name
 		variable["value"] = configurationVariable.Value
-		variable["type"] = configurationVariable.Type
+		if configurationVariable.Type == nil || *configurationVariable.Type == 0 {
+			variable["type"] = "environment"
+		} else {
+			variable["type"] = "terraform"
+		}
 		if configurationVariable.Description != "" {
 			variable["description"] = configurationVariable.Description
 		}
@@ -225,7 +231,11 @@ func setEnvironmentConfigurationSchema(d *schema.ResourceData, configurationVari
 			variable["schema_enum"] = configurationVariable.Schema.Enum
 			variable["schema_format"] = configurationVariable.Schema.Format
 		}
-		d.Set(fmt.Sprintf(`configuration.%d`, index), variable)
+		variables = append(variables, variable)
+	}
+
+	if variables != nil {
+		d.Set("configuration", variables)
 	}
 }
 

env0/resource_environment_test.go

@@ -52,6 +52,7 @@ func TestUnitEnvironmentResource(t *testing.T) {
 	}
 	autoDeployOnPathChangesOnlyDefault := true
 	autoDeployByCustomGlobDefault := ""
+
 	t.Run("Success in create", func(t *testing.T) {
 		testCase := resource.TestCase{
 			Steps: []resource.TestStep{
@@ -106,6 +107,7 @@ func TestUnitEnvironmentResource(t *testing.T) {
 
 			mock.EXPECT().EnvironmentDestroy(environment.Id).Times(1)
 		})
+
 	})
 
 	t.Run("Success in create and deploy with variables update", func(t *testing.T) {

env0/resource_gcp_credentials_test.go

@@ -121,6 +121,7 @@ func TestUnitGcpCredentialsResource(t *testing.T) {
 	})
 
 	t.Run("validate missing arguments", func(t *testing.T) {
+
 		missingArgumentsTestCases := []resource.TestCase{
 			missingArgumentTestCase(resourceType, resourceName, map[string]interface{}{
 				"name": "update",
@@ -130,8 +131,12 @@ func TestUnitGcpCredentialsResource(t *testing.T) {
 			}, "name"),
 		}
 		for _, testCase := range missingArgumentsTestCases {
-			runUnitTest(t, testCase, func(mock *client.MockApiClientInterface) {
+			tc := testCase
+
+			t.Run("validate missing arguments", func(t *testing.T) {
+				runUnitTest(t, tc, func(mock *client.MockApiClientInterface) {})
 			})
+
 		}
 	})
 

env0/resource_template_test.go

@@ -632,7 +632,10 @@ func TestUnitTemplateResource(t *testing.T) {
 		}
 
 		for _, testCase := range testCases {
-			runUnitTest(t, testCase, func(mockFunc *client.MockApiClientInterface) {})
+			tc := testCase
+			t.Run("Invalid retry times field", func(t *testing.T) {
+				runUnitTest(t, tc, func(mockFunc *client.MockApiClientInterface) {})
+			})
 		}
 	})
 
@@ -655,7 +658,10 @@ func TestUnitTemplateResource(t *testing.T) {
 		}
 
 		for _, testCase := range testCases {
-			runUnitTest(t, testCase, func(mockFunc *client.MockApiClientInterface) {})
+			tc := testCase
+			t.Run("Invalid retry regex field", func(t *testing.T) {
+				runUnitTest(t, tc, func(mockFunc *client.MockApiClientInterface) {})
+			})
 		}
 	})
 

env0/utils.go

@@ -167,3 +167,10 @@ func writeResourceData(i interface{}, d *schema.ResourceData) error {
 
 	return nil
 }
+
+func safeSet(d *schema.ResourceData, k string, v interface{}) {
+	// Checks that the key exist in the schema before setting the value.
+	if test := d.Get(k); test != nil {
+		d.Set(k, v)
+	}
+}