Revert "Refactor : move testutils from pkg to exoscale to avoid i…

…mport cycles" This reverts commit 30d9747.
exoscale · Jan 7, 2025 · 0c4bf90 · 0c4bf90
1 parent a000ce9
commit 0c4bf90
Show file tree

Hide file tree

Showing 39 changed files with 39 additions and 39 deletions.
diff --git a/pkg/list/filterable_list_datasource_test.go b/pkg/list/filterable_list_datasource_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 func TestFilterableListDataSource(t *testing.T) {

diff --git a/pkg/resources/anti_affinity_group/datasource_test.go b/pkg/resources/anti_affinity_group/datasource_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 	aagroup "github.com/exoscale/terraform-provider-exoscale/pkg/resources/anti_affinity_group"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var dsGroupName = acctest.RandomWithPrefix(testutils.Prefix)

diff --git a/pkg/resources/anti_affinity_group/resource_test.go b/pkg/resources/anti_affinity_group/resource_test.go
@@ -11,8 +11,8 @@ import (
 
 	egoscale "github.com/exoscale/egoscale/v2"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 	aagroup "github.com/exoscale/terraform-provider-exoscale/pkg/resources/anti_affinity_group"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var (

diff --git a/pkg/resources/block_storage/main_test.go b/pkg/resources/block_storage/main_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 func TestBlockStorage(t *testing.T) {

diff --git a/pkg/resources/database/datasource_uri_test.go b/pkg/resources/database/datasource_uri_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"

diff --git a/pkg/resources/database/main_test.go b/pkg/resources/database/main_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 func TestDatabase(t *testing.T) {

diff --git a/pkg/resources/database/resource_grafana_test.go b/pkg/resources/database/resource_grafana_test.go
@@ -20,7 +20,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelGrafana struct {

diff --git a/pkg/resources/database/resource_kafka_test.go b/pkg/resources/database/resource_kafka_test.go
@@ -20,7 +20,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelKafka struct {

diff --git a/pkg/resources/database/resource_mysql_test.go b/pkg/resources/database/resource_mysql_test.go
@@ -20,7 +20,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelMysql struct {

diff --git a/pkg/resources/database/resource_opensearch_test.go b/pkg/resources/database/resource_opensearch_test.go
@@ -20,7 +20,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelOpensearch struct {

diff --git a/pkg/resources/database/resource_pg_test.go b/pkg/resources/database/resource_pg_test.go
@@ -19,7 +19,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelPg struct {

diff --git a/pkg/resources/database/resource_redis_test.go b/pkg/resources/database/resource_redis_test.go
@@ -20,7 +20,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	"github.com/exoscale/egoscale/v2/oapi"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 type TemplateModelRedis struct {

diff --git a/pkg/resources/iam/datasource_api_key_test.go b/pkg/resources/iam/datasource_api_key_test.go
@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
@@ -14,7 +14,7 @@ func testDataSourceAPIKey(t *testing.T) {
 	fullResourceName := "data.exoscale_iam_api_key.test"
 
 	// Role
-	tpl1, err := template.ParseFiles("./testdata/resource_iam_role.tmpl")
+	tpl1, err := template.ParseFiles("../../testutils/testdata/resource_iam_role.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -33,7 +33,7 @@ func testDataSourceAPIKey(t *testing.T) {
 	configCreate := buf.String() + "\n"
 
 	// API Key
-	tpl2, err := template.ParseFiles("./testdata/resource_iam_api_key.tmpl")
+	tpl2, err := template.ParseFiles("../../testutils/testdata/resource_iam_api_key.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/iam/datasource_org_policy_test.go b/pkg/resources/iam/datasource_org_policy_test.go
@@ -3,7 +3,7 @@ package iam_test
 import (
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )

diff --git a/pkg/resources/iam/datasource_role_test.go b/pkg/resources/iam/datasource_role_test.go
@@ -5,14 +5,14 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func testDataSourceRole(t *testing.T) {
 	// Role
-	tpl, err := template.ParseFiles("./testdata/resource_iam_role.tmpl")
+	tpl, err := template.ParseFiles("../../testutils/testdata/resource_iam_role.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/iam/resource_api_key_test.go b/pkg/resources/iam/resource_api_key_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -15,7 +15,7 @@ func testResourceAPIKey(t *testing.T) {
 	fullResourceName := "exoscale_iam_api_key.test"
 
 	// Role
-	tpl1, err := template.ParseFiles("./testdata/resource_iam_role.tmpl")
+	tpl1, err := template.ParseFiles("../../testutils/testdata/resource_iam_role.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -51,7 +51,7 @@ func testResourceAPIKey(t *testing.T) {
 	configCreate := buf.String() + "\n"
 
 	// API Key
-	tpl2, err := template.ParseFiles("./testdata/resource_iam_api_key.tmpl")
+	tpl2, err := template.ParseFiles("../../testutils/testdata/resource_iam_api_key.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/iam/resource_org_policy_test.go b/pkg/resources/iam/resource_org_policy_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -15,7 +15,7 @@ func testResourceOrgPolicy(t *testing.T) {
 	fullResourceName := "exoscale_iam_org_policy.test"
 	expression := acctest.RandomWithPrefix(testutils.Prefix)
 
-	tpl, err := template.ParseFiles("./testdata/resource_iam_org_policy.tmpl")
+	tpl, err := template.ParseFiles("../../testutils/testdata/resource_iam_org_policy.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/iam/resource_role_test.go b/pkg/resources/iam/resource_role_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -14,7 +14,7 @@ import (
 func testResourceRole(t *testing.T) {
 	fullResourceName := "exoscale_iam_role.test"
 
-	tpl, err := template.ParseFiles("./testdata/resource_iam_role.tmpl")
+	tpl, err := template.ParseFiles("../../testutils/testdata/resource_iam_role.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/instance/datasource_list_test.go b/pkg/resources/instance/datasource_list_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var (

diff --git a/pkg/resources/instance/datasource_test.go b/pkg/resources/instance/datasource_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/resources/instance"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var (

diff --git a/pkg/resources/instance/destroy_protection_test.go b/pkg/resources/instance/destroy_protection_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var computeInstanceResource = `

diff --git a/pkg/resources/instance/resource_test.go b/pkg/resources/instance/resource_test.go
@@ -12,8 +12,8 @@ import (
 
 	v3 "github.com/exoscale/egoscale/v3"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/resources/instance"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 

diff --git a/pkg/resources/instance_pool/datasource_list_test.go b/pkg/resources/instance_pool/datasource_list_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 var (

diff --git a/pkg/resources/instance_pool/datasource_test.go b/pkg/resources/instance_pool/datasource_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 

diff --git a/pkg/resources/instance_pool/resource_test.go b/pkg/resources/instance_pool/resource_test.go
@@ -12,8 +12,8 @@ import (
 
 	v3 "github.com/exoscale/egoscale/v3"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/resources/instance_pool"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 

diff --git a/pkg/resources/nlb_service/datasource_list_test.go b/pkg/resources/nlb_service/datasource_list_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -16,7 +16,7 @@ func testListDataSource(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	// template testdata
-	tpl, err := template.ParseFiles("./testdata/datasource_template.tmpl")
+	tpl, err := template.ParseFiles("../../testutils/testdata/datasource_template.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -33,7 +33,7 @@ func testListDataSource(t *testing.T) {
 	buf.WriteString("\n")
 
 	// ipool testdata
-	tpl, err = template.ParseFiles("./testdata/resource_instance_pool.tmpl")
+	tpl, err = template.ParseFiles("../../testutils/testdata/resource_instance_pool.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -54,7 +54,7 @@ func testListDataSource(t *testing.T) {
 	buf.WriteString("\n")
 
 	// nlb testdata
-	tpl, err = template.ParseFiles("./testdata/resource_nlb.tmpl")
+	tpl, err = template.ParseFiles("../../testutils/testdata/resource_nlb.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -71,7 +71,7 @@ func testListDataSource(t *testing.T) {
 	buf.WriteString("\n")
 
 	// nlb_service testdata
-	tpl, err = template.ParseFiles("./testdata/resource_nlb_service.tmpl")
+	tpl, err = template.ParseFiles("../../testutils/testdata/resource_nlb_service.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -97,7 +97,7 @@ func testListDataSource(t *testing.T) {
 
 	// datasource by name
 	buf = &bytes.Buffer{}
-	tpl, err = template.ParseFiles("./testdata/datasource_nlb_service_list.tmpl")
+	tpl, err = template.ParseFiles("../../testutils/testdata/datasource_nlb_service_list.tmpl")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/resources/sos_bucket_policy/main_test.go b/pkg/resources/sos_bucket_policy/main_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/testutils"
 )
 
 func TestSOSBucketPolicy(t *testing.T) {

diff --git a/exoscale/testutils/api_validators.go → pkg/testutils/api_validators.go b/exoscale/testutils/api_validators.go → pkg/testutils/api_validators.go
diff --git a/exoscale/testutils/template_models.go → pkg/testutils/template_models.go b/exoscale/testutils/template_models.go → pkg/testutils/template_models.go
diff --git a/...testdata/datasource_nlb_service_list.tmpl → ...testdata/datasource_nlb_service_list.tmpl b/...testdata/datasource_nlb_service_list.tmpl → ...testdata/datasource_nlb_service_list.tmpl
diff --git a/...service/testdata/datasource_template.tmpl → ...stutils/testdata/datasource_template.tmpl b/...service/testdata/datasource_template.tmpl → ...stutils/testdata/datasource_template.tmpl
diff --git a/...es/iam/testdata/resource_iam_api_key.tmpl → ...tutils/testdata/resource_iam_api_key.tmpl b/...es/iam/testdata/resource_iam_api_key.tmpl → ...tutils/testdata/resource_iam_api_key.tmpl
diff --git a/...iam/testdata/resource_iam_org_policy.tmpl → ...ils/testdata/resource_iam_org_policy.tmpl b/...iam/testdata/resource_iam_org_policy.tmpl → ...ils/testdata/resource_iam_org_policy.tmpl
diff --git a/...urces/iam/testdata/resource_iam_role.tmpl → ...testutils/testdata/resource_iam_role.tmpl b/...urces/iam/testdata/resource_iam_role.tmpl → ...testutils/testdata/resource_iam_role.tmpl
diff --git a/...vice/testdata/resource_instance_pool.tmpl → ...tils/testdata/resource_instance_pool.tmpl b/...vice/testdata/resource_instance_pool.tmpl → ...tils/testdata/resource_instance_pool.tmpl
diff --git a/...es/nlb_service/testdata/resource_nlb.tmpl → pkg/testutils/testdata/resource_nlb.tmpl b/...es/nlb_service/testdata/resource_nlb.tmpl → pkg/testutils/testdata/resource_nlb.tmpl
diff --git a/...ervice/testdata/resource_nlb_service.tmpl → ...tutils/testdata/resource_nlb_service.tmpl b/...ervice/testdata/resource_nlb_service.tmpl → ...tutils/testdata/resource_nlb_service.tmpl
diff --git a/exoscale/testutils/testutils.go → pkg/testutils/testutils.go b/exoscale/testutils/testutils.go → pkg/testutils/testutils.go
diff --git a/exoscale/testutils/validation.go → pkg/testutils/validation.go b/exoscale/testutils/validation.go → pkg/testutils/validation.go