Revert "Refactor : move testutils from exoscale to utils to avoid…

… import cycles"

This reverts commit 563b83e.

exoscale/resource_exoscale_nlb_service_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/stretchr/testify/require"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 
 	egoscale "github.com/exoscale/egoscale/v2"
 	exoapi "github.com/exoscale/egoscale/v2/api"

exoscale/resource_exoscale_sks_nodepool.go

@@ -14,7 +14,7 @@ import (
 	v3 "github.com/exoscale/egoscale/v3"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/general"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const (

utils/testutils/api_validators.go → exoscale/testutils/api_validators.go

@@ -12,7 +12,7 @@ import (
 	egoscale "github.com/exoscale/egoscale/v2"
 	exoapi "github.com/exoscale/egoscale/v2/api"
 	v3 "github.com/exoscale/egoscale/v3"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 func CheckAntiAffinityGroupExists(r string, res *egoscale.AntiAffinityGroup) resource.TestCheckFunc {

utils/testutils/validation.go → exoscale/testutils/validation.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 // testAttrs represents a map of expected resource attributes during acceptance tests.

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 func TestFilterableListDataSource(t *testing.T) {

pkg/resources/anti_affinity_group/datasource.go

@@ -10,7 +10,7 @@ import (
 	exoapi "github.com/exoscale/egoscale/v2/api"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 func DataSource() *schema.Resource {

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/utils/testutils"
 )
 
 var dsGroupName = acctest.RandomWithPrefix(testutils.Prefix)

pkg/resources/anti_affinity_group/resource.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"

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/utils/testutils"
 )
 
 var (

pkg/resources/block_storage/datasource_snapshot.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	providerConfig "github.com/exoscale/terraform-provider-exoscale/pkg/provider/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const DataSourceSnapshotDescription = `Fetch [Exoscale Block Storage](https://community.exoscale.com/documentation/block-storage/) Snapshot.

pkg/resources/block_storage/datasource_volume.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	providerConfig "github.com/exoscale/terraform-provider-exoscale/pkg/provider/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const DataSourceVolumeDescription = `Fetch [Exoscale Block Storage](https://community.exoscale.com/documentation/block-storage/) Volume.

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 func TestBlockStorage(t *testing.T) {

pkg/resources/block_storage/resource_snapshot.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	providerConfig "github.com/exoscale/terraform-provider-exoscale/pkg/provider/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const ResourceSnapshotDescription = `Manage [Exoscale Block Storage](https://community.exoscale.com/documentation/block-storage/) Volume Snapshot.

pkg/resources/block_storage/resource_volume.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	providerConfig "github.com/exoscale/terraform-provider-exoscale/pkg/provider/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const ResourceVolumeDescription = `Manage [Exoscale Block Storage](https://community.exoscale.com/documentation/block-storage/) Volume.

pkg/resources/database/datasource_uri.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	providerConfig "github.com/exoscale/terraform-provider-exoscale/pkg/provider/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const DataSourceURIDescription = `Fetch Exoscale [Database](https://community.exoscale.com/documentation/dbaas/) connection URI data.

pkg/resources/database/datasource_uri_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 func TestDatabase(t *testing.T) {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelGrafana struct {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelKafka struct {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelMysql struct {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelOpensearch struct {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelPg struct {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 type TemplateModelRedis struct {

pkg/resources/database/resource_user.go

@@ -17,7 +17,7 @@ import (
 
 	exoscale "github.com/exoscale/egoscale/v3"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 // UserResource defines the resource implementation.

pkg/resources/iam/datasource_api_key_test.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )

pkg/resources/iam/datasource_org_policy_test.go

@@ -3,7 +3,7 @@ package iam_test
 import (
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )

pkg/resources/iam/datasource_role_test.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )

pkg/resources/iam/resource_api_key_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"

pkg/resources/iam/resource_org_policy_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"

pkg/resources/iam/resource_role_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"

pkg/resources/instance/datasource.go

@@ -13,7 +13,7 @@ import (
 	v3 "github.com/exoscale/egoscale/v3"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 // DataSourceSchema returns a schema for a single Compute instance data source.

pkg/resources/instance/datasource_list.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/filter"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 func DataSourceList() *schema.Resource {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 var (

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/utils/testutils"
 )
 
 var (

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 var computeInstanceResource = `

pkg/resources/instance/resource.go

@@ -15,7 +15,7 @@ import (
 	v3 "github.com/exoscale/egoscale/v3"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 func Resource() *schema.Resource {

pkg/resources/instance/resource_test.go

@@ -12,9 +12,9 @@ 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/utils"
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 var (

pkg/resources/instance_pool/datasource.go

@@ -11,7 +11,7 @@ import (
 
 	v3 "github.com/exoscale/egoscale/v3"
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 // DataSourceSchema returns a schema for a single instance pool data source.

pkg/resources/instance_pool/datasource_list.go

@@ -14,7 +14,7 @@ import (
 	v3 "github.com/exoscale/egoscale/v3"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 func DataSourceList() *schema.Resource {

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/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
 )
 
 var (

pkg/resources/instance_pool/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/utils"
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/exoscale/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 var (

pkg/resources/instance_pool/resource.go

@@ -14,7 +14,7 @@ import (
 	v3 "github.com/exoscale/egoscale/v3"
 
 	"github.com/exoscale/terraform-provider-exoscale/pkg/config"
-	"github.com/exoscale/terraform-provider-exoscale/utils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 const (

pkg/resources/instance_pool/resource_test.go

@@ -12,9 +12,9 @@ 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/utils"
-	"github.com/exoscale/terraform-provider-exoscale/utils/testutils"
+	"github.com/exoscale/terraform-provider-exoscale/pkg/utils"
 )
 
 var (