From d2fb7636f04c6fb6e85320d6734dece78602d942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 30 Jan 2025 18:17:46 +0100 Subject: [PATCH] chore: migrate to github.com/hashicorp/terraform-plugin-testing --- 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 +- internal/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/az/availability_zones_data_source_test.go | 2 +- internal/services/baremetal/offer_data_source_test.go | 4 ++-- internal/services/baremetal/option_data_source_test.go | 4 ++-- internal/services/baremetal/os_data_source_test.go | 4 ++-- internal/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 +- internal/services/billing/consumption_data_source_test.go | 4 ++-- internal/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/sweep.go | 2 +- internal/services/block/volume_data_source_test.go | 2 +- internal/services/block/volume_test.go | 4 ++-- internal/services/cockpit/alert_manager_test.go | 4 ++-- internal/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/plan_data_source_test.go | 2 +- 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 ++-- internal/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 ++-- internal/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/checks.go | 4 ++-- 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/sweep_test.go | 2 +- internal/services/domain/zone_data_source_test.go | 2 +- internal/services/domain/zone_test.go | 4 ++-- .../services/flexibleip/data_source_flexible_ip_test.go | 2 +- .../services/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 +- internal/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 ++-- internal/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 ++-- internal/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 ++-- internal/services/inference/sweep_test.go | 2 +- internal/services/inference/testfuncs/checks.go | 4 ++-- internal/services/inference/testfuncs/sweep.go | 2 +- .../instance/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 ++-- .../services/instance/placement_group_data_source_test.go | 2 +- internal/services/instance/placement_group_test.go | 4 ++-- internal/services/instance/private_nic_test.go | 4 ++-- .../services/instance/security_group_data_source_test.go | 2 +- internal/services/instance/security_group_rules_test.go | 2 +- internal/services/instance/security_group_test.go | 4 ++-- internal/services/instance/server_data_source_test.go | 2 +- internal/services/instance/server_test.go | 4 ++-- internal/services/instance/servers_data_source_test.go | 2 +- internal/services/instance/snapshot_data_source_test.go | 2 +- internal/services/instance/snapshot_test.go | 4 ++-- 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 +- internal/services/instance/volume_data_source_test.go | 2 +- internal/services/instance/volume_test.go | 4 ++-- 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/definition_test.go | 4 ++-- internal/services/jobs/sweep_test.go | 2 +- internal/services/jobs/testfuncs/sweep.go | 2 +- internal/services/k8s/cluster_data_source_test.go | 2 +- internal/services/k8s/cluster_test.go | 4 ++-- internal/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/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 ++-- internal/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 +- internal/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 +- internal/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 +++--- internal/services/object/bucket_lock_configuration_test.go | 6 +++--- internal/services/object/bucket_policy_test.go | 6 +++--- internal/services/object/bucket_test.go | 6 +++--- .../services/object/bucket_website_configuration_test.go | 4 ++-- .../object/data_source_object_bucket_policy_test.go | 6 +++--- internal/services/object/data_source_object_bucket_test.go | 6 +++--- internal/services/object/errors.go | 2 +- internal/services/object/object_test.go | 6 +++--- 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 +- .../services/rdb/data_source_rdb_database_backup_test.go | 2 +- internal/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/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 ++-- internal/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 +- internal/services/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/domain_data_source_test.go | 2 +- internal/services/tem/domain_test.go | 4 ++-- internal/services/tem/domain_validation_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/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/dhcp_data_source_test.go | 2 +- .../services/vpcgw/dhcp_reservation_data_source_test.go | 2 +- internal/services/vpcgw/dhcp_reservation_test.go | 4 ++-- internal/services/vpcgw/dhcp_test.go | 4 ++-- 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 ++-- internal/services/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 +- internal/services/webhosting/offer_data_source_test.go | 2 +- internal/services/webhosting/sweep_test.go | 2 +- internal/services/webhosting/testfuncs/sweep.go | 2 +- internal/services/webhosting/webhosting_data_source_test.go | 2 +- internal/services/webhosting/webhosting_test.go | 4 ++-- 272 files changed, 408 insertions(+), 405 deletions(-) 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 ac413ddba0..77918f6fed 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.17.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 + github.com/hashicorp/terraform-plugin-testing v1.11.0 github.com/nats-io/jwt/v2 v2.7.3 github.com/nats-io/nats.go v1.37.0 github.com/robfig/cron/v3 v3.0.1 @@ -83,7 +84,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/hashicorp/hc-install v0.9.0 // indirect - github.com/hashicorp/hcl/v2 v2.22.0 // indirect + github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/hashicorp/logutils v1.0.0 // indirect github.com/hashicorp/terraform-exec v0.21.0 // indirect github.com/hashicorp/terraform-json v0.23.0 // indirect diff --git a/go.sum b/go.sum index 371ba0435f..d0a7733948 100644 --- a/go.sum +++ b/go.sum @@ -176,8 +176,8 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hc-install v0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE= github.com/hashicorp/hc-install v0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg= -github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M= -github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= +github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos= +github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= @@ -192,6 +192,8 @@ github.com/hashicorp/terraform-plugin-mux v0.17.0 h1:/J3vv3Ps2ISkbLPiZOLspFcIZ0v github.com/hashicorp/terraform-plugin-mux v0.17.0/go.mod h1:yWuM9U1Jg8DryNfvCp+lH70WcYv6D8aooQxxxIzFDsE= github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 h1:wyKCCtn6pBBL46c1uIIBNUOWlNfYXfXpVo16iDyLp8Y= github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0/go.mod h1:B0Al8NyYVr8Mp/KLwssKXG1RqnTk7FySqSn4fRuLNgw= +github.com/hashicorp/terraform-plugin-testing v1.11.0 h1:MeDT5W3YHbONJt2aPQyaBsgQeAIckwPX41EUHXEn29A= +github.com/hashicorp/terraform-plugin-testing v1.11.0/go.mod h1:WNAHQ3DcgV/0J+B15WTE6hDvxcUdkPPpnB1FR3M910U= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= diff --git a/internal/acctest/checks.go b/internal/acctest/checks.go index e3142780ef..75c2a09be2 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 e4c9ea9343..0840177afe 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 29f93e37a6..73d29f9a33 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_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/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 831c43896a..474cfc65be 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 0960176e4d..f7915f93d7 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 70fe571299..5244864f9c 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 71c099dc50..48d417ec9b 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/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 9a4a4fd76d..8efe8b600a 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 163e0bda07..a96fa62f66 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 9b8daaa824..240bedc7bf 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/server_data_source_test.go b/internal/services/baremetal/server_data_source_test.go index 0bddb0f9d8..090ca425b3 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/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 62b9446439..c55582b6b7 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/terraform-provider-scaleway/v2/internal/acctest" 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 ad1677e94a..7e561a28e0 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 ed17b57b55..f42609295c 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 f66145d63c..c99e9567b9 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" ) diff --git a/internal/services/block/snapshot_test.go b/internal/services/block/snapshot_test.go index f516fe2a2d..da8c9ad2e1 100644 --- a/internal/services/block/snapshot_test.go +++ b/internal/services/block/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" 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/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/sweep.go b/internal/services/block/testfuncs/sweep.go index a12a27b631..a6de3a346e 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 a89b2e012d..ddd62160b0 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" ) diff --git a/internal/services/block/volume_test.go b/internal/services/block/volume_test.go index 060b1c1076..f68fb0c819 100644 --- a/internal/services/block/volume_test.go +++ b/internal/services/block/volume_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" 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/cockpit/alert_manager_test.go b/internal/services/cockpit/alert_manager_test.go index 66f99edea4..f3fa507f15 100644 --- a/internal/services/cockpit/alert_manager_test.go +++ b/internal/services/cockpit/alert_manager_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/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 361cf31eb7..d803f6e2f2 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 1468024157..078e922541 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 b32915720c..b86f54c048 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/plan_data_source_test.go b/internal/services/cockpit/plan_data_source_test.go index 52efe77761..a655603cdd 100644 --- a/internal/services/cockpit/plan_data_source_test.go +++ b/internal/services/cockpit/plan_data_source_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" ) diff --git a/internal/services/cockpit/source_data_source_test.go b/internal/services/cockpit/source_data_source_test.go index 45ba20ed53..0e68a1e4cd 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 b2775a895f..6df6dcd5b4 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 c7b8b654bf..65c1ba8ec7 100644 --- a/internal/services/container/container_test.go +++ b/internal/services/container/container_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/cron_test.go b/internal/services/container/cron_test.go index 72e4475264..fcc64a2887 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 186b73fc69..c83e88d888 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 75ec95a497..d5cde2755f 100644 --- a/internal/services/container/namespace_test.go +++ b/internal/services/container/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" 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/checks.go b/internal/services/container/testfuncs/checks.go index 47ff3d1e54..760ae1a68c 100644 --- a/internal/services/container/testfuncs/checks.go +++ b/internal/services/container/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" 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/services/container" diff --git a/internal/services/container/testfuncs/sweep.go b/internal/services/container/testfuncs/sweep.go index 2a241ed068..400fb673b5 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 31bc178a76..383ba37cb4 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 a0d0cc852f..38b0479082 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/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 588a0d924c..70ebf7ce44 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 de19df7f34..c451b19bd2 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/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 fd2b883eb7..cd88c59fb4 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 41d7da1e36..340e249612 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 7921836dc1..316fd19f87 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 543c06a0b7..bf59939b17 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 8e5a338fae..32e9f9d204 100644 --- a/internal/services/function/function_test.go +++ b/internal/services/function/function_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/namespace_test.go b/internal/services/function/namespace_test.go index 09f02cb71c..af41b8ebf8 100644 --- a/internal/services/function/namespace_test.go +++ b/internal/services/function/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" 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 a9c4c8f41d..401a6a110d 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 7d6f3b57e9..2cfd943af8 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 751a2622d2..124dbf3e53 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 a928f9220b..b580acb792 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 7b1ae8dbb6..43f1fe2573 100644 --- a/internal/services/iam/policy_test.go +++ b/internal/services/iam/policy_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/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 606edf5b5e..ed0de6ffcd 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 95b1bae8e9..4322629521 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 3226591fea..5c33610011 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 65607cca41..fae18d87bf 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 222deb2e01..04c4856492 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 b375c9caa5..10d551a115 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 27cad17962..cc60c71814 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 5d9a40b180..2333caadd1 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/v1beta1" "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 344c5384ec..642a81d446 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/v1beta1" "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 9a0db8c004..c7a5526793 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" inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1" "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 f4d4ca5019..829ffbd384 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 df262a157a..48e53b2578 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 0679b67110..60af9d1b2a 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 ad6083cb43..dde2dd3c58 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 5a0044e2d4..dc616beb02 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 8d391365d3..f64c814ad5 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 9de3550d90..478245575e 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 655165904b..305cb8a6b6 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 9d5da35efa..5ad00055aa 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 65c96394b2..d9785ba80a 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 f4ccdf558e..9800707302 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 ccf058bc35..f60ee15a22 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" ) diff --git a/internal/services/instance/snapshot_test.go b/internal/services/instance/snapshot_test.go index 8b96f5cc30..61d43fa56b 100644 --- a/internal/services/instance/snapshot_test.go +++ b/internal/services/instance/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" 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 b672f0e43c..6cb95f62b8 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 edd621b1b2..18e2bb5bc2 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 9d5c13d5bc..44283af952 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" ) diff --git a/internal/services/instance/volume_test.go b/internal/services/instance/volume_test.go index cb95f89f45..a26e9f8de2 100644 --- a/internal/services/instance/volume_test.go +++ b/internal/services/instance/volume_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" 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/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 96c67d9619..32a20c17fa 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 a3d10cfd92..29ba18d758 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 3f314cbef0..be4b5b76f7 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 c9abce7fd0..8211ca3cb2 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 aa9b3fb3fb..da9a9cdbc6 100644 --- a/internal/services/ipam/ip_data_source_test.go +++ b/internal/services/ipam/ip_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" 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 501b54666f..2ffd419796 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 77a7474766..7abf1583a3 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/definition_test.go b/internal/services/jobs/definition_test.go index 799808a286..5eb4382adc 100644 --- a/internal/services/jobs/definition_test.go +++ b/internal/services/jobs/definition_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" jobsSDK "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" 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 78c3d5b678..64e0e674ee 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/cluster_data_source_test.go b/internal/services/k8s/cluster_data_source_test.go index c8425e373e..844cb94e16 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 d5af27058b..ff6a70325c 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 89aa695c22..868b8d2792 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 a754a662e3..4631104182 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 1e93c5939e..8babbe1f27 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 4438996aa7..048fd12aa6 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/lb/acl_test.go b/internal/services/lb/acl_test.go index badfae18a3..960ed42c47 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 726a70bef7..5a260efea4 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 c72e02d059..c7f1e41cca 100644 --- a/internal/services/lb/lb_test.go +++ b/internal/services/lb/lb_test.go @@ -8,8 +8,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 c28a4e5d75..c98919f707 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 9e2303a073..4a45eb2783 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 592fc3ce63..8219f4fc18 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 2dd06139e8..3a9509e38b 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 f1676b6f86..91905623f4 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 ae5ec2ddb5..9569620775 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 5f3e144323..106da4ac7e 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 192b7523a7..260d93f36e 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 7d7fa089f4..fb1a5f0dec 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 864fbeb62a..3a9b107bb3 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 7f964233de..a3afa2f0c3 100644 --- a/internal/services/mongodb/instance_test.go +++ b/internal/services/mongodb/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" mongodbSDK "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1alpha1" "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 2520adf2b7..f7f00818ac 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/v1alpha1" "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 8d99e2df0a..d4f0694f4c 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/v1alpha1" "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 0e9b7d048f..e607a4d1cd 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 9169ba3e54..346f62ed63 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 8125995861..8b99adee6c 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 8833ff6565..b2fc4398cd 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 f0a129f364..0bfbbbbea0 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 5b261a2903..b241a93c8e 100644 --- a/internal/services/object/data_source_object_bucket_test.go +++ b/internal/services/object/data_source_object_bucket_test.go @@ -6,9 +6,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 be80d53057..04a1f3fecf 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 bed4be6374..1568758afb 100644 --- a/internal/services/object/object_test.go +++ b/internal/services/object/object_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/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/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 fb13950010..2e5db25e7b 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 d8cdbd581b..9651146bc5 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 b821c2b153..a22b4fedee 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 22c6a42554..0b28192fc3 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/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 af6000650b..0804b515ee 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 b567c4ce74..ef08da182b 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 6b02b104e1..1590d06d54 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 6ee1ba4902..150b2f4dd8 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 d8d2ea8d81..bc8ba36137 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 f782c81fe2..be80793853 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 c6aef1c2df..4ba951bfef 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 e4f7bf0013..7b570e421d 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 1056fba019..151fdf7361 100644 --- a/internal/services/scwconfig/scw_config_data_source_test.go +++ b/internal/services/scwconfig/scw_config_data_source_test.go @@ -5,8 +5,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 bd36e19447..1f112cd0de 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 123f8ef3ad..97f673ca95 100644 --- a/internal/services/secret/secret_data_source_test.go +++ b/internal/services/secret/secret_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" "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 87c4715c6c..2686c364eb 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/domain_data_source_test.go b/internal/services/tem/domain_data_source_test.go index ff7b030b66..7326852d66 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 8a53142985..b8af18802b 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 ec4a64228b..90287976e5 100644 --- a/internal/services/tem/domain_validation_test.go +++ b/internal/services/tem/domain_validation_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 40fe0670e0..1a1c8e4578 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 cb2b7584e2..6e62cc7f60 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/private_network_data_source_test.go b/internal/services/vpc/private_network_data_source_test.go index c09e9ec67a..97e22a45fb 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 01dbc7a8dc..1b937e5334 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 1268472f73..4625765c69 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 36a4fbcca6..12da0146f7 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 f8f73346e7..1449b1c87a 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 d78389b65a..cffca2b87a 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/dhcp_data_source_test.go b/internal/services/vpcgw/dhcp_data_source_test.go index 1129e31c85..7d0405de61 100644 --- a/internal/services/vpcgw/dhcp_data_source_test.go +++ b/internal/services/vpcgw/dhcp_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/dhcp_reservation_data_source_test.go b/internal/services/vpcgw/dhcp_reservation_data_source_test.go index bb16dea16c..de9acb4c10 100644 --- a/internal/services/vpcgw/dhcp_reservation_data_source_test.go +++ b/internal/services/vpcgw/dhcp_reservation_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/dhcp_reservation_test.go b/internal/services/vpcgw/dhcp_reservation_test.go index a2473552c4..2023b88b12 100644 --- a/internal/services/vpcgw/dhcp_reservation_test.go +++ b/internal/services/vpcgw/dhcp_reservation_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/v1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpcgw/dhcp_test.go b/internal/services/vpcgw/dhcp_test.go index 571a32daff..bab0c036e2 100644 --- a/internal/services/vpcgw/dhcp_test.go +++ b/internal/services/vpcgw/dhcp_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/v1" "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/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 1536205097..989bdb40a7 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/v1" "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 9fe89d0f12..86f7aa19cd 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/v1" "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 8902c3293d..bff64b15c5 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 6dd027734d..6925934ba8 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/v1" "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 677e39f396..33775a4717 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 df011eaec8..118a5e2c74 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/v1" "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 60cd886358..0244d68faf 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 25d286df0d..46deb71875 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/v1" "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 9f308924ff..5f891bf87a 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" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" diff --git a/internal/services/vpcgw/testfuncs/sweep.go b/internal/services/vpcgw/testfuncs/sweep.go index 48f9807b71..68e688de15 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" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" diff --git a/internal/services/webhosting/offer_data_source_test.go b/internal/services/webhosting/offer_data_source_test.go index f12beaebd0..a50b694e4a 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 e75f34f422..1472797d16 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/v1alpha1" "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 fe532c1f01..5ad3892a62 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 3e0d73e492..97af1b3cd4 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/v1alpha1" "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"