diff --git a/exoscale/resource_exoscale_nlb_service_test.go b/exoscale/resource_exoscale_nlb_service_test.go index 76db85dc..75961ec7 100644 --- a/exoscale/resource_exoscale_nlb_service_test.go +++ b/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" diff --git a/exoscale/resource_exoscale_sks_nodepool.go b/exoscale/resource_exoscale_sks_nodepool.go index b09de13a..bf226459 100644 --- a/exoscale/resource_exoscale_sks_nodepool.go +++ b/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 ( diff --git a/utils/testutils/api_validators.go b/exoscale/testutils/api_validators.go similarity index 99% rename from utils/testutils/api_validators.go rename to exoscale/testutils/api_validators.go index 0416ebe6..3a73275d 100644 --- a/utils/testutils/api_validators.go +++ b/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 { diff --git a/utils/testutils/template_models.go b/exoscale/testutils/template_models.go similarity index 100% rename from utils/testutils/template_models.go rename to exoscale/testutils/template_models.go diff --git a/utils/testutils/testutils.go b/exoscale/testutils/testutils.go similarity index 100% rename from utils/testutils/testutils.go rename to exoscale/testutils/testutils.go diff --git a/utils/testutils/validation.go b/exoscale/testutils/validation.go similarity index 98% rename from utils/testutils/validation.go rename to exoscale/testutils/validation.go index bd448077..e0da7d0b 100644 --- a/utils/testutils/validation.go +++ b/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. diff --git a/pkg/list/filterable_list_datasource_test.go b/pkg/list/filterable_list_datasource_test.go index 73d20ec2..88d5fbeb 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) func TestFilterableListDataSource(t *testing.T) { diff --git a/pkg/resources/anti_affinity_group/datasource.go b/pkg/resources/anti_affinity_group/datasource.go index 0b44ff5e..04c90946 100644 --- a/pkg/resources/anti_affinity_group/datasource.go +++ b/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 { diff --git a/pkg/resources/anti_affinity_group/datasource_test.go b/pkg/resources/anti_affinity_group/datasource_test.go index 700aaeb8..3b92b66c 100644 --- 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/utils/testutils" ) var dsGroupName = acctest.RandomWithPrefix(testutils.Prefix) diff --git a/pkg/resources/anti_affinity_group/resource.go b/pkg/resources/anti_affinity_group/resource.go index 6590334c..00ad4b8a 100644 --- a/pkg/resources/anti_affinity_group/resource.go +++ b/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" diff --git a/pkg/resources/anti_affinity_group/resource_test.go b/pkg/resources/anti_affinity_group/resource_test.go index bc04314e..cac8fc0e 100644 --- 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/utils/testutils" ) var ( diff --git a/pkg/resources/block_storage/datasource_snapshot.go b/pkg/resources/block_storage/datasource_snapshot.go index b68253b8..434933d8 100644 --- a/pkg/resources/block_storage/datasource_snapshot.go +++ b/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. diff --git a/pkg/resources/block_storage/datasource_volume.go b/pkg/resources/block_storage/datasource_volume.go index 5c676c39..112f23e5 100644 --- a/pkg/resources/block_storage/datasource_volume.go +++ b/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. diff --git a/pkg/resources/block_storage/main_test.go b/pkg/resources/block_storage/main_test.go index d2d007fb..fb2b1a59 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) func TestBlockStorage(t *testing.T) { diff --git a/pkg/resources/block_storage/resource_snapshot.go b/pkg/resources/block_storage/resource_snapshot.go index 104764ea..a0a5c087 100644 --- a/pkg/resources/block_storage/resource_snapshot.go +++ b/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. diff --git a/pkg/resources/block_storage/resource_volume.go b/pkg/resources/block_storage/resource_volume.go index 6527cf0e..33712682 100644 --- a/pkg/resources/block_storage/resource_volume.go +++ b/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. diff --git a/pkg/resources/database/datasource_uri.go b/pkg/resources/database/datasource_uri.go index 2737706c..0eaf6a16 100644 --- a/pkg/resources/database/datasource_uri.go +++ b/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. diff --git a/pkg/resources/database/datasource_uri_test.go b/pkg/resources/database/datasource_uri_test.go index 0e2b01b2..1e727360 100644 --- 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/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" diff --git a/pkg/resources/database/main_test.go b/pkg/resources/database/main_test.go index 7a75c95d..f1c55f98 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) func TestDatabase(t *testing.T) { diff --git a/pkg/resources/database/resource_grafana_test.go b/pkg/resources/database/resource_grafana_test.go index e3a64507..6d38dd60 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelGrafana struct { diff --git a/pkg/resources/database/resource_kafka_test.go b/pkg/resources/database/resource_kafka_test.go index 22e162fb..27582531 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelKafka struct { diff --git a/pkg/resources/database/resource_mysql_test.go b/pkg/resources/database/resource_mysql_test.go index a8b5dbf4..5572d3fb 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelMysql struct { diff --git a/pkg/resources/database/resource_opensearch_test.go b/pkg/resources/database/resource_opensearch_test.go index c1505608..48f451e6 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelOpensearch struct { diff --git a/pkg/resources/database/resource_pg_test.go b/pkg/resources/database/resource_pg_test.go index b8adae1e..79c6915a 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelPg struct { diff --git a/pkg/resources/database/resource_redis_test.go b/pkg/resources/database/resource_redis_test.go index 0ac0f0fe..4e5a5612 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) type TemplateModelRedis struct { diff --git a/pkg/resources/database/resource_user.go b/pkg/resources/database/resource_user.go index 0235cf59..f3ab33e3 100644 --- a/pkg/resources/database/resource_user.go +++ b/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. diff --git a/pkg/resources/iam/datasource_api_key_test.go b/pkg/resources/iam/datasource_api_key_test.go index 3c5baf10..a6bd1dbb 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/pkg/resources/iam/datasource_org_policy_test.go b/pkg/resources/iam/datasource_org_policy_test.go index 8fe9d265..9d24c76e 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/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 index 63c2885a..01a7a4d1 100644 --- a/pkg/resources/iam/datasource_role_test.go +++ b/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" ) diff --git a/pkg/resources/iam/resource_api_key_test.go b/pkg/resources/iam/resource_api_key_test.go index 38b1ae05..22ca6297 100644 --- 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/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" diff --git a/pkg/resources/iam/resource_org_policy_test.go b/pkg/resources/iam/resource_org_policy_test.go index b23872dd..dc0bfe3a 100644 --- 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/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" diff --git a/pkg/resources/iam/resource_role_test.go b/pkg/resources/iam/resource_role_test.go index 4a72c157..e8d55610 100644 --- 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/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" diff --git a/pkg/resources/instance/datasource.go b/pkg/resources/instance/datasource.go index dc113de2..2f917a3a 100644 --- a/pkg/resources/instance/datasource.go +++ b/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. diff --git a/pkg/resources/instance/datasource_list.go b/pkg/resources/instance/datasource_list.go index 40415e3c..1162493e 100644 --- a/pkg/resources/instance/datasource_list.go +++ b/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 { diff --git a/pkg/resources/instance/datasource_list_test.go b/pkg/resources/instance/datasource_list_test.go index af6586cc..ef126482 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) var ( diff --git a/pkg/resources/instance/datasource_test.go b/pkg/resources/instance/datasource_test.go index 21e07f81..c8bb88b4 100644 --- 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/utils/testutils" ) var ( diff --git a/pkg/resources/instance/destroy_protection_test.go b/pkg/resources/instance/destroy_protection_test.go index 5955a005..dead7038 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) var computeInstanceResource = ` diff --git a/pkg/resources/instance/resource.go b/pkg/resources/instance/resource.go index ff4748c0..267c1bf5 100644 --- a/pkg/resources/instance/resource.go +++ b/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 { diff --git a/pkg/resources/instance/resource_test.go b/pkg/resources/instance/resource_test.go index ab232a65..00c73311 100644 --- a/pkg/resources/instance/resource_test.go +++ b/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 ( diff --git a/pkg/resources/instance_pool/datasource.go b/pkg/resources/instance_pool/datasource.go index 02156f6b..830ce767 100644 --- a/pkg/resources/instance_pool/datasource.go +++ b/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. diff --git a/pkg/resources/instance_pool/datasource_list.go b/pkg/resources/instance_pool/datasource_list.go index ae67f13f..74228e05 100644 --- a/pkg/resources/instance_pool/datasource_list.go +++ b/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 { diff --git a/pkg/resources/instance_pool/datasource_list_test.go b/pkg/resources/instance_pool/datasource_list_test.go index aca877fe..95018ff9 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) var ( diff --git a/pkg/resources/instance_pool/datasource_test.go b/pkg/resources/instance_pool/datasource_test.go index b97ed41d..954b81d4 100644 --- a/pkg/resources/instance_pool/datasource_test.go +++ b/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 ( diff --git a/pkg/resources/instance_pool/resource.go b/pkg/resources/instance_pool/resource.go index bd699c4c..b98edf4d 100644 --- a/pkg/resources/instance_pool/resource.go +++ b/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 ( diff --git a/pkg/resources/instance_pool/resource_test.go b/pkg/resources/instance_pool/resource_test.go index 6f40f6cd..aa4a3fc4 100644 --- a/pkg/resources/instance_pool/resource_test.go +++ b/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 ( diff --git a/pkg/resources/nlb_service/datasource_list_test.go b/pkg/resources/nlb_service/datasource_list_test.go index 02e801da..8506fe7b 100644 --- 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/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" diff --git a/pkg/resources/sos_bucket_policy/main_test.go b/pkg/resources/sos_bucket_policy/main_test.go index aa4f5cf2..743aa92f 100644 --- 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/utils/testutils" + "github.com/exoscale/terraform-provider-exoscale/exoscale/testutils" ) func TestSOSBucketPolicy(t *testing.T) { diff --git a/utils/utils.go b/pkg/utils/utils.go similarity index 100% rename from utils/utils.go rename to pkg/utils/utils.go