diff --git a/internal/services/account/project_data_source_test.go b/internal/services/account/project_data_source_test.go index 474cfc65be..831c43896a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 76d8ef382d..fa5c094229 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 04695f4e2c..bbe16f5675 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f7915f93d7..0960176e4d 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/baremetal/offer_data_source_test.go b/internal/services/baremetal/offer_data_source_test.go index 8efe8b600a..9a4a4fd76d 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a96fa62f66..163e0bda07 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 240bedc7bf..9b8daaa824 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 090ca425b3..0bddb0f9d8 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 c55582b6b7..62b9446439 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 7f47545abe..345352887d 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 7e561a28e0..ad1677e94a 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f42609295c..ed17b57b55 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/cockpit/alert_manager_test.go b/internal/services/cockpit/alert_manager_test.go index f3fa507f15..66f99edea4 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 d803f6e2f2..361cf31eb7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 078e922541..1468024157 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b86f54c048..b32915720c 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a655603cdd..52efe77761 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 0e68a1e4cd..45ba20ed53 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 52aa6de266..295e35a107 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8176211cef..ec29bfd3c4 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5231ef2dd0..09534ac037 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 910e0ba85f..96e4613a35 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/domain/record_data_source_test.go b/internal/services/domain/record_data_source_test.go index 78270ecd2a..72cd7afaf6 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 38b0479082..a0d0cc852f 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 94dbfaa99f..c1f3f05075 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 70ebf7ce44..588a0d924c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 c451b19bd2..de19df7f34 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b27f0ab55d..5c55137953 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b56918af7c..257a49cc0a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4cfb6f993e..fd2b883eb7 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -334,7 +334,7 @@ func testAccCheckFlexibleIPDestroy(tt *acctest.TestTools) resource.TestCheckFunc return err } - _, err = fipAPI.WaitForFlexibleIP(&flexibleipSDK.WaitForFlexibleIPRequest{ + _, err = fipAPI.GetFlexibleIP(&flexibleipSDK.GetFlexibleIPRequest{ FipID: id, Zone: zone, }) diff --git a/internal/services/flexibleip/mac_address_test.go b/internal/services/flexibleip/mac_address_test.go index 340e249612..41d7da1e36 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 9d2b9868cf..6be5b8af09 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 316fd19f87..7921836dc1 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/iam/api_key_data_source_test.go b/internal/services/iam/api_key_data_source_test.go index 7cc174684e..756f13c64b 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 fe1f6b9206..47c8947265 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f8e1b0e1a2..f80870ecf8 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 82d66103c0..4fed85d610 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 734c4713db..906df2ee5c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b580acb792..a928f9220b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 377f704088..cc4689261e 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 43f1fe2573..7b1ae8dbb6 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ed0de6ffcd..606edf5b5e 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4322629521..95b1bae8e9 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5c33610011..3226591fea 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 fae18d87bf..65607cca41 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a9ecfa14cc..addcdb1a22 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 da8f47a0b8..536b3bb878 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 04c4856492..222deb2e01 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 10d551a115..b375c9caa5 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 cc60c71814..27cad17962 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/instance/data_source_instance_private_nic_test.go b/internal/services/instance/data_source_instance_private_nic_test.go index bd44d375b4..f67b8b422d 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 86d90ea4d8..e3505b5940 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 829ffbd384..f4d4ca5019 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a8c16aa8ad..b0d9bc16cf 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 48e53b2578..df262a157a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 60af9d1b2a..0679b67110 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 582abbfac8..88176cd2e1 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 dde2dd3c58..ad6083cb43 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 dc616beb02..5a0044e2d4 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f64c814ad5..8d391365d3 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 478245575e..9de3550d90 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 305cb8a6b6..655165904b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5ad00055aa..9d5da35efa 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 13870e59b6..75beae7eb4 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 9800707302..f4ccdf558e 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f60ee15a22..ccf058bc35 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 61d43fa56b..8b96f5cc30 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 18d3a0da26..1204079098 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 6cb95f62b8..b672f0e43c 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 18e2bb5bc2..edd621b1b2 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 d51d84a88d..8448ffd438 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 44283af952..9d5c13d5bc 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a26e9f8de2..cb95f89f45 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b7f97b864b..662f8446fc 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 dcd541677b..8349facc68 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 32a20c17fa..96c67d9619 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 9dd41ebc9c..a3d10cfd92 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -119,7 +119,7 @@ func isHubDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { return err } - _, err = iotAPI.WaitForHub(&iotSDK.WaitForHubRequest{ + _, err = iotAPI.GetHub(&iotSDK.GetHubRequest{ Region: region, HubID: hubID, }) diff --git a/internal/services/iot/network_test.go b/internal/services/iot/network_test.go index ae71dff20c..9533cdd152 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 be4b5b76f7..3f314cbef0 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-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + 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" 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 97c3f54cbc..90b35baa65 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8211ca3cb2..c9abce7fd0 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 da9a9cdbc6..aa9b3fb3fb 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 2ffd419796..501b54666f 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 29147b1324..1b18d9872a 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 bc11aacf4a..c7aa049121 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 499669fede..588808e650 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b5af5da644..53cd7c95c5 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 7abf1583a3..77a7474766 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/k8s/cluster_data_source_test.go b/internal/services/k8s/cluster_data_source_test.go index 844cb94e16..c8425e373e 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ff6a70325c..d5af27058b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 868b8d2792..89aa695c22 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4631104182..a754a662e3 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8babbe1f27..1e93c5939e 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 487b1c05c1..1e888af927 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 048fd12aa6..4438996aa7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 960ed42c47..badfae18a3 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ce88d3c273..69d79d4364 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 cf2858c791..47000f0dbc 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 48a6e5bcb4..8061adfc4b 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-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + 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" 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 fea0bd01a8..1128ed4193 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 bcba101099..3633c929cb 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 d15e8cdf93..c77d6a6b23 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 25e1ef345d..785c45160a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 86e6e80433..330e63f805 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 35352fc203..25df49a6f7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5a260efea4..726a70bef7 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f3b5f5ad5d..5faa5c7b84 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4ee90575d6..7037a7b391 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 69166b392b..25333ac565 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 c7f1e41cca..c72e02d059 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 d33d2cfca0..bcaa0a94b9 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 23a6b180cc..64e338e8b0 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 c98919f707..c28a4e5d75 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f1dce735c8..61edc5433c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ac0be2f51e..e86afd1ca4 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 290a4f7b86..02f29225b7 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4a45eb2783..9e2303a073 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/rdb/acl_data_source_test.go b/internal/services/rdb/acl_data_source_test.go index 9f80c91859..cb3a1cad4e 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 937d7e72ab..deee7c2a2f 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 96e0798ea1..5a307c7ada 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8bd4b9ff0f..61bfeeea08 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a22b4fedee..b821c2b153 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f0dfd4fbc2..6a0977dc36 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 baa71e9aec..91896e151b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 0b28192fc3..22c6a42554 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f32fe683d9..cd542ed04e 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 70ac9bd0a3..6c36ef5f38 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b44afd83a8..a4b3223116 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ef7eead611..3db386ae8a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 b474bcb805..af6000650b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -23,7 +23,7 @@ func IsInstanceDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { return err } - _, err = rdbAPI.WaitForInstance(&rdbSDK.WaitForInstanceRequest{ + _, err = rdbAPI.GetInstance(&rdbSDK.GetInstanceRequest{ InstanceID: ID, Region: region, }) diff --git a/internal/services/rdb/testfuncs/sweep.go b/internal/services/rdb/testfuncs/sweep.go index ef08da182b..b567c4ce74 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 df1f138bd0..a2c4c56b32 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ee29e5ad65..85e8a300c1 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 df1835ef1f..eb25338fea 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -749,7 +749,7 @@ func isClusterDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { return err } - _, err = redisAPI.WaitForCluster(&redisSDK.WaitForClusterRequest{ + _, err = redisAPI.GetCluster(&redisSDK.GetClusterRequest{ ClusterID: ID, Zone: zone, }) diff --git a/internal/services/redis/sweep_test.go b/internal/services/redis/sweep_test.go index 55022f39e9..6fc0e67c3c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 150b2f4dd8..6ee1ba4902 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 bc8ba36137..d8d2ea8d81 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 f082cc29da..0382a09a9f 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 edc8ada39e..655828f756 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 e498b60975..8a59515967 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 be80793853..f782c81fe2 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4ba951bfef..c6aef1c2df 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 7b570e421d..e4f7bf0013 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/secret/secret_data_source_test.go b/internal/services/secret/secret_data_source_test.go index 97f673ca95..123f8ef3ad 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 87abe676ec..417dc8f82b 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 ae6f42230b..87d39baae7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 2686c364eb..87c4715c6c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 9a9f3264f7..9df67a8adf 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 581d3971ba..11187b1bd6 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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/vpc/private_network_data_source_test.go b/internal/services/vpc/private_network_data_source_test.go index 97e22a45fb..c09e9ec67a 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 1b937e5334..01dbc7a8dc 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5ba54583fd..77801c5759 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 9e3aaaf639..0acaa6eeb5 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 984f3c2220..f09a482d02 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 4625765c69..1268472f73 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 12da0146f7..36a4fbcca6 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 1449b1c87a..f8f73346e7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 cffca2b87a..d78389b65a 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8bceab3286..054247719d 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 7d0405de61..1129e31c85 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 de9acb4c10..bb16dea16c 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 2023b88b12..a2473552c4 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 bab0c036e2..571a32daff 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 8000f24c24..677dd8310b 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 989bdb40a7..1536205097 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 86f7aa19cd..9fe89d0f12 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 bff64b15c5..8902c3293d 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 6925934ba8..6dd027734d 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 33775a4717..677e39f396 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 118a5e2c74..df011eaec8 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 0244d68faf..60cd886358 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 46deb71875..25d286df0d 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5278a18864..100168f0d7 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a0126608d1..9f308924ff 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -23,7 +23,7 @@ func IsGatewayNetworkDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { return err } - _, err = vpcgwNetworkAPI.WaitForGatewayNetwork(&vpcgwSDK.WaitForGatewayNetworkRequest{ + _, err = vpcgwNetworkAPI.GetGatewayNetwork(&vpcgwSDK.GetGatewayNetworkRequest{ GatewayNetworkID: ID, Zone: zone, }) @@ -57,7 +57,7 @@ func IsGatewayDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { return err } - _, err = vpcgwAPI.WaitForGateway(&vpcgwSDK.WaitForGatewayRequest{ + _, err = vpcgwAPI.GetGateway(&vpcgwSDK.GetGatewayRequest{ GatewayID: ID, Zone: zone, }) diff --git a/internal/services/vpcgw/testfuncs/sweep.go b/internal/services/vpcgw/testfuncs/sweep.go index 68e688de15..48f9807b71 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 a50b694e4a..f12beaebd0 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 3501c89586..371fb76c95 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 1472797d16..e75f34f422 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 5ad3892a62..fe532c1f01 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-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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 3d79b90c52..3e0d73e492 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-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/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" @@ -88,7 +88,7 @@ func testAccCheckWebhostingDestroy(tt *acctest.TestTools) resource.TestCheckFunc return err } - res, err := api.WaitForHosting(&webhostingSDK.WaitForHostingRequest{ + res, err := api.GetHosting(&webhostingSDK.GetHostingRequest{ HostingID: id, Region: region, })