Fix env0 configuration variable import #126 (#213)

env0/data_configuration_variable_test.go

@@ -3,11 +3,12 @@ package env0
 import (
 	"errors"
 
-	"github.com/env0/terraform-provider-env0/client"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"
 	"strconv"
 	"testing"
+
+	"github.com/env0/terraform-provider-env0/client"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestUnitConfigurationVariableData(t *testing.T) {

env0/resource_configuration_variable.go

@@ -104,6 +104,8 @@ func resourceConfigurationVariable() *schema.Resource {
 	}
 }
 
+const templateScope = "TEMPLATE"
+
 func whichScope(d *schema.ResourceData) (client.Scope, string) {
 	scope := client.ScopeGlobal
 	scopeId := ""
@@ -115,10 +117,6 @@ func whichScope(d *schema.ResourceData) (client.Scope, string) {
 		scope = client.ScopeTemplate
 		scopeId = templateId.(string)
 	}
-	if templateId, ok := d.GetOk("blueprint_id"); ok {
-		scope = client.ScopeTemplate
-		scopeId = templateId.(string)
-	}
 	if environmentId, ok := d.GetOk("environment_id"); ok {
 		scope = client.ScopeEnvironment
 		scopeId = environmentId.(string)
@@ -302,7 +300,14 @@ func resourceConfigurationVariableImport(ctx context.Context, d *schema.Resource
 		return nil, errors.New(getErr[0].Summary)
 	} else {
 		d.SetId(variable.Id)
-		scopeName := strings.ToLower(fmt.Sprintf("%s_id", variable.Scope))
+
+		var scopeName string
+
+		if variable.Scope == client.ScopeTemplate {
+			scopeName = strings.ToLower(fmt.Sprintf("%s_id", templateScope))
+		} else {
+			scopeName = strings.ToLower(fmt.Sprintf("%s_id", variable.Scope))
+		}
 
 		d.Set(scopeName, configurationParams.ScopeId)
 

env0/resource_configuration_variable_test.go

@@ -493,4 +493,88 @@ resource "%s" "test" {
 			mock.EXPECT().ConfigurationVariableDelete(configVar.Id).Times(1).Return(nil)
 		})
 	})
+
+	importStateId_id := `{  "Scope": "BLUEPRINT",  "ScopeId": "id0", "Id": "id1", "name": "name0"}`
+	importStateId_name := `{  "Scope": "BLUEPRINT",  "ScopeId": "id0",  "name": "name0"}`
+	ResourceNameImport := "env0_configuration_variable.test"
+	configVarImport := client.ConfigurationVariable{
+		Id:          "id1",
+		Name:        "name0",
+		Description: "desc0",
+		Value:       "Variable",
+		IsReadonly:  &isReadonly,
+		IsRequired:  &isRequired,
+		Scope:       "BLUEPRINT",
+	}
+	stepConfirImport := resourceConfigCreate(resourceType, resourceName, map[string]interface{}{
+
+		"name":         configVarImport.Name,
+		"description":  configVarImport.Description,
+		"value":        configVarImport.Value,
+		"is_read_only": strconv.FormatBool(*configVar.IsReadonly),
+		"is_required":  strconv.FormatBool(*configVar.IsRequired),
+		"template_id":  "id0",
+	})
+
+	configurationVariableCreateParamsImport := client.ConfigurationVariableCreateParams{
+		Name:        configVarImport.Name,
+		Value:       configVarImport.Value,
+		IsSensitive: false,
+		Scope:       client.ScopeTemplate,
+		ScopeId:     "id0",
+		Type:        client.ConfigurationVariableTypeEnvironment,
+		EnumValues:  nil,
+		Description: configVarImport.Description,
+		Format:      client.Text,
+		IsRequired:  *configVarImport.IsRequired,
+		IsReadonly:  *configVarImport.IsReadonly,
+	}
+	t.Run("import by name", func(t *testing.T) {
+
+		createTestCaseForImport := resource.TestCase{
+			Steps: []resource.TestStep{
+				{
+					Config: stepConfirImport,
+				},
+				{
+					ResourceName:            ResourceNameImport,
+					ImportState:             true,
+					ImportStateId:           importStateId_name,
+					ImportStateVerify:       true,
+					ImportStateVerifyIgnore: []string{"is_required", "is_read_only"},
+				},
+			},
+		}
+
+		runUnitTest(t, createTestCaseForImport, func(mock *client.MockApiClientInterface) {
+			mock.EXPECT().ConfigurationVariableCreate(configurationVariableCreateParamsImport).Times(1).Return(configVarImport, nil)
+			mock.EXPECT().ConfigurationVariablesById(configVarImport.Id).Times(2).Return(configVarImport, nil)
+			mock.EXPECT().ConfigurationVariablesByScope(client.ScopeTemplate, configurationVariableCreateParamsImport.ScopeId).AnyTimes().Return([]client.ConfigurationVariable{configVarImport}, nil)
+			mock.EXPECT().ConfigurationVariableDelete(configVarImport.Id).Times(1).Return(nil)
+		})
+	})
+
+	t.Run("import by id", func(t *testing.T) {
+
+		createTestCaseForImport := resource.TestCase{
+			Steps: []resource.TestStep{
+				{
+					Config: stepConfirImport,
+				},
+				{
+					ResourceName:            ResourceNameImport,
+					ImportState:             true,
+					ImportStateId:           importStateId_id,
+					ImportStateVerify:       true,
+					ImportStateVerifyIgnore: []string{"is_required", "is_read_only"},
+				},
+			},
+		}
+
+		runUnitTest(t, createTestCaseForImport, func(mock *client.MockApiClientInterface) {
+			mock.EXPECT().ConfigurationVariableCreate(configurationVariableCreateParamsImport).Times(1).Return(configVarImport, nil)
+			mock.EXPECT().ConfigurationVariablesById(configVarImport.Id).Times(3).Return(configVarImport, nil)
+			mock.EXPECT().ConfigurationVariableDelete(configVarImport.Id).Times(1).Return(nil)
+		})
+	})
 }

env0/resource_project_test.go

@@ -1,11 +1,12 @@
 package env0
 
 import (
+	"regexp"
+	"testing"
+
 	"github.com/env0/terraform-provider-env0/client"
 	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"regexp"
-	"testing"
 )
 
 func TestUnitProjectResource(t *testing.T) {

examples/resources/env0_environment_scheduling/resource.tf

@@ -4,6 +4,6 @@ data "env0_environment" "example" {
 
 resource "env0_environment_schedling" "example" {
   environment_id = data.env0_environment.example.id
-  deploy_cron = "5 * * * *"
-  destroy_cron = "10 * * * *"
+  deploy_cron    = "5 * * * *"
+  destroy_cron   = "10 * * * *"
 }

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/adhocore/gronx v0.2.6
 	github.com/go-resty/resty/v2 v2.6.0
 	github.com/golang/mock v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.2.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-exec v0.15.0 // indirect