From 101436e68f9187a4c174090ac29120b43805aeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 18 Aug 2025 14:55:29 +0200 Subject: [PATCH] chore: migrate to github.com/hashicorp/terraform-plugin-testing@1.5.1 --- .golangci.yml | 12 ++++++++++++ cmd/tftemplate/datasource_test.go.tmpl | 2 +- cmd/tftemplate/resource_test.go.tmpl | 4 ++-- cmd/tftemplate/sweep.go.tmpl | 4 ++-- cmd/tftemplate/sweep_test.go.tmpl | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- internal/acctest/checks.go | 4 ++-- internal/acctest/fixtures.go | 2 +- internal/acctest/sweeper_test.go | 2 +- internal/provider/provider_test.go | 2 +- .../services/account/project_data_source_test.go | 2 +- internal/services/account/project_test.go | 4 ++-- internal/services/account/sweep_test.go | 2 +- internal/services/account/testfuncs/sweep.go | 2 +- internal/services/applesilicon/server_test.go | 4 ++-- internal/services/applesilicon/sweep_test.go | 2 +- internal/services/applesilicon/testfuncs/sweep.go | 2 +- internal/services/autoscaling/instance_group_test.go | 4 ++-- .../services/autoscaling/instance_policy_test.go | 4 ++-- .../services/autoscaling/instance_template_test.go | 4 ++-- internal/services/autoscaling/sweep_test.go | 2 +- internal/services/autoscaling/testfuncs/sweep.go | 2 +- .../az/availability_zones_data_source_test.go | 2 +- .../services/baremetal/offer_data_source_test.go | 4 ++-- .../services/baremetal/option_data_source_test.go | 4 ++-- internal/services/baremetal/os_data_source_test.go | 4 ++-- .../baremetal/partition_schema_source_test.go | 4 ++-- .../services/baremetal/server_data_source_test.go | 2 +- internal/services/baremetal/server_test.go | 4 ++-- internal/services/baremetal/sweep_test.go | 2 +- internal/services/baremetal/testfuncs/checks.go | 4 ++-- internal/services/baremetal/testfuncs/sweep.go | 2 +- .../services/billing/consumption_data_source_test.go | 4 ++-- .../services/billing/invoices_data_source_test.go | 2 +- internal/services/block/snapshot_data_source_test.go | 2 +- internal/services/block/snapshot_test.go | 4 ++-- internal/services/block/sweep_test.go | 2 +- internal/services/block/testfuncs/checks.go | 4 ++-- internal/services/block/testfuncs/sweep.go | 2 +- internal/services/block/volume_data_source_test.go | 2 +- internal/services/block/volume_test.go | 2 +- internal/services/cockpit/alert_manager_test.go | 4 ++-- .../services/cockpit/cockpit_data_source_test.go | 2 +- internal/services/cockpit/cockpit_test.go | 4 ++-- internal/services/cockpit/grafana_user_test.go | 4 ++-- internal/services/cockpit/source_data_source_test.go | 2 +- internal/services/cockpit/source_test.go | 4 ++-- internal/services/cockpit/sweep_test.go | 2 +- internal/services/cockpit/testfuncs/sweep.go | 2 +- internal/services/cockpit/token_test.go | 4 ++-- .../services/container/container_data_source_test.go | 2 +- internal/services/container/container_test.go | 4 ++-- internal/services/container/cron_test.go | 4 ++-- internal/services/container/domain_test.go | 4 ++-- .../services/container/namespace_data_source_test.go | 2 +- internal/services/container/namespace_test.go | 4 ++-- internal/services/container/sweep_test.go | 2 +- internal/services/container/testfuncs/sweep.go | 2 +- internal/services/container/token_test.go | 4 ++-- internal/services/container/trigger_test.go | 4 ++-- internal/services/domain/record_data_source_test.go | 2 +- internal/services/domain/record_test.go | 4 ++-- internal/services/domain/registration_test.go | 4 ++-- internal/services/domain/sweep_test.go | 2 +- internal/services/domain/zone_data_source_test.go | 2 +- internal/services/domain/zone_test.go | 4 ++-- internal/services/edgeservices/backend_stage_test.go | 2 +- internal/services/edgeservices/cache_stage_test.go | 2 +- internal/services/edgeservices/dns_stage_test.go | 2 +- internal/services/edgeservices/pipeline_test.go | 2 +- internal/services/edgeservices/plan_test.go | 2 +- internal/services/edgeservices/route_stage_test.go | 2 +- internal/services/edgeservices/sweep_test.go | 2 +- internal/services/edgeservices/testfuncs/checks.go | 4 ++-- internal/services/edgeservices/testfuncs/sweep.go | 2 +- internal/services/edgeservices/tls_stage_test.go | 2 +- internal/services/edgeservices/waf_stage_test.go | 2 +- internal/services/file/filesystem_test.go | 4 ++-- internal/services/file/testfuncs/checks.go | 4 ++-- .../flexibleip/data_source_flexible_ip_test.go | 2 +- .../flexibleip/data_source_flexible_ips_test.go | 2 +- internal/services/flexibleip/ip_test.go | 4 ++-- internal/services/flexibleip/mac_address_test.go | 4 ++-- internal/services/flexibleip/sweep_test.go | 2 +- internal/services/flexibleip/testfuncs/sweep.go | 2 +- internal/services/function/cron_test.go | 4 ++-- .../function/data_source_function_namespace_test.go | 2 +- .../services/function/data_source_function_test.go | 2 +- internal/services/function/domain_test.go | 4 ++-- internal/services/function/function_test.go | 4 ++-- internal/services/function/namespace_test.go | 4 ++-- internal/services/function/sweep_test.go | 2 +- internal/services/function/testfuncs/sweep.go | 2 +- internal/services/function/token_test.go | 4 ++-- internal/services/function/trigger_test.go | 4 ++-- internal/services/iam/api_key_data_source_test.go | 2 +- internal/services/iam/api_key_test.go | 4 ++-- .../services/iam/application_data_source_test.go | 2 +- internal/services/iam/application_test.go | 4 ++-- internal/services/iam/group_data_source_test.go | 2 +- internal/services/iam/group_membership_test.go | 4 ++-- internal/services/iam/group_test.go | 4 ++-- internal/services/iam/policy_test.go | 4 ++-- .../services/iam/ssh_key_account_data_source_test.go | 2 +- internal/services/iam/ssh_key_account_test.go | 2 +- internal/services/iam/ssh_key_data_source_test.go | 2 +- internal/services/iam/ssh_key_test.go | 2 +- internal/services/iam/sweep_test.go | 2 +- internal/services/iam/testfuncs/checks.go | 4 ++-- internal/services/iam/testfuncs/sweep.go | 2 +- internal/services/iam/user_data_source_test.go | 4 ++-- internal/services/iam/user_test.go | 4 ++-- internal/services/inference/deployment_test.go | 4 ++-- .../services/inference/model_data_source_test.go | 2 +- internal/services/inference/model_test.go | 4 ++-- internal/services/inference/sweep_test.go | 2 +- internal/services/inference/testfuncs/checks.go | 4 ++-- internal/services/inference/testfuncs/sweep.go | 2 +- .../data_source_instance_private_nic_test.go | 2 +- internal/services/instance/image_data_source_test.go | 2 +- internal/services/instance/image_test.go | 4 ++-- internal/services/instance/ip_data_source_test.go | 2 +- internal/services/instance/ip_reverse_dns_test.go | 2 +- internal/services/instance/ip_test.go | 4 ++-- .../instance/placement_group_data_source_test.go | 2 +- internal/services/instance/placement_group_test.go | 4 ++-- internal/services/instance/private_nic_test.go | 4 ++-- .../instance/security_group_data_source_test.go | 2 +- .../services/instance/security_group_rules_test.go | 2 +- internal/services/instance/security_group_test.go | 4 ++-- .../services/instance/server_data_source_test.go | 2 +- internal/services/instance/server_test.go | 4 ++-- .../services/instance/servers_data_source_test.go | 2 +- .../services/instance/snapshot_data_source_test.go | 2 +- internal/services/instance/snapshot_test.go | 6 +++--- internal/services/instance/sweep_test.go | 2 +- internal/services/instance/testfuncs/checks.go | 4 ++-- internal/services/instance/testfuncs/sweep.go | 2 +- internal/services/instance/user_data_test.go | 2 +- .../services/instance/volume_data_source_test.go | 2 +- internal/services/instance/volume_test.go | 2 +- internal/services/iot/data_source_iot_device_test.go | 2 +- internal/services/iot/data_source_iot_hub_test.go | 2 +- internal/services/iot/device_test.go | 4 ++-- internal/services/iot/hub_test.go | 4 ++-- internal/services/iot/network_test.go | 4 ++-- internal/services/iot/routes_test.go | 6 +++--- internal/services/iot/sweep_test.go | 2 +- internal/services/iot/testfuncs/sweep.go | 2 +- internal/services/ipam/ip_data_source_test.go | 2 +- internal/services/ipam/ip_reverse_dns_test.go | 4 ++-- internal/services/ipam/ip_test.go | 4 ++-- internal/services/ipam/ips_data_source_test.go | 2 +- internal/services/ipam/sweep_test.go | 2 +- internal/services/ipam/testfuncs/checks.go | 4 ++-- internal/services/ipam/testfuncs/sweep.go | 2 +- internal/services/jobs/jobs_test.go | 4 ++-- internal/services/jobs/sweep_test.go | 2 +- internal/services/jobs/testfuncs/sweep.go | 2 +- internal/services/k8s/acl_test.go | 4 ++-- internal/services/k8s/cluster_data_source_test.go | 2 +- internal/services/k8s/cluster_test.go | 4 ++-- .../services/k8s/k8s_version_data_source_test.go | 4 ++-- internal/services/k8s/pool_data_source_test.go | 2 +- internal/services/k8s/pool_test.go | 4 ++-- internal/services/k8s/sweep_test.go | 2 +- internal/services/k8s/testfuncs/sweep.go | 2 +- internal/services/keymanager/key_resource_test.go | 4 ++-- internal/services/lb/acl_test.go | 4 ++-- internal/services/lb/acls_data_source_test.go | 2 +- internal/services/lb/backend_data_source_test.go | 2 +- internal/services/lb/backend_test.go | 6 +++--- internal/services/lb/backends_data_source_test.go | 2 +- internal/services/lb/certificate_data_source_test.go | 2 +- internal/services/lb/certificate_test.go | 4 ++-- .../services/lb/data_source_lb_frontends_test.go | 2 +- internal/services/lb/data_source_lb_ip_test.go | 2 +- internal/services/lb/frontend_data_source_test.go | 2 +- internal/services/lb/frontend_test.go | 4 ++-- internal/services/lb/ip_test.go | 4 ++-- internal/services/lb/ips_data_source_test.go | 2 +- internal/services/lb/lb_data_source_test.go | 2 +- internal/services/lb/lb_test.go | 4 ++-- internal/services/lb/lbs_data_source_test.go | 2 +- internal/services/lb/route_data_source_test.go | 2 +- internal/services/lb/route_test.go | 4 ++-- internal/services/lb/routes_data_source_test.go | 2 +- internal/services/lb/sweep_test.go | 2 +- internal/services/lb/testfuncs/checks.go | 4 ++-- internal/services/lb/testfuncs/sweep.go | 2 +- .../services/marketplace/image_data_source_test.go | 2 +- internal/services/marketplace/sweep_test.go | 2 +- internal/services/mnq/nats_account_test.go | 4 ++-- internal/services/mnq/nats_credentials_test.go | 4 ++-- internal/services/mnq/sns_credentials_test.go | 4 ++-- internal/services/mnq/sns_data_source_test.go | 2 +- internal/services/mnq/sns_test.go | 4 ++-- internal/services/mnq/sns_topic_subscription_test.go | 4 ++-- internal/services/mnq/sns_topic_test.go | 4 ++-- internal/services/mnq/sqs_credentials_test.go | 4 ++-- internal/services/mnq/sqs_data_source_test.go | 2 +- internal/services/mnq/sqs_queue_test.go | 4 ++-- internal/services/mnq/sqs_test.go | 4 ++-- internal/services/mnq/sweep_test.go | 2 +- internal/services/mnq/testfuncs/sweep.go | 2 +- .../services/mongodb/data_source_instance_test.go | 2 +- internal/services/mongodb/instance_test.go | 4 ++-- internal/services/mongodb/snapshot_test.go | 4 ++-- internal/services/mongodb/sweep_test.go | 2 +- internal/services/mongodb/testfuncs/sweep.go | 2 +- internal/services/object/bucket_acl_test.go | 6 +++--- .../object/bucket_lock_configuration_test.go | 6 +++--- internal/services/object/bucket_policy_test.go | 6 +++--- internal/services/object/bucket_test.go | 6 +++--- .../object/bucket_website_configuration_test.go | 4 ++-- .../object/data_source_object_bucket_policy_test.go | 6 +++--- .../object/data_source_object_bucket_test.go | 6 +++--- internal/services/object/errors.go | 2 +- internal/services/object/object_test.go | 4 ++-- internal/services/object/sweep_test.go | 2 +- internal/services/object/testfuncs/checks.go | 4 ++-- internal/services/object/testfuncs/sweep.go | 2 +- internal/services/rdb/acl_data_source_test.go | 2 +- internal/services/rdb/acl_test.go | 2 +- .../rdb/data_source_rdb_database_backup_test.go | 2 +- .../services/rdb/data_source_rdb_instance_test.go | 2 +- internal/services/rdb/database_backup_test.go | 4 ++-- internal/services/rdb/database_data_source_test.go | 2 +- internal/services/rdb/database_test.go | 4 ++-- internal/services/rdb/instance_test.go | 4 ++-- internal/services/rdb/privilege_data_source_test.go | 2 +- internal/services/rdb/privilege_test.go | 4 ++-- internal/services/rdb/read_replica_test.go | 4 ++-- internal/services/rdb/snapshots_test.go | 4 ++-- internal/services/rdb/sweep_test.go | 2 +- internal/services/rdb/testfuncs/checks.go | 4 ++-- internal/services/rdb/testfuncs/sweep.go | 2 +- internal/services/rdb/user_test.go | 4 ++-- internal/services/redis/cluster_data_source_test.go | 2 +- internal/services/redis/cluster_test.go | 4 ++-- internal/services/redis/sweep_test.go | 2 +- internal/services/redis/testfuncs/sweep.go | 2 +- internal/services/registry/image_data_source_test.go | 4 ++-- .../services/registry/namespace_data_source_test.go | 2 +- internal/services/registry/namespace_test.go | 4 ++-- internal/services/registry/sweep_test.go | 2 +- internal/services/registry/tag_data_source_test.go | 4 ++-- internal/services/registry/testfuncs/checks.go | 4 ++-- internal/services/registry/testfuncs/sweep.go | 2 +- .../scwconfig/scw_config_data_source_test.go | 2 +- internal/services/sdb/database_test.go | 4 ++-- internal/services/sdb/sweep_test.go | 2 +- internal/services/sdb/testfuncs/sweep.go | 2 +- internal/services/secret/secret_data_source_test.go | 4 ++-- internal/services/secret/secret_test.go | 4 ++-- internal/services/secret/sweep_test.go | 2 +- internal/services/secret/testfuncs/sweep.go | 2 +- internal/services/secret/version_data_source_test.go | 2 +- internal/services/secret/version_test.go | 4 ++-- internal/services/tem/blockedlist_test.go | 4 ++-- internal/services/tem/domain_data_source_test.go | 2 +- internal/services/tem/domain_test.go | 4 ++-- internal/services/tem/domain_validation_test.go | 2 +- .../tem/offer_subscription_data_source_test.go | 2 +- internal/services/tem/sweep_test.go | 2 +- internal/services/tem/testfuncs/sweep.go | 2 +- internal/services/tem/webhook_test.go | 4 ++-- internal/services/vpc/acl_test.go | 4 ++-- .../services/vpc/private_network_data_source_test.go | 2 +- internal/services/vpc/private_network_test.go | 2 +- internal/services/vpc/route_test.go | 4 ++-- internal/services/vpc/routes_data_source_test.go | 2 +- internal/services/vpc/sweep_test.go | 2 +- internal/services/vpc/testfuncs/checks.go | 4 ++-- internal/services/vpc/testfuncs/sweep.go | 2 +- internal/services/vpc/vpc_data_source_test.go | 2 +- internal/services/vpc/vpc_test.go | 4 ++-- internal/services/vpc/vpcs_data_source_test.go | 2 +- internal/services/vpcgw/ip_data_source_test.go | 2 +- internal/services/vpcgw/ip_reverse_test.go | 4 ++-- internal/services/vpcgw/ip_test.go | 4 ++-- internal/services/vpcgw/network_data_source_test.go | 2 +- internal/services/vpcgw/network_test.go | 4 ++-- internal/services/vpcgw/pat_rule_data_source_test.go | 2 +- internal/services/vpcgw/pat_rule_test.go | 4 ++-- .../vpcgw/public_gateway_data_source_test.go | 2 +- internal/services/vpcgw/public_gateway_test.go | 4 ++-- internal/services/vpcgw/sweep_test.go | 2 +- internal/services/vpcgw/testfuncs/checks.go | 4 ++-- internal/services/vpcgw/testfuncs/sweep.go | 2 +- .../services/webhosting/offer_data_source_test.go | 2 +- internal/services/webhosting/sweep_test.go | 2 +- internal/services/webhosting/testfuncs/sweep.go | 2 +- .../webhosting/webhosting_data_source_test.go | 2 +- internal/services/webhosting/webhosting_test.go | 4 ++-- 296 files changed, 453 insertions(+), 438 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index eb39037b68..73b111f115 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -112,6 +112,18 @@ linters: - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false] settings: + depguard: + rules: + testing: + files: + - "**/*_test.go" + deny: + - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + desc: use github.com/hashicorp/terraform-plugin-testing/helper/acctest + - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + desc: use github.com/hashicorp/terraform-plugin-testing/helper/resource + - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + desc: use github.com/hashicorp/terraform-plugin-testing/terraform govet: disable-all: true enable: diff --git a/cmd/tftemplate/datasource_test.go.tmpl b/cmd/tftemplate/datasource_test.go.tmpl index edf24a92d5..e0747cdace 100644 --- a/cmd/tftemplate/datasource_test.go.tmpl +++ b/cmd/tftemplate/datasource_test.go.tmpl @@ -4,7 +4,7 @@ package {{.API}}_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSource{{.Resource}}_Basic(t *testing.T) { diff --git a/cmd/tftemplate/resource_test.go.tmpl b/cmd/tftemplate/resource_test.go.tmpl index 93d4457500..dbda3fcb67 100644 --- a/cmd/tftemplate/resource_test.go.tmpl +++ b/cmd/tftemplate/resource_test.go.tmpl @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/cmd/tftemplate/sweep.go.tmpl b/cmd/tftemplate/sweep.go.tmpl index 72872a307c..4fba4ec184 100644 --- a/cmd/tftemplate/sweep.go.tmpl +++ b/cmd/tftemplate/sweep.go.tmpl @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/cmd/tftemplate/sweep_test.go.tmpl b/cmd/tftemplate/sweep_test.go.tmpl index c017f0f939..978997d093 100644 --- a/cmd/tftemplate/sweep_test.go.tmpl +++ b/cmd/tftemplate/sweep_test.go.tmpl @@ -4,7 +4,7 @@ package {{.API}}_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func init() { diff --git a/go.mod b/go.mod index fa596fdee1..1473b0d14d 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.20.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 + github.com/hashicorp/terraform-plugin-testing v1.5.1 github.com/nats-io/jwt/v2 v2.7.4 github.com/nats-io/nats.go v1.44.0 github.com/robfig/cron/v3 v3.0.1 @@ -153,7 +154,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.36.0 // indirect go.opentelemetry.io/otel/trace v1.36.0 // indirect - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect + golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect golang.org/x/mod v0.25.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/sync v0.16.0 // indirect diff --git a/go.sum b/go.sum index a5b90661f7..c1e996a369 100644 --- a/go.sum +++ b/go.sum @@ -326,6 +326,8 @@ github.com/hashicorp/terraform-plugin-mux v0.20.0 h1:3QpBnI9uCuL0Yy2Rq/kR9cOdmOF github.com/hashicorp/terraform-plugin-mux v0.20.0/go.mod h1:wSIZwJjSYk86NOTX3fKUlThMT4EAV1XpBHz9SAvjQr4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA= +github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c= +github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0= github.com/hashicorp/terraform-registry-address v0.2.5 h1:2GTftHqmUhVOeuu9CW3kwDkRe4pcBDq0uuK5VJngU1M= github.com/hashicorp/terraform-registry-address v0.2.5/go.mod h1:PpzXWINwB5kuVS5CA7m1+eO2f1jKb5ZDIxrOPfpnGkg= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= @@ -560,8 +562,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= +golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/internal/acctest/checks.go b/internal/acctest/checks.go index 313c330901..0957cb3c25 100644 --- a/internal/acctest/checks.go +++ b/internal/acctest/checks.go @@ -6,8 +6,8 @@ import ( "net" "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" ) diff --git a/internal/acctest/fixtures.go b/internal/acctest/fixtures.go index 874d941733..3bd53b17c9 100644 --- a/internal/acctest/fixtures.go +++ b/internal/acctest/fixtures.go @@ -3,8 +3,8 @@ package acctest import ( "context" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/scaleway/scaleway-sdk-go/api/account/v3" iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" diff --git a/internal/acctest/sweeper_test.go b/internal/acctest/sweeper_test.go index 859b24ca99..91383fd14c 100644 --- a/internal/acctest/sweeper_test.go +++ b/internal/acctest/sweeper_test.go @@ -3,7 +3,7 @@ package acctest_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/stretchr/testify/assert" ) diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index 17b1ebe94b..4e87b505f8 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" diff --git a/internal/services/account/project_data_source_test.go b/internal/services/account/project_data_source_test.go index c0a94d7e22..80360762e2 100644 --- a/internal/services/account/project_data_source_test.go +++ b/internal/services/account/project_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/account/project_test.go b/internal/services/account/project_test.go index fa5c094229..76d8ef382d 100644 --- a/internal/services/account/project_test.go +++ b/internal/services/account/project_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/account/sweep_test.go b/internal/services/account/sweep_test.go index bbe16f5675..04695f4e2c 100644 --- a/internal/services/account/sweep_test.go +++ b/internal/services/account/sweep_test.go @@ -3,7 +3,7 @@ package account_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" accounttestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account/testfuncs" ) diff --git a/internal/services/account/testfuncs/sweep.go b/internal/services/account/testfuncs/sweep.go index 848247d83b..cb322ea120 100644 --- a/internal/services/account/testfuncs/sweep.go +++ b/internal/services/account/testfuncs/sweep.go @@ -3,7 +3,7 @@ package accounttestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/applesilicon/server_test.go b/internal/services/applesilicon/server_test.go index e3a9081062..65c135b600 100644 --- a/internal/services/applesilicon/server_test.go +++ b/internal/services/applesilicon/server_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" applesiliconSDK "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/applesilicon/sweep_test.go b/internal/services/applesilicon/sweep_test.go index 7295d4d944..288fe37922 100644 --- a/internal/services/applesilicon/sweep_test.go +++ b/internal/services/applesilicon/sweep_test.go @@ -3,7 +3,7 @@ package applesilicon_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" applesilicontestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/applesilicon/testfuncs" ) diff --git a/internal/services/applesilicon/testfuncs/sweep.go b/internal/services/applesilicon/testfuncs/sweep.go index e249bbbd38..6bdbc2842d 100644 --- a/internal/services/applesilicon/testfuncs/sweep.go +++ b/internal/services/applesilicon/testfuncs/sweep.go @@ -3,7 +3,7 @@ package applesilicontestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" applesiliconSDK "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/autoscaling/instance_group_test.go b/internal/services/autoscaling/instance_group_test.go index 5c54d6c4b4..e348755959 100644 --- a/internal/services/autoscaling/instance_group_test.go +++ b/internal/services/autoscaling/instance_group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" autoscalingSDK "github.com/scaleway/scaleway-sdk-go/api/autoscaling/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/autoscaling/instance_policy_test.go b/internal/services/autoscaling/instance_policy_test.go index 8ee2291ca9..b469b42377 100644 --- a/internal/services/autoscaling/instance_policy_test.go +++ b/internal/services/autoscaling/instance_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" autoscalingSDK "github.com/scaleway/scaleway-sdk-go/api/autoscaling/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/autoscaling/instance_template_test.go b/internal/services/autoscaling/instance_template_test.go index a13a3e454e..bc94ef0089 100644 --- a/internal/services/autoscaling/instance_template_test.go +++ b/internal/services/autoscaling/instance_template_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" autoscalingSDK "github.com/scaleway/scaleway-sdk-go/api/autoscaling/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/autoscaling/sweep_test.go b/internal/services/autoscaling/sweep_test.go index bc47ce74d8..d17bfb207b 100644 --- a/internal/services/autoscaling/sweep_test.go +++ b/internal/services/autoscaling/sweep_test.go @@ -3,7 +3,7 @@ package autoscaling_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" autoscalingtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/autoscaling/testfuncs" ) diff --git a/internal/services/autoscaling/testfuncs/sweep.go b/internal/services/autoscaling/testfuncs/sweep.go index a249f49079..591f738006 100644 --- a/internal/services/autoscaling/testfuncs/sweep.go +++ b/internal/services/autoscaling/testfuncs/sweep.go @@ -3,7 +3,7 @@ package autoscalingtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" autoscaling "github.com/scaleway/scaleway-sdk-go/api/autoscaling/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/az/availability_zones_data_source_test.go b/internal/services/az/availability_zones_data_source_test.go index e97bc26ac1..3529d87cbf 100644 --- a/internal/services/az/availability_zones_data_source_test.go +++ b/internal/services/az/availability_zones_data_source_test.go @@ -3,7 +3,7 @@ package az_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/baremetal/offer_data_source_test.go b/internal/services/baremetal/offer_data_source_test.go index 5c55d18530..56741ce20e 100644 --- a/internal/services/baremetal/offer_data_source_test.go +++ b/internal/services/baremetal/offer_data_source_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" diff --git a/internal/services/baremetal/option_data_source_test.go b/internal/services/baremetal/option_data_source_test.go index 0b93359098..8848df43a3 100644 --- a/internal/services/baremetal/option_data_source_test.go +++ b/internal/services/baremetal/option_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" diff --git a/internal/services/baremetal/os_data_source_test.go b/internal/services/baremetal/os_data_source_test.go index d01948a923..b6487ef2bf 100644 --- a/internal/services/baremetal/os_data_source_test.go +++ b/internal/services/baremetal/os_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" diff --git a/internal/services/baremetal/partition_schema_source_test.go b/internal/services/baremetal/partition_schema_source_test.go index abdf59f637..66f2a5c4dd 100644 --- a/internal/services/baremetal/partition_schema_source_test.go +++ b/internal/services/baremetal/partition_schema_source_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal" diff --git a/internal/services/baremetal/server_data_source_test.go b/internal/services/baremetal/server_data_source_test.go index 28eae57844..b2f9e48836 100644 --- a/internal/services/baremetal/server_data_source_test.go +++ b/internal/services/baremetal/server_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" baremetalchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal/testfuncs" diff --git a/internal/services/baremetal/server_test.go b/internal/services/baremetal/server_test.go index d4aa3a237f..5cc00d1d9a 100644 --- a/internal/services/baremetal/server_test.go +++ b/internal/services/baremetal/server_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" baremetalV3SDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v3" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/services/baremetal/sweep_test.go b/internal/services/baremetal/sweep_test.go index 345352887d..7f47545abe 100644 --- a/internal/services/baremetal/sweep_test.go +++ b/internal/services/baremetal/sweep_test.go @@ -3,7 +3,7 @@ package baremetal_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" baremetaltestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/baremetal/testfuncs" ) diff --git a/internal/services/baremetal/testfuncs/checks.go b/internal/services/baremetal/testfuncs/checks.go index 3c63a83790..39205b3726 100644 --- a/internal/services/baremetal/testfuncs/checks.go +++ b/internal/services/baremetal/testfuncs/checks.go @@ -3,8 +3,8 @@ package baremetaltestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" baremetal2 "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/baremetal/testfuncs/sweep.go b/internal/services/baremetal/testfuncs/sweep.go index f2d1b9c1a3..85166908a2 100644 --- a/internal/services/baremetal/testfuncs/sweep.go +++ b/internal/services/baremetal/testfuncs/sweep.go @@ -3,7 +3,7 @@ package baremetaltestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/billing/consumption_data_source_test.go b/internal/services/billing/consumption_data_source_test.go index ee848645c8..3e37242e20 100644 --- a/internal/services/billing/consumption_data_source_test.go +++ b/internal/services/billing/consumption_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/billing/invoices_data_source_test.go b/internal/services/billing/invoices_data_source_test.go index 0adaf9a470..a22cc55601 100644 --- a/internal/services/billing/invoices_data_source_test.go +++ b/internal/services/billing/invoices_data_source_test.go @@ -3,7 +3,7 @@ package billing_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/block/snapshot_data_source_test.go b/internal/services/block/snapshot_data_source_test.go index ea2fbb9e70..0973a237f7 100644 --- a/internal/services/block/snapshot_data_source_test.go +++ b/internal/services/block/snapshot_data_source_test.go @@ -3,7 +3,7 @@ package block_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs" ) diff --git a/internal/services/block/snapshot_test.go b/internal/services/block/snapshot_test.go index f26c166bbf..c9b035cb8d 100644 --- a/internal/services/block/snapshot_test.go +++ b/internal/services/block/snapshot_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" diff --git a/internal/services/block/sweep_test.go b/internal/services/block/sweep_test.go index 4f3c5a1eb2..208945bde6 100644 --- a/internal/services/block/sweep_test.go +++ b/internal/services/block/sweep_test.go @@ -3,7 +3,7 @@ package block_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs" ) diff --git a/internal/services/block/testfuncs/checks.go b/internal/services/block/testfuncs/checks.go index 8af50841e7..2802f58518 100644 --- a/internal/services/block/testfuncs/checks.go +++ b/internal/services/block/testfuncs/checks.go @@ -3,8 +3,8 @@ package blocktestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" blockSDK "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/block/testfuncs/sweep.go b/internal/services/block/testfuncs/sweep.go index 4ce75533a6..d7f9168bf3 100644 --- a/internal/services/block/testfuncs/sweep.go +++ b/internal/services/block/testfuncs/sweep.go @@ -3,7 +3,7 @@ package blocktestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" blockSDK "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/block/volume_data_source_test.go b/internal/services/block/volume_data_source_test.go index a0f43824f2..20159dfc48 100644 --- a/internal/services/block/volume_data_source_test.go +++ b/internal/services/block/volume_data_source_test.go @@ -3,7 +3,7 @@ package block_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs" ) diff --git a/internal/services/block/volume_test.go b/internal/services/block/volume_test.go index 09440f02c2..1958875f53 100644 --- a/internal/services/block/volume_test.go +++ b/internal/services/block/volume_test.go @@ -3,7 +3,7 @@ package block_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs" instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" diff --git a/internal/services/cockpit/alert_manager_test.go b/internal/services/cockpit/alert_manager_test.go index bfc63ee632..a5be7c9e03 100644 --- a/internal/services/cockpit/alert_manager_test.go +++ b/internal/services/cockpit/alert_manager_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/cockpit/cockpit_data_source_test.go b/internal/services/cockpit/cockpit_data_source_test.go index 27d0199a38..c2feb3b052 100644 --- a/internal/services/cockpit/cockpit_data_source_test.go +++ b/internal/services/cockpit/cockpit_data_source_test.go @@ -3,7 +3,7 @@ package cockpit_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/cockpit/cockpit_test.go b/internal/services/cockpit/cockpit_test.go index 3666b3282c..e2c4094e7b 100644 --- a/internal/services/cockpit/cockpit_test.go +++ b/internal/services/cockpit/cockpit_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/cockpit/grafana_user_test.go b/internal/services/cockpit/grafana_user_test.go index 16ce139035..0cc61b8897 100644 --- a/internal/services/cockpit/grafana_user_test.go +++ b/internal/services/cockpit/grafana_user_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" cockpitSDK "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/cockpit/source_data_source_test.go b/internal/services/cockpit/source_data_source_test.go index bf13711f48..b8154c3613 100644 --- a/internal/services/cockpit/source_data_source_test.go +++ b/internal/services/cockpit/source_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/cockpit/source_test.go b/internal/services/cockpit/source_test.go index 295e35a107..52aa6de266 100644 --- a/internal/services/cockpit/source_test.go +++ b/internal/services/cockpit/source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" cockpitSDK "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/cockpit/sweep_test.go b/internal/services/cockpit/sweep_test.go index ec29bfd3c4..8176211cef 100644 --- a/internal/services/cockpit/sweep_test.go +++ b/internal/services/cockpit/sweep_test.go @@ -3,7 +3,7 @@ package cockpit_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" cockpittestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/cockpit/testfuncs" ) diff --git a/internal/services/cockpit/testfuncs/sweep.go b/internal/services/cockpit/testfuncs/sweep.go index 09534ac037..5231ef2dd0 100644 --- a/internal/services/cockpit/testfuncs/sweep.go +++ b/internal/services/cockpit/testfuncs/sweep.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3" "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/services/cockpit/token_test.go b/internal/services/cockpit/token_test.go index 96e4613a35..910e0ba85f 100644 --- a/internal/services/cockpit/token_test.go +++ b/internal/services/cockpit/token_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" cockpitSDK "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/container/container_data_source_test.go b/internal/services/container/container_data_source_test.go index 02f72a114d..f57b0b02a7 100644 --- a/internal/services/container/container_data_source_test.go +++ b/internal/services/container/container_data_source_test.go @@ -3,7 +3,7 @@ package container_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/container/container_test.go b/internal/services/container/container_test.go index 329acb83f3..a4fb62c411 100644 --- a/internal/services/container/container_test.go +++ b/internal/services/container/container_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/alexedwards/argon2id" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/container/cron_test.go b/internal/services/container/cron_test.go index 10c2c4614a..cb87dff934 100644 --- a/internal/services/container/cron_test.go +++ b/internal/services/container/cron_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/container/domain_test.go b/internal/services/container/domain_test.go index 7858552bbf..446c48085d 100644 --- a/internal/services/container/domain_test.go +++ b/internal/services/container/domain_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/container/namespace_data_source_test.go b/internal/services/container/namespace_data_source_test.go index 00049f660b..f39a5f94b0 100644 --- a/internal/services/container/namespace_data_source_test.go +++ b/internal/services/container/namespace_data_source_test.go @@ -3,7 +3,7 @@ package container_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/container/namespace_test.go b/internal/services/container/namespace_test.go index 90b4ca0953..a657136202 100644 --- a/internal/services/container/namespace_test.go +++ b/internal/services/container/namespace_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/container/sweep_test.go b/internal/services/container/sweep_test.go index d1f68db797..393734c64e 100644 --- a/internal/services/container/sweep_test.go +++ b/internal/services/container/sweep_test.go @@ -3,7 +3,7 @@ package container_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" containertestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs" ) diff --git a/internal/services/container/testfuncs/sweep.go b/internal/services/container/testfuncs/sweep.go index 123f60daa6..47e4518a40 100644 --- a/internal/services/container/testfuncs/sweep.go +++ b/internal/services/container/testfuncs/sweep.go @@ -3,7 +3,7 @@ package containertestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/container/token_test.go b/internal/services/container/token_test.go index aac82d2f99..195e3e9ac8 100644 --- a/internal/services/container/token_test.go +++ b/internal/services/container/token_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/container/trigger_test.go b/internal/services/container/trigger_test.go index 3cad685e0c..c86bf31f4c 100644 --- a/internal/services/container/trigger_test.go +++ b/internal/services/container/trigger_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/domain/record_data_source_test.go b/internal/services/domain/record_data_source_test.go index 72cd7afaf6..78270ecd2a 100644 --- a/internal/services/domain/record_data_source_test.go +++ b/internal/services/domain/record_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/domain/record_test.go b/internal/services/domain/record_test.go index 35b7d422c3..fc6230a190 100644 --- a/internal/services/domain/record_test.go +++ b/internal/services/domain/record_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" domainSDK "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/domain/registration_test.go b/internal/services/domain/registration_test.go index 915e665d14..e4fb083c90 100644 --- a/internal/services/domain/registration_test.go +++ b/internal/services/domain/registration_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" domainSDK "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/domain/sweep_test.go b/internal/services/domain/sweep_test.go index c1f3f05075..94dbfaa99f 100644 --- a/internal/services/domain/sweep_test.go +++ b/internal/services/domain/sweep_test.go @@ -3,7 +3,7 @@ package domain_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestMain(m *testing.M) { diff --git a/internal/services/domain/zone_data_source_test.go b/internal/services/domain/zone_data_source_test.go index 116275f0a0..1655c7c747 100644 --- a/internal/services/domain/zone_data_source_test.go +++ b/internal/services/domain/zone_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/domain/zone_test.go b/internal/services/domain/zone_test.go index d97ac1a20e..f0ce537eee 100644 --- a/internal/services/domain/zone_test.go +++ b/internal/services/domain/zone_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" domainSDK "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/edgeservices/backend_stage_test.go b/internal/services/edgeservices/backend_stage_test.go index 534eefd69f..dd915a1738 100644 --- a/internal/services/edgeservices/backend_stage_test.go +++ b/internal/services/edgeservices/backend_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/cache_stage_test.go b/internal/services/edgeservices/cache_stage_test.go index ff5a65ebfd..2160188f76 100644 --- a/internal/services/edgeservices/cache_stage_test.go +++ b/internal/services/edgeservices/cache_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/dns_stage_test.go b/internal/services/edgeservices/dns_stage_test.go index 058cc70243..ecddf90208 100644 --- a/internal/services/edgeservices/dns_stage_test.go +++ b/internal/services/edgeservices/dns_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/pipeline_test.go b/internal/services/edgeservices/pipeline_test.go index 8e13985113..e0c77a9c8e 100644 --- a/internal/services/edgeservices/pipeline_test.go +++ b/internal/services/edgeservices/pipeline_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/plan_test.go b/internal/services/edgeservices/plan_test.go index 7f36d8ac4f..4e026be888 100644 --- a/internal/services/edgeservices/plan_test.go +++ b/internal/services/edgeservices/plan_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/route_stage_test.go b/internal/services/edgeservices/route_stage_test.go index 20cbd5637a..b16158c4aa 100644 --- a/internal/services/edgeservices/route_stage_test.go +++ b/internal/services/edgeservices/route_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/sweep_test.go b/internal/services/edgeservices/sweep_test.go index ceaa697603..18d64ff54c 100644 --- a/internal/services/edgeservices/sweep_test.go +++ b/internal/services/edgeservices/sweep_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/testfuncs/checks.go b/internal/services/edgeservices/testfuncs/checks.go index c6e0570690..3e4354db83 100644 --- a/internal/services/edgeservices/testfuncs/checks.go +++ b/internal/services/edgeservices/testfuncs/checks.go @@ -3,8 +3,8 @@ package edgeservicestestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" edge "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/edgeservices/testfuncs/sweep.go b/internal/services/edgeservices/testfuncs/sweep.go index 7a78633b91..df10889813 100644 --- a/internal/services/edgeservices/testfuncs/sweep.go +++ b/internal/services/edgeservices/testfuncs/sweep.go @@ -3,7 +3,7 @@ package edgeservicestestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" edge "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/edgeservices/tls_stage_test.go b/internal/services/edgeservices/tls_stage_test.go index a9d6dcb296..31c1c402ba 100644 --- a/internal/services/edgeservices/tls_stage_test.go +++ b/internal/services/edgeservices/tls_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/edgeservices/waf_stage_test.go b/internal/services/edgeservices/waf_stage_test.go index ae2417f8e6..f09284baad 100644 --- a/internal/services/edgeservices/waf_stage_test.go +++ b/internal/services/edgeservices/waf_stage_test.go @@ -3,7 +3,7 @@ package edgeservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" edgeservicestestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/edgeservices/testfuncs" ) diff --git a/internal/services/file/filesystem_test.go b/internal/services/file/filesystem_test.go index 06b2347997..026cb72e11 100644 --- a/internal/services/file/filesystem_test.go +++ b/internal/services/file/filesystem_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" fileSDK "github.com/scaleway/scaleway-sdk-go/api/file/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/file" diff --git a/internal/services/file/testfuncs/checks.go b/internal/services/file/testfuncs/checks.go index 9aa1a9d128..1c5c5ef754 100644 --- a/internal/services/file/testfuncs/checks.go +++ b/internal/services/file/testfuncs/checks.go @@ -3,8 +3,8 @@ package filetestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" fileSDK "github.com/scaleway/scaleway-sdk-go/api/file/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/flexibleip/data_source_flexible_ip_test.go b/internal/services/flexibleip/data_source_flexible_ip_test.go index 5c55137953..b27f0ab55d 100644 --- a/internal/services/flexibleip/data_source_flexible_ip_test.go +++ b/internal/services/flexibleip/data_source_flexible_ip_test.go @@ -3,7 +3,7 @@ package flexibleip_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/flexibleip/data_source_flexible_ips_test.go b/internal/services/flexibleip/data_source_flexible_ips_test.go index 257a49cc0a..b56918af7c 100644 --- a/internal/services/flexibleip/data_source_flexible_ips_test.go +++ b/internal/services/flexibleip/data_source_flexible_ips_test.go @@ -3,7 +3,7 @@ package flexibleip_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/flexibleip/ip_test.go b/internal/services/flexibleip/ip_test.go index 05f5030cf0..dd7e20368b 100644 --- a/internal/services/flexibleip/ip_test.go +++ b/internal/services/flexibleip/ip_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" flexibleipSDK "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/flexibleip/mac_address_test.go b/internal/services/flexibleip/mac_address_test.go index f546458714..1be5153651 100644 --- a/internal/services/flexibleip/mac_address_test.go +++ b/internal/services/flexibleip/mac_address_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" flexibleipSDK "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" diff --git a/internal/services/flexibleip/sweep_test.go b/internal/services/flexibleip/sweep_test.go index 6be5b8af09..9d2b9868cf 100644 --- a/internal/services/flexibleip/sweep_test.go +++ b/internal/services/flexibleip/sweep_test.go @@ -3,7 +3,7 @@ package flexibleip_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" flexibleiptestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/flexibleip/testfuncs" ) diff --git a/internal/services/flexibleip/testfuncs/sweep.go b/internal/services/flexibleip/testfuncs/sweep.go index 0130ab067a..3fbc3ddf32 100644 --- a/internal/services/flexibleip/testfuncs/sweep.go +++ b/internal/services/flexibleip/testfuncs/sweep.go @@ -3,7 +3,7 @@ package flexibleiptestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" flexibleipSDK "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/function/cron_test.go b/internal/services/function/cron_test.go index 25e08a0455..a573ccd744 100644 --- a/internal/services/function/cron_test.go +++ b/internal/services/function/cron_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/function/data_source_function_namespace_test.go b/internal/services/function/data_source_function_namespace_test.go index 970552bfcf..f35df50620 100644 --- a/internal/services/function/data_source_function_namespace_test.go +++ b/internal/services/function/data_source_function_namespace_test.go @@ -3,7 +3,7 @@ package function_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/function/data_source_function_test.go b/internal/services/function/data_source_function_test.go index 507dab33a1..bee48a5675 100644 --- a/internal/services/function/data_source_function_test.go +++ b/internal/services/function/data_source_function_test.go @@ -3,7 +3,7 @@ package function_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/function/domain_test.go b/internal/services/function/domain_test.go index bb5967aa62..57d76e49c0 100644 --- a/internal/services/function/domain_test.go +++ b/internal/services/function/domain_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/function/function_test.go b/internal/services/function/function_test.go index 02aa4feec3..01bb95f9a1 100644 --- a/internal/services/function/function_test.go +++ b/internal/services/function/function_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/alexedwards/argon2id" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/function/namespace_test.go b/internal/services/function/namespace_test.go index 1c29bc1662..d14c019975 100644 --- a/internal/services/function/namespace_test.go +++ b/internal/services/function/namespace_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/function/sweep_test.go b/internal/services/function/sweep_test.go index f49696647d..706dccab22 100644 --- a/internal/services/function/sweep_test.go +++ b/internal/services/function/sweep_test.go @@ -3,7 +3,7 @@ package function_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" functiontestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/function/testfuncs" ) diff --git a/internal/services/function/testfuncs/sweep.go b/internal/services/function/testfuncs/sweep.go index 974f3b54ef..15326bd444 100644 --- a/internal/services/function/testfuncs/sweep.go +++ b/internal/services/function/testfuncs/sweep.go @@ -3,7 +3,7 @@ package functiontestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/function/token_test.go b/internal/services/function/token_test.go index 9087ba5d4d..0919a33a56 100644 --- a/internal/services/function/token_test.go +++ b/internal/services/function/token_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/function/trigger_test.go b/internal/services/function/trigger_test.go index d3292e848f..4e74759849 100644 --- a/internal/services/function/trigger_test.go +++ b/internal/services/function/trigger_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/api_key_data_source_test.go b/internal/services/iam/api_key_data_source_test.go index 756f13c64b..7cc174684e 100644 --- a/internal/services/iam/api_key_data_source_test.go +++ b/internal/services/iam/api_key_data_source_test.go @@ -3,7 +3,7 @@ package iam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/iam/api_key_test.go b/internal/services/iam/api_key_test.go index 47c8947265..fe1f6b9206 100644 --- a/internal/services/iam/api_key_test.go +++ b/internal/services/iam/api_key_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/application_data_source_test.go b/internal/services/iam/application_data_source_test.go index f80870ecf8..f8e1b0e1a2 100644 --- a/internal/services/iam/application_data_source_test.go +++ b/internal/services/iam/application_data_source_test.go @@ -3,7 +3,7 @@ package iam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/iam/application_test.go b/internal/services/iam/application_test.go index 4fed85d610..82d66103c0 100644 --- a/internal/services/iam/application_test.go +++ b/internal/services/iam/application_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/group_data_source_test.go b/internal/services/iam/group_data_source_test.go index 906df2ee5c..734c4713db 100644 --- a/internal/services/iam/group_data_source_test.go +++ b/internal/services/iam/group_data_source_test.go @@ -3,7 +3,7 @@ package iam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/iam/group_membership_test.go b/internal/services/iam/group_membership_test.go index c92bdc0d88..6e3719fc37 100644 --- a/internal/services/iam/group_membership_test.go +++ b/internal/services/iam/group_membership_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam" diff --git a/internal/services/iam/group_test.go b/internal/services/iam/group_test.go index cc4689261e..377f704088 100644 --- a/internal/services/iam/group_test.go +++ b/internal/services/iam/group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/policy_test.go b/internal/services/iam/policy_test.go index 2cf8c63bfa..c01b76fd8d 100644 --- a/internal/services/iam/policy_test.go +++ b/internal/services/iam/policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/ssh_key_account_data_source_test.go b/internal/services/iam/ssh_key_account_data_source_test.go index 9b2aee9627..9daf8b484e 100644 --- a/internal/services/iam/ssh_key_account_data_source_test.go +++ b/internal/services/iam/ssh_key_account_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs" ) diff --git a/internal/services/iam/ssh_key_account_test.go b/internal/services/iam/ssh_key_account_test.go index c19266606a..a2c5373689 100644 --- a/internal/services/iam/ssh_key_account_test.go +++ b/internal/services/iam/ssh_key_account_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs" ) diff --git a/internal/services/iam/ssh_key_data_source_test.go b/internal/services/iam/ssh_key_data_source_test.go index 977e3cacde..51d5269bdf 100644 --- a/internal/services/iam/ssh_key_data_source_test.go +++ b/internal/services/iam/ssh_key_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs" ) diff --git a/internal/services/iam/ssh_key_test.go b/internal/services/iam/ssh_key_test.go index 495f45e0ef..ded0f9d18d 100644 --- a/internal/services/iam/ssh_key_test.go +++ b/internal/services/iam/ssh_key_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" iamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs" ) diff --git a/internal/services/iam/sweep_test.go b/internal/services/iam/sweep_test.go index addcdb1a22..a9ecfa14cc 100644 --- a/internal/services/iam/sweep_test.go +++ b/internal/services/iam/sweep_test.go @@ -3,7 +3,7 @@ package iam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" iamtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam/testfuncs" ) diff --git a/internal/services/iam/testfuncs/checks.go b/internal/services/iam/testfuncs/checks.go index 536b3bb878..da8f47a0b8 100644 --- a/internal/services/iam/testfuncs/checks.go +++ b/internal/services/iam/testfuncs/checks.go @@ -3,8 +3,8 @@ package iamtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iam2 "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iam/testfuncs/sweep.go b/internal/services/iam/testfuncs/sweep.go index a250664ed5..4d404cd3b9 100644 --- a/internal/services/iam/testfuncs/sweep.go +++ b/internal/services/iam/testfuncs/sweep.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/iam/user_data_source_test.go b/internal/services/iam/user_data_source_test.go index e6c872c2a5..c664f385d1 100644 --- a/internal/services/iam/user_data_source_test.go +++ b/internal/services/iam/user_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam" diff --git a/internal/services/iam/user_test.go b/internal/services/iam/user_test.go index f4e3974214..0f272488a5 100644 --- a/internal/services/iam/user_test.go +++ b/internal/services/iam/user_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/inference/deployment_test.go b/internal/services/inference/deployment_test.go index c5cb99f4c4..f16a01f8db 100644 --- a/internal/services/inference/deployment_test.go +++ b/internal/services/inference/deployment_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference" diff --git a/internal/services/inference/model_data_source_test.go b/internal/services/inference/model_data_source_test.go index 4f908f981d..8c292a103e 100644 --- a/internal/services/inference/model_data_source_test.go +++ b/internal/services/inference/model_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" inferencetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference/testfuncs" ) diff --git a/internal/services/inference/model_test.go b/internal/services/inference/model_test.go index 09f4db5fec..c5f4204180 100644 --- a/internal/services/inference/model_test.go +++ b/internal/services/inference/model_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference" diff --git a/internal/services/inference/sweep_test.go b/internal/services/inference/sweep_test.go index d778cdbdf3..4a04da178d 100644 --- a/internal/services/inference/sweep_test.go +++ b/internal/services/inference/sweep_test.go @@ -3,7 +3,7 @@ package inference_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" inferencetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference/testfuncs" ) diff --git a/internal/services/inference/testfuncs/checks.go b/internal/services/inference/testfuncs/checks.go index f617f5a7fd..5dc3000aa8 100644 --- a/internal/services/inference/testfuncs/checks.go +++ b/internal/services/inference/testfuncs/checks.go @@ -3,8 +3,8 @@ package inferencetestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/inference/testfuncs/sweep.go b/internal/services/inference/testfuncs/sweep.go index 0d1ddaedbc..a5667b12f8 100644 --- a/internal/services/inference/testfuncs/sweep.go +++ b/internal/services/inference/testfuncs/sweep.go @@ -3,7 +3,7 @@ package inferencetestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/scaleway-sdk-go/api/inference/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/instance/data_source_instance_private_nic_test.go b/internal/services/instance/data_source_instance_private_nic_test.go index f67b8b422d..bd44d375b4 100644 --- a/internal/services/instance/data_source_instance_private_nic_test.go +++ b/internal/services/instance/data_source_instance_private_nic_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/instance/image_data_source_test.go b/internal/services/instance/image_data_source_test.go index e3505b5940..86d90ea4d8 100644 --- a/internal/services/instance/image_data_source_test.go +++ b/internal/services/instance/image_data_source_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/image_test.go b/internal/services/instance/image_test.go index e290926ab4..7138fb94af 100644 --- a/internal/services/instance/image_test.go +++ b/internal/services/instance/image_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/instance/ip_data_source_test.go b/internal/services/instance/ip_data_source_test.go index b0d9bc16cf..a8c16aa8ad 100644 --- a/internal/services/instance/ip_data_source_test.go +++ b/internal/services/instance/ip_data_source_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/ip_reverse_dns_test.go b/internal/services/instance/ip_reverse_dns_test.go index 0796daadd3..1accfaeba8 100644 --- a/internal/services/instance/ip_reverse_dns_test.go +++ b/internal/services/instance/ip_reverse_dns_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/ip_test.go b/internal/services/instance/ip_test.go index 078d206f42..9d0aba049f 100644 --- a/internal/services/instance/ip_test.go +++ b/internal/services/instance/ip_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" diff --git a/internal/services/instance/placement_group_data_source_test.go b/internal/services/instance/placement_group_data_source_test.go index 88176cd2e1..582abbfac8 100644 --- a/internal/services/instance/placement_group_data_source_test.go +++ b/internal/services/instance/placement_group_data_source_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/instance/placement_group_test.go b/internal/services/instance/placement_group_test.go index ba55e61d69..17a8638fff 100644 --- a/internal/services/instance/placement_group_test.go +++ b/internal/services/instance/placement_group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/instance/private_nic_test.go b/internal/services/instance/private_nic_test.go index 05c398f7fe..4ec7b5ed5d 100644 --- a/internal/services/instance/private_nic_test.go +++ b/internal/services/instance/private_nic_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/instance/security_group_data_source_test.go b/internal/services/instance/security_group_data_source_test.go index 135e377132..c2c03e1b77 100644 --- a/internal/services/instance/security_group_data_source_test.go +++ b/internal/services/instance/security_group_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/instance/security_group_rules_test.go b/internal/services/instance/security_group_rules_test.go index 13487385dd..2719943c90 100644 --- a/internal/services/instance/security_group_rules_test.go +++ b/internal/services/instance/security_group_rules_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/instance/security_group_test.go b/internal/services/instance/security_group_test.go index d95992cb5e..9314dac897 100644 --- a/internal/services/instance/security_group_test.go +++ b/internal/services/instance/security_group_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/instance/server_data_source_test.go b/internal/services/instance/server_data_source_test.go index 09ae6c7320..5363d0f38f 100644 --- a/internal/services/instance/server_data_source_test.go +++ b/internal/services/instance/server_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/server_test.go b/internal/services/instance/server_test.go index 1fc4e70b6a..08e6f2f6b2 100644 --- a/internal/services/instance/server_test.go +++ b/internal/services/instance/server_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" diff --git a/internal/services/instance/servers_data_source_test.go b/internal/services/instance/servers_data_source_test.go index d02fb291ea..65d9723e23 100644 --- a/internal/services/instance/servers_data_source_test.go +++ b/internal/services/instance/servers_data_source_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/snapshot_data_source_test.go b/internal/services/instance/snapshot_data_source_test.go index 29db7c0e32..6f3e2c6ed9 100644 --- a/internal/services/instance/snapshot_data_source_test.go +++ b/internal/services/instance/snapshot_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/snapshot_test.go b/internal/services/instance/snapshot_test.go index 5b0e87b6ee..d1cdb7d3f8 100644 --- a/internal/services/instance/snapshot_test.go +++ b/internal/services/instance/snapshot_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/instance/sweep_test.go b/internal/services/instance/sweep_test.go index 1204079098..18d3a0da26 100644 --- a/internal/services/instance/sweep_test.go +++ b/internal/services/instance/sweep_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/testfuncs/checks.go b/internal/services/instance/testfuncs/checks.go index c02c81a268..1883f40495 100644 --- a/internal/services/instance/testfuncs/checks.go +++ b/internal/services/instance/testfuncs/checks.go @@ -3,8 +3,8 @@ package instancetestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/instance/testfuncs/sweep.go b/internal/services/instance/testfuncs/sweep.go index 8f6acd5496..4a35caeb04 100644 --- a/internal/services/instance/testfuncs/sweep.go +++ b/internal/services/instance/testfuncs/sweep.go @@ -3,7 +3,7 @@ package instancetestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/instance/user_data_test.go b/internal/services/instance/user_data_test.go index 8448ffd438..d51d84a88d 100644 --- a/internal/services/instance/user_data_test.go +++ b/internal/services/instance/user_data_test.go @@ -3,7 +3,7 @@ package instance_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/volume_data_source_test.go b/internal/services/instance/volume_data_source_test.go index 007fb5cef2..539a82d8c3 100644 --- a/internal/services/instance/volume_data_source_test.go +++ b/internal/services/instance/volume_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/instance/volume_test.go b/internal/services/instance/volume_test.go index fb195f0f7a..ae5c37292d 100644 --- a/internal/services/instance/volume_test.go +++ b/internal/services/instance/volume_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/iot/data_source_iot_device_test.go b/internal/services/iot/data_source_iot_device_test.go index 662f8446fc..b7f97b864b 100644 --- a/internal/services/iot/data_source_iot_device_test.go +++ b/internal/services/iot/data_source_iot_device_test.go @@ -3,7 +3,7 @@ package iot_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/iot/data_source_iot_hub_test.go b/internal/services/iot/data_source_iot_hub_test.go index 8349facc68..dcd541677b 100644 --- a/internal/services/iot/data_source_iot_hub_test.go +++ b/internal/services/iot/data_source_iot_hub_test.go @@ -3,7 +3,7 @@ package iot_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/iot/device_test.go b/internal/services/iot/device_test.go index 3ec52edb25..8ffcf96aa8 100644 --- a/internal/services/iot/device_test.go +++ b/internal/services/iot/device_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iotSDK "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iot" diff --git a/internal/services/iot/hub_test.go b/internal/services/iot/hub_test.go index ddd4645289..46d9f7ac64 100644 --- a/internal/services/iot/hub_test.go +++ b/internal/services/iot/hub_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iotSDK "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/iot/network_test.go b/internal/services/iot/network_test.go index 9533cdd152..ae71dff20c 100644 --- a/internal/services/iot/network_test.go +++ b/internal/services/iot/network_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iotSDK "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iot" diff --git a/internal/services/iot/routes_test.go b/internal/services/iot/routes_test.go index c086219105..c1542f9fc4 100644 --- a/internal/services/iot/routes_test.go +++ b/internal/services/iot/routes_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" iotSDK "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iot" diff --git a/internal/services/iot/sweep_test.go b/internal/services/iot/sweep_test.go index 90b35baa65..97c3f54cbc 100644 --- a/internal/services/iot/sweep_test.go +++ b/internal/services/iot/sweep_test.go @@ -3,7 +3,7 @@ package iot_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" iottestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iot/testfuncs" ) diff --git a/internal/services/iot/testfuncs/sweep.go b/internal/services/iot/testfuncs/sweep.go index 87e33b7378..4a225cf299 100644 --- a/internal/services/iot/testfuncs/sweep.go +++ b/internal/services/iot/testfuncs/sweep.go @@ -3,7 +3,7 @@ package iottestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" iotSDK "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/ipam/ip_data_source_test.go b/internal/services/ipam/ip_data_source_test.go index 559cbdd20b..dca138e165 100644 --- a/internal/services/ipam/ip_data_source_test.go +++ b/internal/services/ipam/ip_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ipamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs" diff --git a/internal/services/ipam/ip_reverse_dns_test.go b/internal/services/ipam/ip_reverse_dns_test.go index 8c890796a0..7913d536e2 100644 --- a/internal/services/ipam/ip_reverse_dns_test.go +++ b/internal/services/ipam/ip_reverse_dns_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/ipam/ip_test.go b/internal/services/ipam/ip_test.go index 1b18d9872a..29147b1324 100644 --- a/internal/services/ipam/ip_test.go +++ b/internal/services/ipam/ip_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ipamSDK "github.com/scaleway/scaleway-sdk-go/api/ipam/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam" diff --git a/internal/services/ipam/ips_data_source_test.go b/internal/services/ipam/ips_data_source_test.go index c7aa049121..bc11aacf4a 100644 --- a/internal/services/ipam/ips_data_source_test.go +++ b/internal/services/ipam/ips_data_source_test.go @@ -3,7 +3,7 @@ package ipam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ipamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs" ) diff --git a/internal/services/ipam/sweep_test.go b/internal/services/ipam/sweep_test.go index 588808e650..499669fede 100644 --- a/internal/services/ipam/sweep_test.go +++ b/internal/services/ipam/sweep_test.go @@ -3,7 +3,7 @@ package ipam_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ipamtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs" ) diff --git a/internal/services/ipam/testfuncs/checks.go b/internal/services/ipam/testfuncs/checks.go index 53cd7c95c5..b5af5da644 100644 --- a/internal/services/ipam/testfuncs/checks.go +++ b/internal/services/ipam/testfuncs/checks.go @@ -3,8 +3,8 @@ package ipamtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ipam2 "github.com/scaleway/scaleway-sdk-go/api/ipam/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/ipam/testfuncs/sweep.go b/internal/services/ipam/testfuncs/sweep.go index d016c84da5..122b9b127f 100644 --- a/internal/services/ipam/testfuncs/sweep.go +++ b/internal/services/ipam/testfuncs/sweep.go @@ -3,7 +3,7 @@ package ipamtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ipamSDK "github.com/scaleway/scaleway-sdk-go/api/ipam/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/jobs/jobs_test.go b/internal/services/jobs/jobs_test.go index 7200cfc24c..50b9182efc 100644 --- a/internal/services/jobs/jobs_test.go +++ b/internal/services/jobs/jobs_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" jobsSDK "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/jobs/sweep_test.go b/internal/services/jobs/sweep_test.go index 5b9cfd77e9..408b820587 100644 --- a/internal/services/jobs/sweep_test.go +++ b/internal/services/jobs/sweep_test.go @@ -3,7 +3,7 @@ package jobs_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" jobstestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/jobs/testfuncs" ) diff --git a/internal/services/jobs/testfuncs/sweep.go b/internal/services/jobs/testfuncs/sweep.go index 9e34a9bddc..fa556d4592 100644 --- a/internal/services/jobs/testfuncs/sweep.go +++ b/internal/services/jobs/testfuncs/sweep.go @@ -3,7 +3,7 @@ package jobstestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" jobsSDK "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/k8s/acl_test.go b/internal/services/k8s/acl_test.go index 347e091758..96b370a1f6 100644 --- a/internal/services/k8s/acl_test.go +++ b/internal/services/k8s/acl_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/k8s" diff --git a/internal/services/k8s/cluster_data_source_test.go b/internal/services/k8s/cluster_data_source_test.go index f4db701695..5507797270 100644 --- a/internal/services/k8s/cluster_data_source_test.go +++ b/internal/services/k8s/cluster_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/k8s/cluster_test.go b/internal/services/k8s/cluster_test.go index cbc7c689d0..295632b391 100644 --- a/internal/services/k8s/cluster_test.go +++ b/internal/services/k8s/cluster_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/k8s/k8s_version_data_source_test.go b/internal/services/k8s/k8s_version_data_source_test.go index ad25088fdf..e467cfeede 100644 --- a/internal/services/k8s/k8s_version_data_source_test.go +++ b/internal/services/k8s/k8s_version_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" diff --git a/internal/services/k8s/pool_data_source_test.go b/internal/services/k8s/pool_data_source_test.go index ec1193c67d..c5fba1c591 100644 --- a/internal/services/k8s/pool_data_source_test.go +++ b/internal/services/k8s/pool_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/k8s/pool_test.go b/internal/services/k8s/pool_test.go index 638ed33f3a..04ebbdeb69 100644 --- a/internal/services/k8s/pool_test.go +++ b/internal/services/k8s/pool_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/services/k8s/sweep_test.go b/internal/services/k8s/sweep_test.go index 1e888af927..487b1c05c1 100644 --- a/internal/services/k8s/sweep_test.go +++ b/internal/services/k8s/sweep_test.go @@ -3,7 +3,7 @@ package k8s_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" k8stestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/k8s/testfuncs" ) diff --git a/internal/services/k8s/testfuncs/sweep.go b/internal/services/k8s/testfuncs/sweep.go index 4e72309119..2121edc68b 100644 --- a/internal/services/k8s/testfuncs/sweep.go +++ b/internal/services/k8s/testfuncs/sweep.go @@ -3,7 +3,7 @@ package k8stestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/keymanager/key_resource_test.go b/internal/services/keymanager/key_resource_test.go index 21b6723661..0072053f69 100644 --- a/internal/services/keymanager/key_resource_test.go +++ b/internal/services/keymanager/key_resource_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/acl_test.go b/internal/services/lb/acl_test.go index 656147373c..2c62e774b7 100644 --- a/internal/services/lb/acl_test.go +++ b/internal/services/lb/acl_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/acls_data_source_test.go b/internal/services/lb/acls_data_source_test.go index 69d79d4364..ce88d3c273 100644 --- a/internal/services/lb/acls_data_source_test.go +++ b/internal/services/lb/acls_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/lb/backend_data_source_test.go b/internal/services/lb/backend_data_source_test.go index 47000f0dbc..cf2858c791 100644 --- a/internal/services/lb/backend_data_source_test.go +++ b/internal/services/lb/backend_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/backend_test.go b/internal/services/lb/backend_test.go index 8061adfc4b..48a6e5bcb4 100644 --- a/internal/services/lb/backend_test.go +++ b/internal/services/lb/backend_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/backends_data_source_test.go b/internal/services/lb/backends_data_source_test.go index 1128ed4193..fea0bd01a8 100644 --- a/internal/services/lb/backends_data_source_test.go +++ b/internal/services/lb/backends_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/lb/certificate_data_source_test.go b/internal/services/lb/certificate_data_source_test.go index 3633c929cb..bcba101099 100644 --- a/internal/services/lb/certificate_data_source_test.go +++ b/internal/services/lb/certificate_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/certificate_test.go b/internal/services/lb/certificate_test.go index c77d6a6b23..d15e8cdf93 100644 --- a/internal/services/lb/certificate_test.go +++ b/internal/services/lb/certificate_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/data_source_lb_frontends_test.go b/internal/services/lb/data_source_lb_frontends_test.go index 785c45160a..25e1ef345d 100644 --- a/internal/services/lb/data_source_lb_frontends_test.go +++ b/internal/services/lb/data_source_lb_frontends_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/lb/data_source_lb_ip_test.go b/internal/services/lb/data_source_lb_ip_test.go index 330e63f805..86e6e80433 100644 --- a/internal/services/lb/data_source_lb_ip_test.go +++ b/internal/services/lb/data_source_lb_ip_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/frontend_data_source_test.go b/internal/services/lb/frontend_data_source_test.go index 25df49a6f7..35352fc203 100644 --- a/internal/services/lb/frontend_data_source_test.go +++ b/internal/services/lb/frontend_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/frontend_test.go b/internal/services/lb/frontend_test.go index d97534b5c2..24b3a59cc7 100644 --- a/internal/services/lb/frontend_test.go +++ b/internal/services/lb/frontend_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/lb/ip_test.go b/internal/services/lb/ip_test.go index 5faa5c7b84..f3b5f5ad5d 100644 --- a/internal/services/lb/ip_test.go +++ b/internal/services/lb/ip_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb" diff --git a/internal/services/lb/ips_data_source_test.go b/internal/services/lb/ips_data_source_test.go index 7037a7b391..4ee90575d6 100644 --- a/internal/services/lb/ips_data_source_test.go +++ b/internal/services/lb/ips_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/lb_data_source_test.go b/internal/services/lb/lb_data_source_test.go index 25333ac565..69166b392b 100644 --- a/internal/services/lb/lb_data_source_test.go +++ b/internal/services/lb/lb_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/lb_test.go b/internal/services/lb/lb_test.go index e4195dd0b3..38ef3543fb 100644 --- a/internal/services/lb/lb_test.go +++ b/internal/services/lb/lb_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/lbs_data_source_test.go b/internal/services/lb/lbs_data_source_test.go index bcaa0a94b9..d33d2cfca0 100644 --- a/internal/services/lb/lbs_data_source_test.go +++ b/internal/services/lb/lbs_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/lb/route_data_source_test.go b/internal/services/lb/route_data_source_test.go index 64e338e8b0..23a6b180cc 100644 --- a/internal/services/lb/route_data_source_test.go +++ b/internal/services/lb/route_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/route_test.go b/internal/services/lb/route_test.go index c97939194b..1742f46bea 100644 --- a/internal/services/lb/route_test.go +++ b/internal/services/lb/route_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/lb/routes_data_source_test.go b/internal/services/lb/routes_data_source_test.go index 61edc5433c..f1dce735c8 100644 --- a/internal/services/lb/routes_data_source_test.go +++ b/internal/services/lb/routes_data_source_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/lb/sweep_test.go b/internal/services/lb/sweep_test.go index e86afd1ca4..ac0be2f51e 100644 --- a/internal/services/lb/sweep_test.go +++ b/internal/services/lb/sweep_test.go @@ -3,7 +3,7 @@ package lb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" lbtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs" ) diff --git a/internal/services/lb/testfuncs/checks.go b/internal/services/lb/testfuncs/checks.go index 02f29225b7..290a4f7b86 100644 --- a/internal/services/lb/testfuncs/checks.go +++ b/internal/services/lb/testfuncs/checks.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" lb2 "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/lb/testfuncs/sweep.go b/internal/services/lb/testfuncs/sweep.go index 6abe9d2f7e..a9003fa6bf 100644 --- a/internal/services/lb/testfuncs/sweep.go +++ b/internal/services/lb/testfuncs/sweep.go @@ -3,7 +3,7 @@ package lbtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/marketplace/image_data_source_test.go b/internal/services/marketplace/image_data_source_test.go index 36ae355528..82f59b4015 100644 --- a/internal/services/marketplace/image_data_source_test.go +++ b/internal/services/marketplace/image_data_source_test.go @@ -3,7 +3,7 @@ package marketplace_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/marketplace/sweep_test.go b/internal/services/marketplace/sweep_test.go index 3c02425412..291a5bc857 100644 --- a/internal/services/marketplace/sweep_test.go +++ b/internal/services/marketplace/sweep_test.go @@ -3,7 +3,7 @@ package marketplace_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestMain(m *testing.M) { diff --git a/internal/services/mnq/nats_account_test.go b/internal/services/mnq/nats_account_test.go index eaf4340274..04f5308fef 100644 --- a/internal/services/mnq/nats_account_test.go +++ b/internal/services/mnq/nats_account_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/nats_credentials_test.go b/internal/services/mnq/nats_credentials_test.go index 2629c3f6fc..ff37d12a84 100644 --- a/internal/services/mnq/nats_credentials_test.go +++ b/internal/services/mnq/nats_credentials_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/sns_credentials_test.go b/internal/services/mnq/sns_credentials_test.go index 26d0ed924f..58ffdae455 100644 --- a/internal/services/mnq/sns_credentials_test.go +++ b/internal/services/mnq/sns_credentials_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/sns_data_source_test.go b/internal/services/mnq/sns_data_source_test.go index 2df7877d90..7e5c29c2dc 100644 --- a/internal/services/mnq/sns_data_source_test.go +++ b/internal/services/mnq/sns_data_source_test.go @@ -3,7 +3,7 @@ package mnq_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/mnq/sns_test.go b/internal/services/mnq/sns_test.go index 6164bd1278..0514f70cda 100644 --- a/internal/services/mnq/sns_test.go +++ b/internal/services/mnq/sns_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/sns_topic_subscription_test.go b/internal/services/mnq/sns_topic_subscription_test.go index 9ce6e3f75a..64248acd1d 100644 --- a/internal/services/mnq/sns_topic_subscription_test.go +++ b/internal/services/mnq/sns_topic_subscription_test.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/smithy-go" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mnq" diff --git a/internal/services/mnq/sns_topic_test.go b/internal/services/mnq/sns_topic_test.go index 537c7e4389..2eb0874d33 100644 --- a/internal/services/mnq/sns_topic_test.go +++ b/internal/services/mnq/sns_topic_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/smithy-go" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mnq" diff --git a/internal/services/mnq/sqs_credentials_test.go b/internal/services/mnq/sqs_credentials_test.go index 89ebc3db90..183ab07d36 100644 --- a/internal/services/mnq/sqs_credentials_test.go +++ b/internal/services/mnq/sqs_credentials_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/sqs_data_source_test.go b/internal/services/mnq/sqs_data_source_test.go index 41a6d90f7a..01c020c6aa 100644 --- a/internal/services/mnq/sqs_data_source_test.go +++ b/internal/services/mnq/sqs_data_source_test.go @@ -3,7 +3,7 @@ package mnq_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/mnq/sqs_queue_test.go b/internal/services/mnq/sqs_queue_test.go index f276785318..270b0a8900 100644 --- a/internal/services/mnq/sqs_queue_test.go +++ b/internal/services/mnq/sqs_queue_test.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sqs" - "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" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/mnq/sqs_test.go b/internal/services/mnq/sqs_test.go index 1b42469f07..7a74bf6df2 100644 --- a/internal/services/mnq/sqs_test.go +++ b/internal/services/mnq/sqs_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mnq/sweep_test.go b/internal/services/mnq/sweep_test.go index d59d1f245d..2b453b9286 100644 --- a/internal/services/mnq/sweep_test.go +++ b/internal/services/mnq/sweep_test.go @@ -3,7 +3,7 @@ package mnq_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" mnqtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mnq/testfuncs" ) diff --git a/internal/services/mnq/testfuncs/sweep.go b/internal/services/mnq/testfuncs/sweep.go index ffd478a368..58f738e64c 100644 --- a/internal/services/mnq/testfuncs/sweep.go +++ b/internal/services/mnq/testfuncs/sweep.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3" mnqSDK "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/services/mongodb/data_source_instance_test.go b/internal/services/mongodb/data_source_instance_test.go index a4f293de76..9740a840c8 100644 --- a/internal/services/mongodb/data_source_instance_test.go +++ b/internal/services/mongodb/data_source_instance_test.go @@ -3,7 +3,7 @@ package mongodb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/mongodb/instance_test.go b/internal/services/mongodb/instance_test.go index 46729bda4f..8704c90ee3 100644 --- a/internal/services/mongodb/instance_test.go +++ b/internal/services/mongodb/instance_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mongodbSDK "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mongodb/snapshot_test.go b/internal/services/mongodb/snapshot_test.go index a66fdf511e..8c41a31e52 100644 --- a/internal/services/mongodb/snapshot_test.go +++ b/internal/services/mongodb/snapshot_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" mongodbSDK "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/mongodb/sweep_test.go b/internal/services/mongodb/sweep_test.go index d7b5b5b1e1..40879255bd 100644 --- a/internal/services/mongodb/sweep_test.go +++ b/internal/services/mongodb/sweep_test.go @@ -3,7 +3,7 @@ package mongodb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" mongodbtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mongodb/testfuncs" ) diff --git a/internal/services/mongodb/testfuncs/sweep.go b/internal/services/mongodb/testfuncs/sweep.go index 8aa8e06eab..8623d16a1c 100644 --- a/internal/services/mongodb/testfuncs/sweep.go +++ b/internal/services/mongodb/testfuncs/sweep.go @@ -3,7 +3,7 @@ package mongodbtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" mongodb "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/object/bucket_acl_test.go b/internal/services/object/bucket_acl_test.go index 8887ca10e2..f35b88ef9e 100644 --- a/internal/services/object/bucket_acl_test.go +++ b/internal/services/object/bucket_acl_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/s3" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" diff --git a/internal/services/object/bucket_lock_configuration_test.go b/internal/services/object/bucket_lock_configuration_test.go index 77e6418962..96668a9a0c 100644 --- a/internal/services/object/bucket_lock_configuration_test.go +++ b/internal/services/object/bucket_lock_configuration_test.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object" diff --git a/internal/services/object/bucket_policy_test.go b/internal/services/object/bucket_policy_test.go index a523cbf40f..58fd9b36c7 100644 --- a/internal/services/object/bucket_policy_test.go +++ b/internal/services/object/bucket_policy_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" awspolicy "github.com/hashicorp/awspolicyequivalence" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" diff --git a/internal/services/object/bucket_test.go b/internal/services/object/bucket_test.go index f524e0ed52..9ce62f07db 100644 --- a/internal/services/object/bucket_test.go +++ b/internal/services/object/bucket_test.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" s3Types "github.com/aws/aws-sdk-go-v2/service/s3/types" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" diff --git a/internal/services/object/bucket_website_configuration_test.go b/internal/services/object/bucket_website_configuration_test.go index 43b46bc5c8..58cb7c4940 100644 --- a/internal/services/object/bucket_website_configuration_test.go +++ b/internal/services/object/bucket_website_configuration_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" diff --git a/internal/services/object/data_source_object_bucket_policy_test.go b/internal/services/object/data_source_object_bucket_policy_test.go index d78a185c60..b39f33b4c0 100644 --- a/internal/services/object/data_source_object_bucket_policy_test.go +++ b/internal/services/object/data_source_object_bucket_policy_test.go @@ -5,9 +5,9 @@ import ( "testing" awspolicy "github.com/hashicorp/awspolicyequivalence" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" ) diff --git a/internal/services/object/data_source_object_bucket_test.go b/internal/services/object/data_source_object_bucket_test.go index ce1710c812..2d8b7a6052 100644 --- a/internal/services/object/data_source_object_bucket_test.go +++ b/internal/services/object/data_source_object_bucket_test.go @@ -5,9 +5,9 @@ import ( "regexp" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" "github.com/stretchr/testify/require" diff --git a/internal/services/object/errors.go b/internal/services/object/errors.go index f7a8821675..94c411fad0 100644 --- a/internal/services/object/errors.go +++ b/internal/services/object/errors.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/services/object/object_test.go b/internal/services/object/object_test.go index a0bab7e7f0..e75a390946 100644 --- a/internal/services/object/object_test.go +++ b/internal/services/object/object_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" ) diff --git a/internal/services/object/sweep_test.go b/internal/services/object/sweep_test.go index 713641daf1..6a4e60b1b4 100644 --- a/internal/services/object/sweep_test.go +++ b/internal/services/object/sweep_test.go @@ -3,7 +3,7 @@ package object_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" objecttestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs" ) diff --git a/internal/services/object/testfuncs/checks.go b/internal/services/object/testfuncs/checks.go index 97c6665419..dd290f1e0b 100644 --- a/internal/services/object/testfuncs/checks.go +++ b/internal/services/object/testfuncs/checks.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" diff --git a/internal/services/object/testfuncs/sweep.go b/internal/services/object/testfuncs/sweep.go index db3f93751d..09dfc11c83 100644 --- a/internal/services/object/testfuncs/sweep.go +++ b/internal/services/object/testfuncs/sweep.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/logging" diff --git a/internal/services/rdb/acl_data_source_test.go b/internal/services/rdb/acl_data_source_test.go index cb3a1cad4e..9f80c91859 100644 --- a/internal/services/rdb/acl_data_source_test.go +++ b/internal/services/rdb/acl_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/acl_test.go b/internal/services/rdb/acl_test.go index deee7c2a2f..937d7e72ab 100644 --- a/internal/services/rdb/acl_test.go +++ b/internal/services/rdb/acl_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/data_source_rdb_database_backup_test.go b/internal/services/rdb/data_source_rdb_database_backup_test.go index 5a307c7ada..96e0798ea1 100644 --- a/internal/services/rdb/data_source_rdb_database_backup_test.go +++ b/internal/services/rdb/data_source_rdb_database_backup_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/data_source_rdb_instance_test.go b/internal/services/rdb/data_source_rdb_instance_test.go index 61bfeeea08..8bd4b9ff0f 100644 --- a/internal/services/rdb/data_source_rdb_instance_test.go +++ b/internal/services/rdb/data_source_rdb_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/database_backup_test.go b/internal/services/rdb/database_backup_test.go index 923c3baf63..2d0674e770 100644 --- a/internal/services/rdb/database_backup_test.go +++ b/internal/services/rdb/database_backup_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/rdb/database_data_source_test.go b/internal/services/rdb/database_data_source_test.go index 6a0977dc36..f0dfd4fbc2 100644 --- a/internal/services/rdb/database_data_source_test.go +++ b/internal/services/rdb/database_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/database_test.go b/internal/services/rdb/database_test.go index 91896e151b..baa71e9aec 100644 --- a/internal/services/rdb/database_test.go +++ b/internal/services/rdb/database_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/rdb/instance_test.go b/internal/services/rdb/instance_test.go index c0e91cae60..315c35f292 100644 --- a/internal/services/rdb/instance_test.go +++ b/internal/services/rdb/instance_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb" diff --git a/internal/services/rdb/privilege_data_source_test.go b/internal/services/rdb/privilege_data_source_test.go index cd542ed04e..f32fe683d9 100644 --- a/internal/services/rdb/privilege_data_source_test.go +++ b/internal/services/rdb/privilege_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" rdbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/privilege_test.go b/internal/services/rdb/privilege_test.go index 6c36ef5f38..70ac9bd0a3 100644 --- a/internal/services/rdb/privilege_test.go +++ b/internal/services/rdb/privilege_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb" diff --git a/internal/services/rdb/read_replica_test.go b/internal/services/rdb/read_replica_test.go index a4b3223116..b44afd83a8 100644 --- a/internal/services/rdb/read_replica_test.go +++ b/internal/services/rdb/read_replica_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/rdb/snapshots_test.go b/internal/services/rdb/snapshots_test.go index d63832e519..9af61ab4ce 100644 --- a/internal/services/rdb/snapshots_test.go +++ b/internal/services/rdb/snapshots_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/rdb/sweep_test.go b/internal/services/rdb/sweep_test.go index 3db386ae8a..ef7eead611 100644 --- a/internal/services/rdb/sweep_test.go +++ b/internal/services/rdb/sweep_test.go @@ -3,7 +3,7 @@ package rdb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" rdbtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb/testfuncs" ) diff --git a/internal/services/rdb/testfuncs/checks.go b/internal/services/rdb/testfuncs/checks.go index ea5e37bb73..12e44a61a0 100644 --- a/internal/services/rdb/testfuncs/checks.go +++ b/internal/services/rdb/testfuncs/checks.go @@ -3,8 +3,8 @@ package rdbtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/rdb/testfuncs/sweep.go b/internal/services/rdb/testfuncs/sweep.go index 7c5012a82d..6c83f25b20 100644 --- a/internal/services/rdb/testfuncs/sweep.go +++ b/internal/services/rdb/testfuncs/sweep.go @@ -3,7 +3,7 @@ package rdbtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/rdb/user_test.go b/internal/services/rdb/user_test.go index a2c4c56b32..df1f138bd0 100644 --- a/internal/services/rdb/user_test.go +++ b/internal/services/rdb/user_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/rdb" diff --git a/internal/services/redis/cluster_data_source_test.go b/internal/services/redis/cluster_data_source_test.go index 85e8a300c1..ee29e5ad65 100644 --- a/internal/services/redis/cluster_data_source_test.go +++ b/internal/services/redis/cluster_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/redis/cluster_test.go b/internal/services/redis/cluster_test.go index 460f6cf532..a7e641c662 100644 --- a/internal/services/redis/cluster_test.go +++ b/internal/services/redis/cluster_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" redisSDK "github.com/scaleway/scaleway-sdk-go/api/redis/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/redis/sweep_test.go b/internal/services/redis/sweep_test.go index 6fc0e67c3c..55022f39e9 100644 --- a/internal/services/redis/sweep_test.go +++ b/internal/services/redis/sweep_test.go @@ -3,7 +3,7 @@ package redis_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" redistestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/redis/testfuncs" ) diff --git a/internal/services/redis/testfuncs/sweep.go b/internal/services/redis/testfuncs/sweep.go index 29b0fa9035..bca239911f 100644 --- a/internal/services/redis/testfuncs/sweep.go +++ b/internal/services/redis/testfuncs/sweep.go @@ -3,7 +3,7 @@ package redistestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" redisSDK "github.com/scaleway/scaleway-sdk-go/api/redis/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/registry/image_data_source_test.go b/internal/services/registry/image_data_source_test.go index 235b5969dd..64abd84d46 100644 --- a/internal/services/registry/image_data_source_test.go +++ b/internal/services/registry/image_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/registry" diff --git a/internal/services/registry/namespace_data_source_test.go b/internal/services/registry/namespace_data_source_test.go index 0382a09a9f..f082cc29da 100644 --- a/internal/services/registry/namespace_data_source_test.go +++ b/internal/services/registry/namespace_data_source_test.go @@ -3,7 +3,7 @@ package registry_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/registry/namespace_test.go b/internal/services/registry/namespace_test.go index 655828f756..edc8ada39e 100644 --- a/internal/services/registry/namespace_test.go +++ b/internal/services/registry/namespace_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/registry/sweep_test.go b/internal/services/registry/sweep_test.go index 8a59515967..e498b60975 100644 --- a/internal/services/registry/sweep_test.go +++ b/internal/services/registry/sweep_test.go @@ -3,7 +3,7 @@ package registry_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" registrytestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/registry/testfuncs" ) diff --git a/internal/services/registry/tag_data_source_test.go b/internal/services/registry/tag_data_source_test.go index 992b231b98..de737fb09c 100644 --- a/internal/services/registry/tag_data_source_test.go +++ b/internal/services/registry/tag_data_source_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" diff --git a/internal/services/registry/testfuncs/checks.go b/internal/services/registry/testfuncs/checks.go index 2f56478b64..0f8f61c1ef 100644 --- a/internal/services/registry/testfuncs/checks.go +++ b/internal/services/registry/testfuncs/checks.go @@ -12,8 +12,8 @@ import ( "github.com/docker/docker/api/types/image" dockerRegistrySDK "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/registry" ) diff --git a/internal/services/registry/testfuncs/sweep.go b/internal/services/registry/testfuncs/sweep.go index f7141a3924..eea234294c 100644 --- a/internal/services/registry/testfuncs/sweep.go +++ b/internal/services/registry/testfuncs/sweep.go @@ -3,7 +3,7 @@ package registrytestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/scwconfig/scw_config_data_source_test.go b/internal/services/scwconfig/scw_config_data_source_test.go index 7f5b0fac44..9e517c005f 100644 --- a/internal/services/scwconfig/scw_config_data_source_test.go +++ b/internal/services/scwconfig/scw_config_data_source_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/provider" diff --git a/internal/services/sdb/database_test.go b/internal/services/sdb/database_test.go index 5ea2dc2b09..0679736314 100644 --- a/internal/services/sdb/database_test.go +++ b/internal/services/sdb/database_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" sdbSDK "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/sdb/sweep_test.go b/internal/services/sdb/sweep_test.go index 142dfa960a..8b452191ce 100644 --- a/internal/services/sdb/sweep_test.go +++ b/internal/services/sdb/sweep_test.go @@ -3,7 +3,7 @@ package sdb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" sdbtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/sdb/testfuncs" ) diff --git a/internal/services/sdb/testfuncs/sweep.go b/internal/services/sdb/testfuncs/sweep.go index 17b2623b2b..f12fae920f 100644 --- a/internal/services/sdb/testfuncs/sweep.go +++ b/internal/services/sdb/testfuncs/sweep.go @@ -3,7 +3,7 @@ package sdbtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" sdbSDK "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/secret/secret_data_source_test.go b/internal/services/secret/secret_data_source_test.go index 98bb0ad397..11ea4a0810 100644 --- a/internal/services/secret/secret_data_source_test.go +++ b/internal/services/secret/secret_data_source_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/stretchr/testify/require" ) diff --git a/internal/services/secret/secret_test.go b/internal/services/secret/secret_test.go index 417dc8f82b..87abe676ec 100644 --- a/internal/services/secret/secret_test.go +++ b/internal/services/secret/secret_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" secretSDK "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/secret/sweep_test.go b/internal/services/secret/sweep_test.go index 87d39baae7..ae6f42230b 100644 --- a/internal/services/secret/sweep_test.go +++ b/internal/services/secret/sweep_test.go @@ -3,7 +3,7 @@ package secret_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" secrettestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/secret/testfuncs" ) diff --git a/internal/services/secret/testfuncs/sweep.go b/internal/services/secret/testfuncs/sweep.go index 3d248687ba..79a7b971d2 100644 --- a/internal/services/secret/testfuncs/sweep.go +++ b/internal/services/secret/testfuncs/sweep.go @@ -3,7 +3,7 @@ package secrettestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" secretSDK "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/secret/version_data_source_test.go b/internal/services/secret/version_data_source_test.go index 9df67a8adf..9a9f3264f7 100644 --- a/internal/services/secret/version_data_source_test.go +++ b/internal/services/secret/version_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/secret" ) diff --git a/internal/services/secret/version_test.go b/internal/services/secret/version_test.go index 11187b1bd6..581d3971ba 100644 --- a/internal/services/secret/version_test.go +++ b/internal/services/secret/version_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" secretSDK "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/tem/blockedlist_test.go b/internal/services/tem/blockedlist_test.go index c0f54eda71..5770f74d9a 100644 --- a/internal/services/tem/blockedlist_test.go +++ b/internal/services/tem/blockedlist_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" temSDK "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/tem/domain_data_source_test.go b/internal/services/tem/domain_data_source_test.go index 62e9b40a3a..416f2e53e9 100644 --- a/internal/services/tem/domain_data_source_test.go +++ b/internal/services/tem/domain_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/tem/domain_test.go b/internal/services/tem/domain_test.go index 4486fe9391..b41502adb7 100644 --- a/internal/services/tem/domain_test.go +++ b/internal/services/tem/domain_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" temSDK "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/tem/domain_validation_test.go b/internal/services/tem/domain_validation_test.go index 9878c41272..f5930ff8ac 100644 --- a/internal/services/tem/domain_validation_test.go +++ b/internal/services/tem/domain_validation_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/tem/offer_subscription_data_source_test.go b/internal/services/tem/offer_subscription_data_source_test.go index 0a917cbae3..f1e0f5ddab 100644 --- a/internal/services/tem/offer_subscription_data_source_test.go +++ b/internal/services/tem/offer_subscription_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/tem/sweep_test.go b/internal/services/tem/sweep_test.go index 440f531c40..3368b978a1 100644 --- a/internal/services/tem/sweep_test.go +++ b/internal/services/tem/sweep_test.go @@ -3,7 +3,7 @@ package tem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" temtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/tem/testfuncs" ) diff --git a/internal/services/tem/testfuncs/sweep.go b/internal/services/tem/testfuncs/sweep.go index c1c7872067..f9748c8b57 100644 --- a/internal/services/tem/testfuncs/sweep.go +++ b/internal/services/tem/testfuncs/sweep.go @@ -3,7 +3,7 @@ package temtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" temSDK "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/tem/webhook_test.go b/internal/services/tem/webhook_test.go index 0b74e11fa5..832978f36e 100644 --- a/internal/services/tem/webhook_test.go +++ b/internal/services/tem/webhook_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" temSDK "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/vpc/acl_test.go b/internal/services/vpc/acl_test.go index 046afe8841..e3bbd91e3f 100644 --- a/internal/services/vpc/acl_test.go +++ b/internal/services/vpc/acl_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcSDK "github.com/scaleway/scaleway-sdk-go/api/vpc/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpc/private_network_data_source_test.go b/internal/services/vpc/private_network_data_source_test.go index c9a2c8523c..4c8e16e31e 100644 --- a/internal/services/vpc/private_network_data_source_test.go +++ b/internal/services/vpc/private_network_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/vpc/private_network_test.go b/internal/services/vpc/private_network_test.go index 82c809c2d1..a5cf219cc4 100644 --- a/internal/services/vpc/private_network_test.go +++ b/internal/services/vpc/private_network_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/vpc/route_test.go b/internal/services/vpc/route_test.go index 77801c5759..5ba54583fd 100644 --- a/internal/services/vpc/route_test.go +++ b/internal/services/vpc/route_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcSDK "github.com/scaleway/scaleway-sdk-go/api/vpc/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpc/routes_data_source_test.go b/internal/services/vpc/routes_data_source_test.go index 0acaa6eeb5..9e3aaaf639 100644 --- a/internal/services/vpc/routes_data_source_test.go +++ b/internal/services/vpc/routes_data_source_test.go @@ -3,7 +3,7 @@ package vpc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/vpc/sweep_test.go b/internal/services/vpc/sweep_test.go index f09a482d02..984f3c2220 100644 --- a/internal/services/vpc/sweep_test.go +++ b/internal/services/vpc/sweep_test.go @@ -3,7 +3,7 @@ package vpc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ipamtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs" vpctestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs" ) diff --git a/internal/services/vpc/testfuncs/checks.go b/internal/services/vpc/testfuncs/checks.go index 652040dffa..8c691a3b5c 100644 --- a/internal/services/vpc/testfuncs/checks.go +++ b/internal/services/vpc/testfuncs/checks.go @@ -3,8 +3,8 @@ package vpctestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpc2 "github.com/scaleway/scaleway-sdk-go/api/vpc/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpc/testfuncs/sweep.go b/internal/services/vpc/testfuncs/sweep.go index 3d3455c10c..5bd70d60dd 100644 --- a/internal/services/vpc/testfuncs/sweep.go +++ b/internal/services/vpc/testfuncs/sweep.go @@ -3,7 +3,7 @@ package vpctestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" vpcSDK "github.com/scaleway/scaleway-sdk-go/api/vpc/v2" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/vpc/vpc_data_source_test.go b/internal/services/vpc/vpc_data_source_test.go index fdb2b58fe9..59be4fb922 100644 --- a/internal/services/vpc/vpc_data_source_test.go +++ b/internal/services/vpc/vpc_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/vpc/vpc_test.go b/internal/services/vpc/vpc_test.go index ce1aa90d19..8baf8b26b0 100644 --- a/internal/services/vpc/vpc_test.go +++ b/internal/services/vpc/vpc_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcSDK "github.com/scaleway/scaleway-sdk-go/api/vpc/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpc/vpcs_data_source_test.go b/internal/services/vpc/vpcs_data_source_test.go index 054247719d..8bceab3286 100644 --- a/internal/services/vpc/vpcs_data_source_test.go +++ b/internal/services/vpc/vpcs_data_source_test.go @@ -3,7 +3,7 @@ package vpc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" ) diff --git a/internal/services/vpcgw/ip_data_source_test.go b/internal/services/vpcgw/ip_data_source_test.go index 677dd8310b..8000f24c24 100644 --- a/internal/services/vpcgw/ip_data_source_test.go +++ b/internal/services/vpcgw/ip_data_source_test.go @@ -3,7 +3,7 @@ package vpcgw_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs" ) diff --git a/internal/services/vpcgw/ip_reverse_test.go b/internal/services/vpcgw/ip_reverse_test.go index 43bfda6016..822a6fc967 100644 --- a/internal/services/vpcgw/ip_reverse_test.go +++ b/internal/services/vpcgw/ip_reverse_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/domain" diff --git a/internal/services/vpcgw/ip_test.go b/internal/services/vpcgw/ip_test.go index 8afc5c4c53..dc74fc27a5 100644 --- a/internal/services/vpcgw/ip_test.go +++ b/internal/services/vpcgw/ip_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw" diff --git a/internal/services/vpcgw/network_data_source_test.go b/internal/services/vpcgw/network_data_source_test.go index 3f8dcfc2cb..6595e7a85f 100644 --- a/internal/services/vpcgw/network_data_source_test.go +++ b/internal/services/vpcgw/network_data_source_test.go @@ -3,7 +3,7 @@ package vpcgw_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs" ) diff --git a/internal/services/vpcgw/network_test.go b/internal/services/vpcgw/network_test.go index a9b8cef154..887d805e2d 100644 --- a/internal/services/vpcgw/network_test.go +++ b/internal/services/vpcgw/network_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ipamchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam/testfuncs" diff --git a/internal/services/vpcgw/pat_rule_data_source_test.go b/internal/services/vpcgw/pat_rule_data_source_test.go index b782ebdf9d..0c8593fdab 100644 --- a/internal/services/vpcgw/pat_rule_data_source_test.go +++ b/internal/services/vpcgw/pat_rule_data_source_test.go @@ -3,7 +3,7 @@ package vpcgw_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/vpcgw/pat_rule_test.go b/internal/services/vpcgw/pat_rule_test.go index 8df1ceddfd..3f74826e79 100644 --- a/internal/services/vpcgw/pat_rule_test.go +++ b/internal/services/vpcgw/pat_rule_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpcgw/public_gateway_data_source_test.go b/internal/services/vpcgw/public_gateway_data_source_test.go index 92c25b20a4..0bab1503a5 100644 --- a/internal/services/vpcgw/public_gateway_data_source_test.go +++ b/internal/services/vpcgw/public_gateway_data_source_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs" ) diff --git a/internal/services/vpcgw/public_gateway_test.go b/internal/services/vpcgw/public_gateway_test.go index 69eab7b5ad..5c1616e611 100644 --- a/internal/services/vpcgw/public_gateway_test.go +++ b/internal/services/vpcgw/public_gateway_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw" diff --git a/internal/services/vpcgw/sweep_test.go b/internal/services/vpcgw/sweep_test.go index 100168f0d7..5278a18864 100644 --- a/internal/services/vpcgw/sweep_test.go +++ b/internal/services/vpcgw/sweep_test.go @@ -3,7 +3,7 @@ package vpcgw_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" vpcgwtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs" ) diff --git a/internal/services/vpcgw/testfuncs/checks.go b/internal/services/vpcgw/testfuncs/checks.go index dfb8154b91..9a9deb35d5 100644 --- a/internal/services/vpcgw/testfuncs/checks.go +++ b/internal/services/vpcgw/testfuncs/checks.go @@ -3,8 +3,8 @@ package vpcgwtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1" v2 "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/vpcgw/testfuncs/sweep.go b/internal/services/vpcgw/testfuncs/sweep.go index a209b6de2e..413432c3e7 100644 --- a/internal/services/vpcgw/testfuncs/sweep.go +++ b/internal/services/vpcgw/testfuncs/sweep.go @@ -3,7 +3,7 @@ package vpcgwtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" vpcgwSDK "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1" v2 "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/services/webhosting/offer_data_source_test.go b/internal/services/webhosting/offer_data_source_test.go index 838a64234f..ae6d128da2 100644 --- a/internal/services/webhosting/offer_data_source_test.go +++ b/internal/services/webhosting/offer_data_source_test.go @@ -3,7 +3,7 @@ package webhosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/webhosting/sweep_test.go b/internal/services/webhosting/sweep_test.go index 371fb76c95..3501c89586 100644 --- a/internal/services/webhosting/sweep_test.go +++ b/internal/services/webhosting/sweep_test.go @@ -3,7 +3,7 @@ package webhosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" webhostingtestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/webhosting/testfuncs" ) diff --git a/internal/services/webhosting/testfuncs/sweep.go b/internal/services/webhosting/testfuncs/sweep.go index 4a3225ff4b..f07e7e5459 100644 --- a/internal/services/webhosting/testfuncs/sweep.go +++ b/internal/services/webhosting/testfuncs/sweep.go @@ -3,7 +3,7 @@ package webhostingtestfuncs import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" webhostingSDK "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/webhosting/webhosting_data_source_test.go b/internal/services/webhosting/webhosting_data_source_test.go index e009d1c0c0..1932a21e8a 100644 --- a/internal/services/webhosting/webhosting_data_source_test.go +++ b/internal/services/webhosting/webhosting_data_source_test.go @@ -3,7 +3,7 @@ package webhosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" ) diff --git a/internal/services/webhosting/webhosting_test.go b/internal/services/webhosting/webhosting_test.go index 3a623afb85..114f326e92 100644 --- a/internal/services/webhosting/webhosting_test.go +++ b/internal/services/webhosting/webhosting_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" webhostingSDK "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"