From a6c075ee52ff42192f633629df703e3b2847d37c Mon Sep 17 00:00:00 2001 From: Zhiwei Liang <121905282+zliang-akamai@users.noreply.github.com> Date: Tue, 28 Nov 2023 04:31:30 -0500 Subject: [PATCH 01/12] Add v2 suffix to the module name (#1156) * Bump module to v2 * Add v2 to import path of everything * Append v2 suffix to build flags --- .gitignore | 4 +- .goreleaser.yml | 2 +- Makefile | 4 +- go.mod | 2 +- linode/acceptance/database.go | 2 +- linode/acceptance/instance.go | 2 +- linode/acceptance/tmpl/template.go | 2 +- linode/acceptance/util.go | 6 +- linode/account/datasource_test.go | 4 +- linode/account/framework_datasource.go | 2 +- linode/account/tmpl/template.go | 2 +- linode/accountlogin/datasource_test.go | 4 +- linode/accountlogin/framework_datasource.go | 2 +- linode/accountlogin/tmpl/template.go | 2 +- linode/accountlogins/datasource_test.go | 4 +- linode/accountlogins/framework_datasource.go | 2 +- .../framework_datasource_schema.go | 4 +- linode/accountlogins/framework_models.go | 2 +- linode/accountlogins/tmpl/template.go | 2 +- linode/accountsettings/datasource_test.go | 4 +- .../accountsettings/framework_datasource.go | 2 +- linode/accountsettings/framework_model.go | 2 +- linode/accountsettings/framework_resource.go | 2 +- linode/accountsettings/resource_test.go | 4 +- linode/accountsettings/tmpl/template.go | 2 +- linode/backup/datasource_test.go | 4 +- linode/backup/framework_datasource.go | 2 +- linode/databaseaccesscontrols/resource.go | 2 +- .../databaseaccesscontrols/resource_test.go | 6 +- .../databaseaccesscontrols/schema_resource.go | 2 +- .../databaseaccesscontrols/tmpl/template.go | 2 +- linode/databasebackups/datasource_test.go | 6 +- .../databasebackups/framework_datasource.go | 2 +- .../framework_datasource_schema.go | 4 +- linode/databasebackups/framework_models.go | 2 +- linode/databasebackups/tmpl/template.go | 2 +- linode/databaseengines/datasource_test.go | 4 +- .../databaseengines/framework_datasource.go | 2 +- .../framework_datasource_schema.go | 2 +- linode/databaseengines/framework_models.go | 2 +- linode/databaseengines/tmpl/template.go | 2 +- linode/databasemysql/datasource_test.go | 4 +- linode/databasemysql/framework_datasource.go | 2 +- .../framework_datasource_schema.go | 2 +- linode/databasemysql/framework_models.go | 2 +- linode/databasemysql/resource.go | 2 +- linode/databasemysql/resource_test.go | 6 +- linode/databasemysql/schema_resource.go | 2 +- linode/databasemysql/tmpl/template.go | 2 +- .../databasemysqlbackups/datasource_test.go | 6 +- .../databasemysqlbackups/schema_datasource.go | 2 +- linode/databasemysqlbackups/tmpl/template.go | 2 +- linode/databasepostgresql/datasource_test.go | 4 +- .../framework_datasource.go | 2 +- .../framework_datasource_schema.go | 2 +- linode/databasepostgresql/framework_models.go | 2 +- linode/databasepostgresql/resource.go | 2 +- linode/databasepostgresql/resource_test.go | 6 +- linode/databasepostgresql/schema_resource.go | 2 +- linode/databasepostgresql/tmpl/template.go | 2 +- linode/databases/datasource_test.go | 6 +- linode/databases/framework_datasource.go | 2 +- .../databases/framework_datasource_schema.go | 2 +- linode/databases/framework_models.go | 4 +- linode/databases/tmpl/template.go | 4 +- linode/domain/datasource_test.go | 4 +- linode/domain/framework_datasource.go | 2 +- linode/domain/framework_models.go | 2 +- linode/domain/resource.go | 2 +- linode/domain/resource_test.go | 6 +- linode/domain/schema_resource.go | 2 +- linode/domain/tmpl/template.go | 2 +- linode/domainrecord/datasource_test.go | 4 +- linode/domainrecord/framework_datasource.go | 2 +- linode/domainrecord/resource.go | 2 +- linode/domainrecord/resource_test.go | 6 +- linode/domainrecord/schema_resource.go | 2 +- linode/domainrecord/tmpl/template.go | 4 +- linode/domainzonefile/datasource_test.go | 4 +- linode/domainzonefile/framework_datasource.go | 2 +- linode/domainzonefile/tmpl/template.go | 4 +- linode/firewall/datasource_test.go | 4 +- linode/firewall/framework_datasource.go | 2 +- linode/firewall/framework_models.go | 2 +- linode/firewall/helpers.go | 2 +- linode/firewall/resource.go | 2 +- linode/firewall/resource_test.go | 8 +- linode/firewall/schema_resource.go | 2 +- linode/firewall/tmpl/template.go | 2 +- linode/firewalldevice/resource.go | 2 +- linode/firewalldevice/resource_test.go | 6 +- linode/firewalldevice/tmpl/template.go | 2 +- linode/firewalls/datasource_test.go | 4 +- linode/firewalls/framework_datasource.go | 2 +- linode/firewalls/framework_models.go | 6 +- linode/firewalls/framework_schema.go | 4 +- linode/firewalls/tmpl/template.go | 2 +- linode/framework_provider.go | 102 +++++++++--------- linode/framework_provider_config.go | 2 +- linode/framework_provider_test.go | 4 +- linode/helper/config.go | 2 +- linode/helper/customtypes/scopes.go | 2 +- linode/helper/earlyaccess_test.go | 2 +- linode/helper/filter.go | 2 +- linode/helper/filter_test.go | 2 +- linode/helper/frameworkfilter/latest_test.go | 2 +- linode/helper/frameworkfilter/local_filter.go | 2 +- .../frameworkfilter/local_filter_test.go | 2 +- linode/helper/normalize_test.go | 2 +- linode/helper/sdkv2_validators_test.go | 2 +- linode/image/datasource_test.go | 4 +- linode/image/framework_datasource.go | 2 +- linode/image/framework_models.go | 2 +- linode/image/resource.go | 2 +- linode/image/resource_test.go | 6 +- linode/image/tmpl/template.go | 2 +- linode/images/datasource_test.go | 4 +- linode/images/framework_datasource.go | 2 +- linode/images/framework_models.go | 4 +- linode/images/framework_schema_datasource.go | 4 +- linode/images/tmpl/template.go | 2 +- linode/instance/datasource.go | 2 +- linode/instance/datasource_test.go | 4 +- linode/instance/flatten.go | 2 +- linode/instance/helpers.go | 2 +- linode/instance/resource.go | 2 +- linode/instance/resource_test.go | 6 +- linode/instance/schema_resource.go | 2 +- linode/instance/tmpl/template.go | 2 +- linode/instanceconfig/helper.go | 2 +- linode/instanceconfig/resource.go | 2 +- linode/instanceconfig/resource_test.go | 6 +- linode/instanceconfig/schema_resource.go | 2 +- linode/instanceconfig/tmpl/template.go | 2 +- linode/instancedisk/helper.go | 2 +- linode/instancedisk/resource.go | 2 +- linode/instancedisk/resource_test.go | 6 +- linode/instancedisk/schema_resource.go | 2 +- linode/instancedisk/tmpl/template.go | 2 +- linode/instanceip/resource.go | 2 +- linode/instanceip/resource_test.go | 4 +- linode/instanceip/tmpl/template.go | 2 +- linode/instancenetworking/datasource_test.go | 4 +- .../framework_datasource.go | 2 +- linode/instancenetworking/tmpl/template.go | 2 +- linode/instancesharedips/resource.go | 2 +- linode/instancesharedips/resource_test.go | 8 +- linode/instancesharedips/tmpl/template.go | 2 +- linode/instancetype/datasource_test.go | 4 +- linode/instancetype/framework_datasource.go | 2 +- linode/instancetype/tmpl/template.go | 2 +- linode/instancetypes/datasource_test.go | 4 +- linode/instancetypes/framework_datasource.go | 2 +- .../framework_datasource_schema.go | 4 +- linode/instancetypes/framework_models.go | 4 +- linode/instancetypes/tmpl/template.go | 2 +- linode/ipv6range/datasource_test.go | 4 +- linode/ipv6range/framework_datasource.go | 2 +- linode/ipv6range/framework_resource.go | 2 +- linode/ipv6range/resource_test.go | 6 +- linode/ipv6range/tmpl/template.go | 2 +- linode/kernel/datasource_test.go | 4 +- linode/kernel/framework_datasource.go | 2 +- linode/kernel/tmpl/template.go | 2 +- linode/kernels/datasource_test.go | 4 +- linode/kernels/framework_datasource.go | 2 +- linode/kernels/framework_datasource_schema.go | 4 +- linode/kernels/framework_models.go | 4 +- linode/kernels/tmpl/template.go | 2 +- linode/lke/cluster.go | 2 +- linode/lke/cluster_test.go | 2 +- linode/lke/datasource.go | 2 +- linode/lke/datasource_test.go | 4 +- linode/lke/resource.go | 2 +- linode/lke/resource_test.go | 6 +- linode/lke/tmpl/template.go | 2 +- linode/lkeversions/datasource_test.go | 4 +- linode/lkeversions/framework_datasource.go | 2 +- linode/lkeversions/tmpl/template.go | 2 +- linode/nb/datasource_test.go | 4 +- linode/nb/framework_datasource.go | 2 +- linode/nb/framework_models.go | 2 +- linode/nb/framework_resource.go | 2 +- linode/nb/framework_resource_schema.go | 2 +- linode/nb/resource_test.go | 8 +- linode/nb/tmpl/template.go | 2 +- linode/nbconfig/datasource_test.go | 4 +- linode/nbconfig/framework_datasource.go | 2 +- linode/nbconfig/resource.go | 2 +- linode/nbconfig/resource_test.go | 8 +- linode/nbconfig/tmpl/template.go | 4 +- linode/nbnode/datasource_test.go | 4 +- linode/nbnode/framework_datasource.go | 2 +- linode/nbnode/resource.go | 2 +- linode/nbnode/resource_test.go | 4 +- linode/nbnode/tmpl/template.go | 6 +- linode/nbs/datasource_test.go | 4 +- linode/nbs/framework_datasource.go | 2 +- linode/nbs/framework_models.go | 4 +- linode/nbs/framework_schema_datasource.go | 4 +- linode/nbs/tmpl/template.go | 2 +- linode/networkingip/datasource_test.go | 4 +- linode/networkingip/framework_datasource.go | 2 +- linode/networkingip/tmpl/template.go | 2 +- linode/obj/resource.go | 2 +- linode/obj/resource_test.go | 6 +- linode/obj/tmpl/template.go | 6 +- linode/objbucket/datasource_test.go | 4 +- linode/objbucket/framework_datasource.go | 2 +- linode/objbucket/resource.go | 2 +- linode/objbucket/resource_test.go | 8 +- linode/objbucket/tmpl/template.go | 4 +- linode/objcluster/datasource_test.go | 4 +- linode/objcluster/framework_datasource.go | 2 +- linode/objcluster/tmpl/template.go | 2 +- linode/objkey/framework_resource.go | 2 +- linode/objkey/resource_test.go | 6 +- linode/objkey/tmpl/template.go | 2 +- linode/profile/datasource_test.go | 4 +- linode/profile/framework_datasource.go | 2 +- linode/profile/tmpl/template.go | 2 +- linode/provider.go | 44 ++++---- linode/provider_test.go | 2 +- linode/rdns/framework_models.go | 2 +- linode/rdns/framework_models_unit_test.go | 2 +- linode/rdns/framework_resource.go | 2 +- linode/rdns/framework_resource_schema.go | 2 +- linode/rdns/resource_test.go | 4 +- linode/rdns/tmpl/template.go | 2 +- linode/region/datasource_test.go | 4 +- linode/region/framework_datasource.go | 2 +- linode/region/framework_models.go | 2 +- linode/region/tmpl/template.go | 2 +- linode/regions/datasource_test.go | 4 +- linode/regions/framework_datasource.go | 2 +- linode/regions/framework_datasource_schema.go | 2 +- linode/regions/framework_models.go | 2 +- linode/regions/tmpl/template.go | 2 +- linode/sshkey/datasource_test.go | 4 +- linode/sshkey/framework_datasource.go | 2 +- linode/sshkey/framework_resource.go | 2 +- linode/sshkey/resource_test.go | 6 +- linode/sshkey/tmpl/template.go | 2 +- linode/sshkeys/datasource_test.go | 4 +- linode/sshkeys/framework_datasource.go | 2 +- linode/sshkeys/framework_datasource_schema.go | 6 +- linode/sshkeys/framework_models.go | 4 +- linode/sshkeys/framework_models_unit_test.go | 2 +- linode/sshkeys/tmpl/template.go | 2 +- linode/stackscript/datasource_test.go | 4 +- linode/stackscript/framework_datasource.go | 2 +- linode/stackscript/framework_resource.go | 2 +- linode/stackscript/resource_test.go | 6 +- linode/stackscript/tmpl/template.go | 2 +- linode/stackscripts/datasource_test.go | 4 +- linode/stackscripts/framework_datasource.go | 2 +- linode/stackscripts/framework_models.go | 4 +- .../framework_schema_datasource.go | 4 +- linode/stackscripts/tmpl/template.go | 2 +- linode/token/framework_model.go | 2 +- linode/token/framework_models_unit_test.go | 2 +- linode/token/framework_resource.go | 2 +- linode/token/framework_resource_schema.go | 4 +- linode/token/resource_test.go | 4 +- linode/token/tmpl/template.go | 2 +- linode/user/datasource_test.go | 4 +- linode/user/framework_datasource.go | 2 +- linode/user/resource.go | 2 +- linode/user/resource_test.go | 6 +- linode/user/tmpl/template.go | 2 +- linode/users/datasource_test.go | 4 +- linode/users/framework_datasource.go | 2 +- linode/users/framework_datasource_schema.go | 4 +- linode/users/framework_models.go | 4 +- linode/users/tmpl/template.go | 2 +- linode/vlan/datasource_test.go | 6 +- linode/vlan/framework_datasource.go | 2 +- linode/vlan/framework_model.go | 2 +- linode/vlan/framework_schema_datasource.go | 4 +- linode/vlan/tmpl/template.go | 2 +- linode/volume/datasource_test.go | 4 +- linode/volume/framework_datasource.go | 2 +- linode/volume/framework_model.go | 2 +- linode/volume/resource.go | 2 +- linode/volume/resource_test.go | 6 +- linode/volume/tmpl/template.go | 2 +- linode/volumes/datasource_test.go | 4 +- linode/volumes/framework_datasource.go | 2 +- linode/volumes/framework_models.go | 4 +- linode/volumes/framework_schema_datasource.go | 4 +- linode/volumes/tmpl/template.go | 2 +- linode/vpc/datasource_test.go | 4 +- linode/vpc/framework_datasource.go | 2 +- linode/vpc/framework_resource.go | 2 +- linode/vpc/resource_test.go | 6 +- linode/vpc/tmpl/template.go | 2 +- linode/vpcs/datasource_test.go | 4 +- linode/vpcs/framework_datasource.go | 2 +- linode/vpcs/framework_models.go | 4 +- linode/vpcs/framework_schema_datasource.go | 4 +- linode/vpcs/tmpl/template.go | 2 +- linode/vpcsubnet/datasource_test.go | 4 +- linode/vpcsubnet/framework_datasource.go | 2 +- linode/vpcsubnet/framework_resource.go | 2 +- linode/vpcsubnet/resource_test.go | 6 +- linode/vpcsubnet/tmpl/template.go | 2 +- linode/vpcsubnets/datasource_test.go | 4 +- linode/vpcsubnets/framework_datasource.go | 2 +- linode/vpcsubnets/framework_models.go | 4 +- .../vpcsubnets/framework_schema_datasource.go | 4 +- linode/vpcsubnets/tmpl/template.go | 2 +- main.go | 4 +- 312 files changed, 542 insertions(+), 540 deletions(-) diff --git a/.gitignore b/.gitignore index 94704ff7a..983a7a4ea 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,6 @@ modules-dev/ !command/test-fixtures/**/.terraform/ # Binary exclusions -terraform-provider-linode \ No newline at end of file +terraform-provider-linode + +dist/** diff --git a/.goreleaser.yml b/.goreleaser.yml index eca2e7d1d..6f737448b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -10,7 +10,7 @@ builds: flags: - -trimpath ldflags: - - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X github.com/linode/terraform-provider-linode/version.ProviderVersion={{.Version}}' + - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X github.com/linode/terraform-provider-linode/v2/version.ProviderVersion={{.Version}}' goos: - freebsd - windows diff --git a/Makefile b/Makefile index 2ac91fb50..fd4905a58 100644 --- a/Makefile +++ b/Makefile @@ -57,13 +57,13 @@ testacc: fmtcheck TF_ACC=1 \ LINODE_API_VERSION="v4beta" \ RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ - go test --tags=integration -v ./$(PKG_NAME) -count $(ACCTEST_COUNT) -timeout $(ACCTEST_TIMEOUT) -parallel=$(ACCTEST_PARALLELISM) -ldflags="-X=github.com/linode/terraform-provider-linode/version.ProviderVersion=acc" $(TESTARGS) + go test --tags=integration -v ./$(PKG_NAME) -count $(ACCTEST_COUNT) -timeout $(ACCTEST_TIMEOUT) -parallel=$(ACCTEST_PARALLELISM) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" $(TESTARGS) smoketest: fmtcheck TF_ACC=1 \ LINODE_API_VERSION="v4beta" \ RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ - go test -v -run smoke ./linode/... -count $(ACCTEST_COUNT) -timeout $(ACCTEST_TIMEOUT) -parallel=$(ACCTEST_PARALLELISM) -ldflags="-X=github.com/linode/terraform-provider-linode/version.ProviderVersion=acc" + go test -v -run smoke ./linode/... -count $(ACCTEST_COUNT) -timeout $(ACCTEST_TIMEOUT) -parallel=$(ACCTEST_PARALLELISM) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" unittest: go test -v --tags=unit ./linode/... diff --git a/go.mod b/go.mod index e20254c95..d489ac9f5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/linode/terraform-provider-linode +module github.com/linode/terraform-provider-linode/v2 go 1.20 diff --git a/linode/acceptance/database.go b/linode/acceptance/database.go index 1c964236b..e034bb1ff 100644 --- a/linode/acceptance/database.go +++ b/linode/acceptance/database.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func CheckMySQLDatabaseExists(name string, db *linodego.MySQLDatabase) resource.TestCheckFunc { diff --git a/linode/acceptance/instance.go b/linode/acceptance/instance.go index 0b7fc5d6d..9047fc467 100644 --- a/linode/acceptance/instance.go +++ b/linode/acceptance/instance.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func CheckInstanceExists(name string, instance *linodego.Instance) resource.TestCheckFunc { diff --git a/linode/acceptance/tmpl/template.go b/linode/acceptance/tmpl/template.go index 29be0602f..e7ffaa382 100644 --- a/linode/acceptance/tmpl/template.go +++ b/linode/acceptance/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) // ProviderNoPoll is used to configure the provider to disable instance diff --git a/linode/acceptance/util.go b/linode/acceptance/util.go index daaf98a28..62cd1de4c 100644 --- a/linode/acceptance/util.go +++ b/linode/acceptance/util.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/version" + "github.com/linode/terraform-provider-linode/v2/linode" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/version" "golang.org/x/crypto/ssh" ) diff --git a/linode/account/datasource_test.go b/linode/account/datasource_test.go index 231510620..ec19915f6 100644 --- a/linode/account/datasource_test.go +++ b/linode/account/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/account/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/account/tmpl" ) func TestAccDataSourceAccount_basic_smoke(t *testing.T) { diff --git a/linode/account/framework_datasource.go b/linode/account/framework_datasource.go index dd7ad9203..a8b4811d5 100644 --- a/linode/account/framework_datasource.go +++ b/linode/account/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/account/tmpl/template.go b/linode/account/tmpl/template.go index b146d7486..e808d02f6 100644 --- a/linode/account/tmpl/template.go +++ b/linode/account/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct{} diff --git a/linode/accountlogin/datasource_test.go b/linode/accountlogin/datasource_test.go index 45b030b46..233e4900a 100644 --- a/linode/accountlogin/datasource_test.go +++ b/linode/accountlogin/datasource_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/accountlogin/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/accountlogin/tmpl" ) func TestAccDataSourceLinodeAccountLogin_basic(t *testing.T) { diff --git a/linode/accountlogin/framework_datasource.go b/linode/accountlogin/framework_datasource.go index f26a7ebb2..95e833573 100644 --- a/linode/accountlogin/framework_datasource.go +++ b/linode/accountlogin/framework_datasource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/accountlogin/tmpl/template.go b/linode/accountlogin/tmpl/template.go index 218065e28..f722c6bf6 100644 --- a/linode/accountlogin/tmpl/template.go +++ b/linode/accountlogin/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/accountlogins/datasource_test.go b/linode/accountlogins/datasource_test.go index 5b964a5b7..9e665f1e3 100644 --- a/linode/accountlogins/datasource_test.go +++ b/linode/accountlogins/datasource_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/accountlogins/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/accountlogins/tmpl" ) func TestAccDataSourceAccountLogins_basic(t *testing.T) { diff --git a/linode/accountlogins/framework_datasource.go b/linode/accountlogins/framework_datasource.go index 0553681a4..6629b7bdf 100644 --- a/linode/accountlogins/framework_datasource.go +++ b/linode/accountlogins/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/accountlogins/framework_datasource_schema.go b/linode/accountlogins/framework_datasource_schema.go index 275e5f59e..90a1e85bb 100644 --- a/linode/accountlogins/framework_datasource_schema.go +++ b/linode/accountlogins/framework_datasource_schema.go @@ -2,8 +2,8 @@ package accountlogins import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/accountlogin" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/accountlogin" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/accountlogins/framework_models.go b/linode/accountlogins/framework_models.go index ab49f30df..8ef7c209c 100644 --- a/linode/accountlogins/framework_models.go +++ b/linode/accountlogins/framework_models.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) type AccountLoginModel struct { diff --git a/linode/accountlogins/tmpl/template.go b/linode/accountlogins/tmpl/template.go index 37ad2c36e..25749acc4 100644 --- a/linode/accountlogins/tmpl/template.go +++ b/linode/accountlogins/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/accountsettings/datasource_test.go b/linode/accountsettings/datasource_test.go index cfdd5b845..f46531f01 100644 --- a/linode/accountsettings/datasource_test.go +++ b/linode/accountsettings/datasource_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/accountsettings/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/accountsettings/tmpl" ) func TestAccDataSourceLinodeAccountSettings_basic(t *testing.T) { diff --git a/linode/accountsettings/framework_datasource.go b/linode/accountsettings/framework_datasource.go index ebadb6fac..299ce0621 100644 --- a/linode/accountsettings/framework_datasource.go +++ b/linode/accountsettings/framework_datasource.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/accountsettings/framework_model.go b/linode/accountsettings/framework_model.go index fb5dcfe30..85e75172c 100644 --- a/linode/accountsettings/framework_model.go +++ b/linode/accountsettings/framework_model.go @@ -3,7 +3,7 @@ package accountsettings import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // AccountSettingsModel describes the Terraform resource data model to match the diff --git a/linode/accountsettings/framework_resource.go b/linode/accountsettings/framework_resource.go index 2f5836226..f6c39da18 100644 --- a/linode/accountsettings/framework_resource.go +++ b/linode/accountsettings/framework_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/accountsettings/resource_test.go b/linode/accountsettings/resource_test.go index d06f5c6b0..6e40cfc9e 100644 --- a/linode/accountsettings/resource_test.go +++ b/linode/accountsettings/resource_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/accountsettings/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/accountsettings/tmpl" ) func TestAccResourceAccountSettings_basic(t *testing.T) { diff --git a/linode/accountsettings/tmpl/template.go b/linode/accountsettings/tmpl/template.go index e460c7112..6ff1d209f 100644 --- a/linode/accountsettings/tmpl/template.go +++ b/linode/accountsettings/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/backup/datasource_test.go b/linode/backup/datasource_test.go index 85bfc2342..90d995bb7 100644 --- a/linode/backup/datasource_test.go +++ b/linode/backup/datasource_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var testRegion string diff --git a/linode/backup/framework_datasource.go b/linode/backup/framework_datasource.go index 8524c6f7b..d3b8e4fea 100644 --- a/linode/backup/framework_datasource.go +++ b/linode/backup/framework_datasource.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/databaseaccesscontrols/resource.go b/linode/databaseaccesscontrols/resource.go index 11470f30d..5d1cdb4ef 100644 --- a/linode/databaseaccesscontrols/resource.go +++ b/linode/databaseaccesscontrols/resource.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/databaseaccesscontrols/resource_test.go b/linode/databaseaccesscontrols/resource_test.go index e78c26799..46237700a 100644 --- a/linode/databaseaccesscontrols/resource_test.go +++ b/linode/databaseaccesscontrols/resource_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databaseaccesscontrols/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databaseaccesscontrols/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var ( diff --git a/linode/databaseaccesscontrols/schema_resource.go b/linode/databaseaccesscontrols/schema_resource.go index af3383845..18c8d6e36 100644 --- a/linode/databaseaccesscontrols/schema_resource.go +++ b/linode/databaseaccesscontrols/schema_resource.go @@ -3,7 +3,7 @@ package databaseaccesscontrols import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceSchema = map[string]*schema.Schema{ diff --git a/linode/databaseaccesscontrols/tmpl/template.go b/linode/databaseaccesscontrols/tmpl/template.go index 5da3d8f97..f642ca9fb 100644 --- a/linode/databaseaccesscontrols/tmpl/template.go +++ b/linode/databaseaccesscontrols/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/databasebackups/datasource_test.go b/linode/databasebackups/datasource_test.go index 8c295a750..d31678a03 100644 --- a/linode/databasebackups/datasource_test.go +++ b/linode/databasebackups/datasource_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/databasebackups/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/databasebackups/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) var ( diff --git a/linode/databasebackups/framework_datasource.go b/linode/databasebackups/framework_datasource.go index 750f35824..cf817cbc4 100644 --- a/linode/databasebackups/framework_datasource.go +++ b/linode/databasebackups/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/databasebackups/framework_datasource_schema.go b/linode/databasebackups/framework_datasource_schema.go index c568eda76..f2d3ff9f5 100644 --- a/linode/databasebackups/framework_datasource_schema.go +++ b/linode/databasebackups/framework_datasource_schema.go @@ -4,8 +4,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/databasebackups/framework_models.go b/linode/databasebackups/framework_models.go index 2cbd41b5b..3acab9da7 100644 --- a/linode/databasebackups/framework_models.go +++ b/linode/databasebackups/framework_models.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) type DatabaseBackupModel struct { diff --git a/linode/databasebackups/tmpl/template.go b/linode/databasebackups/tmpl/template.go index 7685ae053..810711d67 100644 --- a/linode/databasebackups/tmpl/template.go +++ b/linode/databasebackups/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/databaseengines/datasource_test.go b/linode/databaseengines/datasource_test.go index c47b2bdd9..c5aa58d16 100644 --- a/linode/databaseengines/datasource_test.go +++ b/linode/databaseengines/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databaseengines/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databaseengines/tmpl" ) func TestAccDataSourceDatabaseEngines_all(t *testing.T) { diff --git a/linode/databaseengines/framework_datasource.go b/linode/databaseengines/framework_datasource.go index b38733128..786ce5886 100644 --- a/linode/databaseengines/framework_datasource.go +++ b/linode/databaseengines/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/databaseengines/framework_datasource_schema.go b/linode/databaseengines/framework_datasource_schema.go index d7e9befb0..a4dade231 100644 --- a/linode/databaseengines/framework_datasource_schema.go +++ b/linode/databaseengines/framework_datasource_schema.go @@ -2,7 +2,7 @@ package databaseengines import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/databaseengines/framework_models.go b/linode/databaseengines/framework_models.go index 48740a483..2e8ff2168 100644 --- a/linode/databaseengines/framework_models.go +++ b/linode/databaseengines/framework_models.go @@ -3,7 +3,7 @@ package databaseengines import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) type DatabaseEngineModel struct { diff --git a/linode/databaseengines/tmpl/template.go b/linode/databaseengines/tmpl/template.go index cefff5b00..1a921975f 100644 --- a/linode/databaseengines/tmpl/template.go +++ b/linode/databaseengines/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct{} diff --git a/linode/databasemysql/datasource_test.go b/linode/databasemysql/datasource_test.go index 4d92ab4aa..5682581f9 100644 --- a/linode/databasemysql/datasource_test.go +++ b/linode/databasemysql/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databasemysql/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysql/tmpl" ) func TestAccDataSourceDatabaseMySQL_basic(t *testing.T) { diff --git a/linode/databasemysql/framework_datasource.go b/linode/databasemysql/framework_datasource.go index b8cd8910f..4a416ad99 100644 --- a/linode/databasemysql/framework_datasource.go +++ b/linode/databasemysql/framework_datasource.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/databasemysql/framework_datasource_schema.go b/linode/databasemysql/framework_datasource_schema.go index 4b50a4cc1..505e549ff 100644 --- a/linode/databasemysql/framework_datasource_schema.go +++ b/linode/databasemysql/framework_datasource_schema.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var frameworkDatasourceSchema = schema.Schema{ diff --git a/linode/databasemysql/framework_models.go b/linode/databasemysql/framework_models.go index c12fe1583..a7b82c934 100644 --- a/linode/databasemysql/framework_models.go +++ b/linode/databasemysql/framework_models.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSourceModel struct { diff --git a/linode/databasemysql/resource.go b/linode/databasemysql/resource.go index 847bcf6a8..1a6d8350e 100644 --- a/linode/databasemysql/resource.go +++ b/linode/databasemysql/resource.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/databasemysql/resource_test.go b/linode/databasemysql/resource_test.go index ce8712eab..5f5a9d8fb 100644 --- a/linode/databasemysql/resource_test.go +++ b/linode/databasemysql/resource_test.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databasemysql/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysql/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var ( diff --git a/linode/databasemysql/schema_resource.go b/linode/databasemysql/schema_resource.go index 5abb6e8b4..f8ad20e57 100644 --- a/linode/databasemysql/schema_resource.go +++ b/linode/databasemysql/schema_resource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceSchema = map[string]*schema.Schema{ diff --git a/linode/databasemysql/tmpl/template.go b/linode/databasemysql/tmpl/template.go index 705c5a967..c0b601350 100644 --- a/linode/databasemysql/tmpl/template.go +++ b/linode/databasemysql/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/databasemysqlbackups/datasource_test.go b/linode/databasemysqlbackups/datasource_test.go index 0ebd0ff9b..59f389c5c 100644 --- a/linode/databasemysqlbackups/datasource_test.go +++ b/linode/databasemysqlbackups/datasource_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databasemysqlbackups/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysqlbackups/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var ( diff --git a/linode/databasemysqlbackups/schema_datasource.go b/linode/databasemysqlbackups/schema_datasource.go index 19c7f0e23..3d3c277a8 100644 --- a/linode/databasemysqlbackups/schema_datasource.go +++ b/linode/databasemysqlbackups/schema_datasource.go @@ -2,7 +2,7 @@ package databasemysqlbackups import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var filterConfig = helper.FilterConfig{ diff --git a/linode/databasemysqlbackups/tmpl/template.go b/linode/databasemysqlbackups/tmpl/template.go index e1d6bbbe5..96a4895e2 100644 --- a/linode/databasemysqlbackups/tmpl/template.go +++ b/linode/databasemysqlbackups/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/databasepostgresql/datasource_test.go b/linode/databasepostgresql/datasource_test.go index f41e00097..b71e1cba4 100644 --- a/linode/databasepostgresql/datasource_test.go +++ b/linode/databasepostgresql/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databasepostgresql/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databasepostgresql/tmpl" ) func TestAccDataSourceDatabasePostgres_basic(t *testing.T) { diff --git a/linode/databasepostgresql/framework_datasource.go b/linode/databasepostgresql/framework_datasource.go index 8c1633903..0e6578218 100644 --- a/linode/databasepostgresql/framework_datasource.go +++ b/linode/databasepostgresql/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/databasepostgresql/framework_datasource_schema.go b/linode/databasepostgresql/framework_datasource_schema.go index 776c92913..39afe2ee8 100644 --- a/linode/databasepostgresql/framework_datasource_schema.go +++ b/linode/databasepostgresql/framework_datasource_schema.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var frameworkDatasourceSchema = schema.Schema{ diff --git a/linode/databasepostgresql/framework_models.go b/linode/databasepostgresql/framework_models.go index 03f316694..33beaf7c2 100644 --- a/linode/databasepostgresql/framework_models.go +++ b/linode/databasepostgresql/framework_models.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSourceModel struct { diff --git a/linode/databasepostgresql/resource.go b/linode/databasepostgresql/resource.go index b375388a1..3488a10bd 100644 --- a/linode/databasepostgresql/resource.go +++ b/linode/databasepostgresql/resource.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/databasepostgresql/resource_test.go b/linode/databasepostgresql/resource_test.go index 65d2ea3a5..de9a00805 100644 --- a/linode/databasepostgresql/resource_test.go +++ b/linode/databasepostgresql/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databasepostgresql/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databasepostgresql/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var ( diff --git a/linode/databasepostgresql/schema_resource.go b/linode/databasepostgresql/schema_resource.go index 3583b0897..520b7d3c3 100644 --- a/linode/databasepostgresql/schema_resource.go +++ b/linode/databasepostgresql/schema_resource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceSchema = map[string]*schema.Schema{ diff --git a/linode/databasepostgresql/tmpl/template.go b/linode/databasepostgresql/tmpl/template.go index 7246f4294..6863befa7 100644 --- a/linode/databasepostgresql/tmpl/template.go +++ b/linode/databasepostgresql/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/databases/datasource_test.go b/linode/databases/datasource_test.go index 0afee6b36..cc5a3aea0 100644 --- a/linode/databases/datasource_test.go +++ b/linode/databases/datasource_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/databases/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/databases/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var ( diff --git a/linode/databases/framework_datasource.go b/linode/databases/framework_datasource.go index 26519f5b1..6e8d78894 100644 --- a/linode/databases/framework_datasource.go +++ b/linode/databases/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/databases/framework_datasource_schema.go b/linode/databases/framework_datasource_schema.go index e5c9b9ba8..22efd391d 100644 --- a/linode/databases/framework_datasource_schema.go +++ b/linode/databases/framework_datasource_schema.go @@ -3,7 +3,7 @@ package databases import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/databases/framework_models.go b/linode/databases/framework_models.go index 2250824e4..9a5820ac7 100644 --- a/linode/databases/framework_models.go +++ b/linode/databases/framework_models.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) // DatabaseModel represents a single Database object. diff --git a/linode/databases/tmpl/template.go b/linode/databases/tmpl/template.go index 599dda066..5a46bdea3 100644 --- a/linode/databases/tmpl/template.go +++ b/linode/databases/tmpl/template.go @@ -3,8 +3,8 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - databasemysqltmpl "github.com/linode/terraform-provider-linode/linode/databasemysql/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + databasemysqltmpl "github.com/linode/terraform-provider-linode/v2/linode/databasemysql/tmpl" ) type TemplateData struct { diff --git a/linode/domain/datasource_test.go b/linode/domain/datasource_test.go index 4d91226e9..8a45f9763 100644 --- a/linode/domain/datasource_test.go +++ b/linode/domain/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/domain/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/domain/tmpl" ) func TestAccDataSourceDomain_basic_smoke(t *testing.T) { diff --git a/linode/domain/framework_datasource.go b/linode/domain/framework_datasource.go index 0520e499d..e8963079b 100644 --- a/linode/domain/framework_datasource.go +++ b/linode/domain/framework_datasource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/domain/framework_models.go b/linode/domain/framework_models.go index cda3b9aa6..20a843fe7 100644 --- a/linode/domain/framework_models.go +++ b/linode/domain/framework_models.go @@ -3,7 +3,7 @@ package domain import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // DomainModel maps a Linode Domain object to a Terraform config. diff --git a/linode/domain/resource.go b/linode/domain/resource.go index 73e7b54d8..9622b0f5b 100644 --- a/linode/domain/resource.go +++ b/linode/domain/resource.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/domain/resource_test.go b/linode/domain/resource_test.go index 6ea7f79e5..67223879a 100644 --- a/linode/domain/resource_test.go +++ b/linode/domain/resource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/domain/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/domain/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func init() { diff --git a/linode/domain/schema_resource.go b/linode/domain/schema_resource.go index 066573796..6db5be641 100644 --- a/linode/domain/schema_resource.go +++ b/linode/domain/schema_resource.go @@ -3,7 +3,7 @@ package domain import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const domainSecondsDescription = "Valid values are 0, 30, 120, 300, 3600, 7200, 14400, 28800, " + diff --git a/linode/domain/tmpl/template.go b/linode/domain/tmpl/template.go index 4b69ed211..9691aac6f 100644 --- a/linode/domain/tmpl/template.go +++ b/linode/domain/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/domainrecord/datasource_test.go b/linode/domainrecord/datasource_test.go index 425aa71ff..0307c5ee5 100644 --- a/linode/domainrecord/datasource_test.go +++ b/linode/domainrecord/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/domainrecord/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/domainrecord/tmpl" ) func TestAccDataSourceDomainRecord_basic(t *testing.T) { diff --git a/linode/domainrecord/framework_datasource.go b/linode/domainrecord/framework_datasource.go index 20521236c..6a801da46 100644 --- a/linode/domainrecord/framework_datasource.go +++ b/linode/domainrecord/framework_datasource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/domainrecord/resource.go b/linode/domainrecord/resource.go index 3f63ce60c..7768d3d47 100644 --- a/linode/domainrecord/resource.go +++ b/linode/domainrecord/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/domainrecord/resource_test.go b/linode/domainrecord/resource_test.go index a8676eaea..b67892d91 100644 --- a/linode/domainrecord/resource_test.go +++ b/linode/domainrecord/resource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/domainrecord/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/domainrecord/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestAccResourceDomainRecord_basic(t *testing.T) { diff --git a/linode/domainrecord/schema_resource.go b/linode/domainrecord/schema_resource.go index 5825f2721..615d46e14 100644 --- a/linode/domainrecord/schema_resource.go +++ b/linode/domainrecord/schema_resource.go @@ -3,7 +3,7 @@ package domainrecord import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceSchema = map[string]*schema.Schema{ diff --git a/linode/domainrecord/tmpl/template.go b/linode/domainrecord/tmpl/template.go index 226f43e41..c0e2d3e4c 100644 --- a/linode/domainrecord/tmpl/template.go +++ b/linode/domainrecord/tmpl/template.go @@ -3,8 +3,8 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - domain "github.com/linode/terraform-provider-linode/linode/domain/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + domain "github.com/linode/terraform-provider-linode/v2/linode/domain/tmpl" ) type TemplateData struct { diff --git a/linode/domainzonefile/datasource_test.go b/linode/domainzonefile/datasource_test.go index d6e98d430..66ab13878 100644 --- a/linode/domainzonefile/datasource_test.go +++ b/linode/domainzonefile/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/domainzonefile/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/domainzonefile/tmpl" ) func TestAccDataSourceDomainZonefile_basic(t *testing.T) { diff --git a/linode/domainzonefile/framework_datasource.go b/linode/domainzonefile/framework_datasource.go index d519b3f7d..e23af9ecb 100644 --- a/linode/domainzonefile/framework_datasource.go +++ b/linode/domainzonefile/framework_datasource.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/domainzonefile/tmpl/template.go b/linode/domainzonefile/tmpl/template.go index 423ce44c3..2c95c7cf3 100644 --- a/linode/domainzonefile/tmpl/template.go +++ b/linode/domainzonefile/tmpl/template.go @@ -3,8 +3,8 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - domain "github.com/linode/terraform-provider-linode/linode/domain/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + domain "github.com/linode/terraform-provider-linode/v2/linode/domain/tmpl" ) type TemplateData struct { diff --git a/linode/firewall/datasource_test.go b/linode/firewall/datasource_test.go index aa151bb0d..65ba878bb 100644 --- a/linode/firewall/datasource_test.go +++ b/linode/firewall/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/firewall/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/firewall/tmpl" ) const testFirewallDataName = "data.linode_firewall.test" diff --git a/linode/firewall/framework_datasource.go b/linode/firewall/framework_datasource.go index 736c93f45..c605a7419 100644 --- a/linode/firewall/framework_datasource.go +++ b/linode/firewall/framework_datasource.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/firewall/framework_models.go b/linode/firewall/framework_models.go index ac91cd5d0..3ef46f08f 100644 --- a/linode/firewall/framework_models.go +++ b/linode/firewall/framework_models.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // FirewallModel describes the Terraform resource data model to match the diff --git a/linode/firewall/helpers.go b/linode/firewall/helpers.go index 0f14a4863..92d2f231e 100644 --- a/linode/firewall/helpers.go +++ b/linode/firewall/helpers.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" "golang.org/x/net/context" ) diff --git a/linode/firewall/resource.go b/linode/firewall/resource.go index 78f38aa4e..18f40310c 100644 --- a/linode/firewall/resource.go +++ b/linode/firewall/resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func resourceFirewallRules() *schema.Resource { diff --git a/linode/firewall/resource_test.go b/linode/firewall/resource_test.go index fed94c014..dadcc3fd1 100644 --- a/linode/firewall/resource_test.go +++ b/linode/firewall/resource_test.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - acceptanceTmpl "github.com/linode/terraform-provider-linode/linode/acceptance/tmpl" - "github.com/linode/terraform-provider-linode/linode/firewall/tmpl" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + acceptanceTmpl "github.com/linode/terraform-provider-linode/v2/linode/acceptance/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/firewall/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const testFirewallResName = "linode_firewall.test" diff --git a/linode/firewall/schema_resource.go b/linode/firewall/schema_resource.go index 3eb6ce056..68d07e104 100644 --- a/linode/firewall/schema_resource.go +++ b/linode/firewall/schema_resource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceRuleSchema = map[string]*schema.Schema{ diff --git a/linode/firewall/tmpl/template.go b/linode/firewall/tmpl/template.go index b0be17f27..06d05de25 100644 --- a/linode/firewall/tmpl/template.go +++ b/linode/firewall/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type ResourceTemplateData struct { diff --git a/linode/firewalldevice/resource.go b/linode/firewalldevice/resource.go index a7304ea09..b32ab1988 100644 --- a/linode/firewalldevice/resource.go +++ b/linode/firewalldevice/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/firewalldevice/resource_test.go b/linode/firewalldevice/resource_test.go index d08a33efa..2af795616 100644 --- a/linode/firewalldevice/resource_test.go +++ b/linode/firewalldevice/resource_test.go @@ -8,14 +8,14 @@ import ( "strconv" "testing" - acceptanceTmpl "github.com/linode/terraform-provider-linode/linode/acceptance/tmpl" + acceptanceTmpl "github.com/linode/terraform-provider-linode/v2/linode/acceptance/tmpl" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/firewalldevice/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/firewalldevice/tmpl" ) var testRegion string diff --git a/linode/firewalldevice/tmpl/template.go b/linode/firewalldevice/tmpl/template.go index 37b7f733e..38fa4bbc2 100644 --- a/linode/firewalldevice/tmpl/template.go +++ b/linode/firewalldevice/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/firewalls/datasource_test.go b/linode/firewalls/datasource_test.go index fcc09c955..017793b88 100644 --- a/linode/firewalls/datasource_test.go +++ b/linode/firewalls/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/firewalls/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/firewalls/tmpl" ) const testFirewallDataName = "data.linode_firewalls.test" diff --git a/linode/firewalls/framework_datasource.go b/linode/firewalls/framework_datasource.go index e5d0ff2e9..41b80389c 100644 --- a/linode/firewalls/framework_datasource.go +++ b/linode/firewalls/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/firewalls/framework_models.go b/linode/firewalls/framework_models.go index 47ea42760..db70ddf6e 100644 --- a/linode/firewalls/framework_models.go +++ b/linode/firewalls/framework_models.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - firewallresource "github.com/linode/terraform-provider-linode/linode/firewall" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + firewallresource "github.com/linode/terraform-provider-linode/v2/linode/firewall" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) type FirewallRuleModel struct { diff --git a/linode/firewalls/framework_schema.go b/linode/firewalls/framework_schema.go index 862a20ff8..0c1cd3a79 100644 --- a/linode/firewalls/framework_schema.go +++ b/linode/firewalls/framework_schema.go @@ -4,8 +4,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/firewalls/tmpl/template.go b/linode/firewalls/tmpl/template.go index 90e025035..64040de8e 100644 --- a/linode/firewalls/tmpl/template.go +++ b/linode/firewalls/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/framework_provider.go b/linode/framework_provider.go index 3d099dcf0..6b85f36ff 100644 --- a/linode/framework_provider.go +++ b/linode/framework_provider.go @@ -7,57 +7,57 @@ import ( "github.com/hashicorp/terraform-plugin-framework/provider" "github.com/hashicorp/terraform-plugin-framework/provider/schema" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/linode/terraform-provider-linode/linode/account" - "github.com/linode/terraform-provider-linode/linode/accountlogin" - "github.com/linode/terraform-provider-linode/linode/accountlogins" - "github.com/linode/terraform-provider-linode/linode/accountsettings" - "github.com/linode/terraform-provider-linode/linode/backup" - "github.com/linode/terraform-provider-linode/linode/databasebackups" - "github.com/linode/terraform-provider-linode/linode/databaseengines" - "github.com/linode/terraform-provider-linode/linode/databasemysql" - "github.com/linode/terraform-provider-linode/linode/databasepostgresql" - "github.com/linode/terraform-provider-linode/linode/databases" - "github.com/linode/terraform-provider-linode/linode/domain" - "github.com/linode/terraform-provider-linode/linode/domainrecord" - "github.com/linode/terraform-provider-linode/linode/domainzonefile" - "github.com/linode/terraform-provider-linode/linode/firewall" - "github.com/linode/terraform-provider-linode/linode/firewalls" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/image" - "github.com/linode/terraform-provider-linode/linode/images" - "github.com/linode/terraform-provider-linode/linode/instancenetworking" - "github.com/linode/terraform-provider-linode/linode/instancetype" - "github.com/linode/terraform-provider-linode/linode/instancetypes" - "github.com/linode/terraform-provider-linode/linode/ipv6range" - "github.com/linode/terraform-provider-linode/linode/kernel" - "github.com/linode/terraform-provider-linode/linode/kernels" - "github.com/linode/terraform-provider-linode/linode/lkeversions" - "github.com/linode/terraform-provider-linode/linode/nb" - "github.com/linode/terraform-provider-linode/linode/nbconfig" - "github.com/linode/terraform-provider-linode/linode/nbnode" - "github.com/linode/terraform-provider-linode/linode/nbs" - "github.com/linode/terraform-provider-linode/linode/networkingip" - "github.com/linode/terraform-provider-linode/linode/objbucket" - "github.com/linode/terraform-provider-linode/linode/objcluster" - "github.com/linode/terraform-provider-linode/linode/objkey" - "github.com/linode/terraform-provider-linode/linode/profile" - "github.com/linode/terraform-provider-linode/linode/rdns" - "github.com/linode/terraform-provider-linode/linode/region" - "github.com/linode/terraform-provider-linode/linode/regions" - "github.com/linode/terraform-provider-linode/linode/sshkey" - "github.com/linode/terraform-provider-linode/linode/sshkeys" - "github.com/linode/terraform-provider-linode/linode/stackscript" - "github.com/linode/terraform-provider-linode/linode/stackscripts" - "github.com/linode/terraform-provider-linode/linode/token" - "github.com/linode/terraform-provider-linode/linode/user" - "github.com/linode/terraform-provider-linode/linode/users" - "github.com/linode/terraform-provider-linode/linode/vlan" - "github.com/linode/terraform-provider-linode/linode/volume" - "github.com/linode/terraform-provider-linode/linode/volumes" - "github.com/linode/terraform-provider-linode/linode/vpc" - "github.com/linode/terraform-provider-linode/linode/vpcs" - "github.com/linode/terraform-provider-linode/linode/vpcsubnet" - "github.com/linode/terraform-provider-linode/linode/vpcsubnets" + "github.com/linode/terraform-provider-linode/v2/linode/account" + "github.com/linode/terraform-provider-linode/v2/linode/accountlogin" + "github.com/linode/terraform-provider-linode/v2/linode/accountlogins" + "github.com/linode/terraform-provider-linode/v2/linode/accountsettings" + "github.com/linode/terraform-provider-linode/v2/linode/backup" + "github.com/linode/terraform-provider-linode/v2/linode/databasebackups" + "github.com/linode/terraform-provider-linode/v2/linode/databaseengines" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysql" + "github.com/linode/terraform-provider-linode/v2/linode/databasepostgresql" + "github.com/linode/terraform-provider-linode/v2/linode/databases" + "github.com/linode/terraform-provider-linode/v2/linode/domain" + "github.com/linode/terraform-provider-linode/v2/linode/domainrecord" + "github.com/linode/terraform-provider-linode/v2/linode/domainzonefile" + "github.com/linode/terraform-provider-linode/v2/linode/firewall" + "github.com/linode/terraform-provider-linode/v2/linode/firewalls" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/image" + "github.com/linode/terraform-provider-linode/v2/linode/images" + "github.com/linode/terraform-provider-linode/v2/linode/instancenetworking" + "github.com/linode/terraform-provider-linode/v2/linode/instancetype" + "github.com/linode/terraform-provider-linode/v2/linode/instancetypes" + "github.com/linode/terraform-provider-linode/v2/linode/ipv6range" + "github.com/linode/terraform-provider-linode/v2/linode/kernel" + "github.com/linode/terraform-provider-linode/v2/linode/kernels" + "github.com/linode/terraform-provider-linode/v2/linode/lkeversions" + "github.com/linode/terraform-provider-linode/v2/linode/nb" + "github.com/linode/terraform-provider-linode/v2/linode/nbconfig" + "github.com/linode/terraform-provider-linode/v2/linode/nbnode" + "github.com/linode/terraform-provider-linode/v2/linode/nbs" + "github.com/linode/terraform-provider-linode/v2/linode/networkingip" + "github.com/linode/terraform-provider-linode/v2/linode/objbucket" + "github.com/linode/terraform-provider-linode/v2/linode/objcluster" + "github.com/linode/terraform-provider-linode/v2/linode/objkey" + "github.com/linode/terraform-provider-linode/v2/linode/profile" + "github.com/linode/terraform-provider-linode/v2/linode/rdns" + "github.com/linode/terraform-provider-linode/v2/linode/region" + "github.com/linode/terraform-provider-linode/v2/linode/regions" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey" + "github.com/linode/terraform-provider-linode/v2/linode/sshkeys" + "github.com/linode/terraform-provider-linode/v2/linode/stackscript" + "github.com/linode/terraform-provider-linode/v2/linode/stackscripts" + "github.com/linode/terraform-provider-linode/v2/linode/token" + "github.com/linode/terraform-provider-linode/v2/linode/user" + "github.com/linode/terraform-provider-linode/v2/linode/users" + "github.com/linode/terraform-provider-linode/v2/linode/vlan" + "github.com/linode/terraform-provider-linode/v2/linode/volume" + "github.com/linode/terraform-provider-linode/v2/linode/volumes" + "github.com/linode/terraform-provider-linode/v2/linode/vpc" + "github.com/linode/terraform-provider-linode/v2/linode/vpcs" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnets" ) type FrameworkProvider struct { diff --git a/linode/framework_provider_config.go b/linode/framework_provider_config.go index 7fca4eb90..a4927f864 100644 --- a/linode/framework_provider_config.go +++ b/linode/framework_provider_config.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func (fp *FrameworkProvider) Configure( diff --git a/linode/framework_provider_test.go b/linode/framework_provider_test.go index 369731ca8..dffe3f5f0 100644 --- a/linode/framework_provider_test.go +++ b/linode/framework_provider_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) func TestCreatingFrameworkProvider(t *testing.T) { diff --git a/linode/helper/config.go b/linode/helper/config.go index f8857fd6e..9e236b8b8 100644 --- a/linode/helper/config.go +++ b/linode/helper/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/hashicorp/terraform-plugin-sdk/v2/meta" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/version" + "github.com/linode/terraform-provider-linode/v2/version" ) const UAEnvVar = "TF_APPEND_USER_AGENT" diff --git a/linode/helper/customtypes/scopes.go b/linode/helper/customtypes/scopes.go index 1c9a84066..eca050680 100644 --- a/linode/helper/customtypes/scopes.go +++ b/linode/helper/customtypes/scopes.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // Ensure the implementation satisfies the expected interfaces diff --git a/linode/helper/earlyaccess_test.go b/linode/helper/earlyaccess_test.go index 1d6886750..3243c450a 100644 --- a/linode/helper/earlyaccess_test.go +++ b/linode/helper/earlyaccess_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestAttemptWarnEarlyAccessSDKv2(t *testing.T) { diff --git a/linode/helper/filter.go b/linode/helper/filter.go index bae5b6c77..654549151 100644 --- a/linode/helper/filter.go +++ b/linode/helper/filter.go @@ -593,7 +593,7 @@ func validateItemValueType(value any) error { return fmt.Errorf("The underlying type (%v) for this filterable field is not supported. "+ "This is always a provider bug. Please create an issue describing this bug on the terraform-provider-linode "+ - "GitHub repository. (https://github.com/linode/terraform-provider-linode/issues)", + "GitHub repository. (https://github.com/linode/terraform-provider-linode/v2/issues)", kind) } diff --git a/linode/helper/filter_test.go b/linode/helper/filter_test.go index bda0e1c9c..181263fb7 100644 --- a/linode/helper/filter_test.go +++ b/linode/helper/filter_test.go @@ -5,7 +5,7 @@ package helper_test import ( "testing" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestGetLatestVersion(t *testing.T) { diff --git a/linode/helper/frameworkfilter/latest_test.go b/linode/helper/frameworkfilter/latest_test.go index f7c6754b4..e9050b8af 100644 --- a/linode/helper/frameworkfilter/latest_test.go +++ b/linode/helper/frameworkfilter/latest_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestGetLatestCreated(t *testing.T) { diff --git a/linode/helper/frameworkfilter/local_filter.go b/linode/helper/frameworkfilter/local_filter.go index 024918d40..cf4753954 100644 --- a/linode/helper/frameworkfilter/local_filter.go +++ b/linode/helper/frameworkfilter/local_filter.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/helper/frameworkfilter/local_filter_test.go b/linode/helper/frameworkfilter/local_filter_test.go index 78bab2a93..77837b592 100644 --- a/linode/helper/frameworkfilter/local_filter_test.go +++ b/linode/helper/frameworkfilter/local_filter_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestApplyLocalFiltering(t *testing.T) { diff --git a/linode/helper/normalize_test.go b/linode/helper/normalize_test.go index da70ba300..f0c63344d 100644 --- a/linode/helper/normalize_test.go +++ b/linode/helper/normalize_test.go @@ -5,7 +5,7 @@ package helper_test import ( "testing" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestCompareIPv6Ranges(t *testing.T) { diff --git a/linode/helper/sdkv2_validators_test.go b/linode/helper/sdkv2_validators_test.go index 1840820d8..45e736439 100644 --- a/linode/helper/sdkv2_validators_test.go +++ b/linode/helper/sdkv2_validators_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestSDKv2ValidateIPv4Range(t *testing.T) { diff --git a/linode/image/datasource_test.go b/linode/image/datasource_test.go index 5f733823a..72cf30404 100644 --- a/linode/image/datasource_test.go +++ b/linode/image/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/image/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/image/tmpl" ) func TestAccDataSourceImage_basic(t *testing.T) { diff --git a/linode/image/framework_datasource.go b/linode/image/framework_datasource.go index 5bfd7a897..4ac09c7c0 100644 --- a/linode/image/framework_datasource.go +++ b/linode/image/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/image/framework_models.go b/linode/image/framework_models.go index 163745411..921318b4f 100644 --- a/linode/image/framework_models.go +++ b/linode/image/framework_models.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // ImageModel describes the Terraform resource data model to match the diff --git a/linode/image/resource.go b/linode/image/resource.go index f19f5fcbd..65307838c 100644 --- a/linode/image/resource.go +++ b/linode/image/resource.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/image/resource_test.go b/linode/image/resource_test.go index 197f8508a..c36e52a6b 100644 --- a/linode/image/resource_test.go +++ b/linode/image/resource_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/image/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/image/tmpl" ) // testImageBytes is a minimal Gzipped image. diff --git a/linode/image/tmpl/template.go b/linode/image/tmpl/template.go index 9a2037b5d..1e5b100ee 100644 --- a/linode/image/tmpl/template.go +++ b/linode/image/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/images/datasource_test.go b/linode/images/datasource_test.go index 588c04444..383d6855f 100644 --- a/linode/images/datasource_test.go +++ b/linode/images/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/images/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/images/tmpl" ) var testRegion string diff --git a/linode/images/framework_datasource.go b/linode/images/framework_datasource.go index 68cd55f5c..a382b746f 100644 --- a/linode/images/framework_datasource.go +++ b/linode/images/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/images/framework_models.go b/linode/images/framework_models.go index 9a35f616b..fa319dca7 100644 --- a/linode/images/framework_models.go +++ b/linode/images/framework_models.go @@ -3,8 +3,8 @@ package images import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/image" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/image" ) // ImageFilterModel describes the Terraform resource data model to match the diff --git a/linode/images/framework_schema_datasource.go b/linode/images/framework_schema_datasource.go index 6ab8f225a..76cbab49b 100644 --- a/linode/images/framework_schema_datasource.go +++ b/linode/images/framework_schema_datasource.go @@ -2,8 +2,8 @@ package images import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/image" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/image" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/images/tmpl/template.go b/linode/images/tmpl/template.go index c9b95857e..c0c099a98 100644 --- a/linode/images/tmpl/template.go +++ b/linode/images/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instance/datasource.go b/linode/instance/datasource.go index 842305805..671762496 100644 --- a/linode/instance/datasource.go +++ b/linode/instance/datasource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var filterConfig = helper.FilterConfig{ diff --git a/linode/instance/datasource_test.go b/linode/instance/datasource_test.go index 5c6c1a8f9..1941719b9 100644 --- a/linode/instance/datasource_test.go +++ b/linode/instance/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/instance/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/instance/tmpl" ) func TestAccDataSourceInstances_basic(t *testing.T) { diff --git a/linode/instance/flatten.go b/linode/instance/flatten.go index ede353ef4..9e60c1ab6 100644 --- a/linode/instance/flatten.go +++ b/linode/instance/flatten.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func flattenInstance( diff --git a/linode/instance/helpers.go b/linode/instance/helpers.go index d6ddbcb39..847b11728 100644 --- a/linode/instance/helpers.go +++ b/linode/instance/helpers.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" "golang.org/x/crypto/sha3" ) diff --git a/linode/instance/resource.go b/linode/instance/resource.go index 6104b881f..ab72705fa 100644 --- a/linode/instance/resource.go +++ b/linode/instance/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/instance/resource_test.go b/linode/instance/resource_test.go index 80a9ebc43..4c8287722 100644 --- a/linode/instance/resource_test.go +++ b/linode/instance/resource_test.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/instance/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/instance/tmpl" ) var testRegion string diff --git a/linode/instance/schema_resource.go b/linode/instance/schema_resource.go index 7edc8d674..8f5364a4b 100644 --- a/linode/instance/schema_resource.go +++ b/linode/instance/schema_resource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const deviceDescription = "Device can be either a Disk or Volume identified by disk_id or " + diff --git a/linode/instance/tmpl/template.go b/linode/instance/tmpl/template.go index 23dd4c947..eaf15fb3d 100644 --- a/linode/instance/tmpl/template.go +++ b/linode/instance/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instanceconfig/helper.go b/linode/instanceconfig/helper.go index e41d5533b..32c0bc885 100644 --- a/linode/instanceconfig/helper.go +++ b/linode/instanceconfig/helper.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func getDeviceMapFields(deviceMap linodego.InstanceConfigDeviceMap) [][2]any { diff --git a/linode/instanceconfig/resource.go b/linode/instanceconfig/resource.go index ba64b80fc..805244e86 100644 --- a/linode/instanceconfig/resource.go +++ b/linode/instanceconfig/resource.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/instanceconfig/resource_test.go b/linode/instanceconfig/resource_test.go index 582ed0526..85fd459de 100644 --- a/linode/instanceconfig/resource_test.go +++ b/linode/instanceconfig/resource_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/instanceconfig/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/instanceconfig/tmpl" ) var testRegion string diff --git a/linode/instanceconfig/schema_resource.go b/linode/instanceconfig/schema_resource.go index 3583a628d..dcb73301d 100644 --- a/linode/instanceconfig/schema_resource.go +++ b/linode/instanceconfig/schema_resource.go @@ -3,7 +3,7 @@ package instanceconfig import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/instance" + "github.com/linode/terraform-provider-linode/v2/linode/instance" ) const deviceDescription = "Device can be either a Disk or Volume identified by disk_id or " + diff --git a/linode/instanceconfig/tmpl/template.go b/linode/instanceconfig/tmpl/template.go index 4e0ea45e1..3ddc5c8ab 100644 --- a/linode/instanceconfig/tmpl/template.go +++ b/linode/instanceconfig/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instancedisk/helper.go b/linode/instancedisk/helper.go index 746f015ff..65e13cac2 100644 --- a/linode/instancedisk/helper.go +++ b/linode/instancedisk/helper.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func expandStackScriptData(data any) map[string]string { diff --git a/linode/instancedisk/resource.go b/linode/instancedisk/resource.go index bc21027a3..32977d77f 100644 --- a/linode/instancedisk/resource.go +++ b/linode/instancedisk/resource.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/instancedisk/resource_test.go b/linode/instancedisk/resource_test.go index 48b86f835..26ee928a6 100644 --- a/linode/instancedisk/resource_test.go +++ b/linode/instancedisk/resource_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/instancedisk/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/instancedisk/tmpl" ) var testRegion string diff --git a/linode/instancedisk/schema_resource.go b/linode/instancedisk/schema_resource.go index fb53fbdfc..91623d1a8 100644 --- a/linode/instancedisk/schema_resource.go +++ b/linode/instancedisk/schema_resource.go @@ -3,7 +3,7 @@ package instancedisk import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceSchema = map[string]*schema.Schema{ diff --git a/linode/instancedisk/tmpl/template.go b/linode/instancedisk/tmpl/template.go index f557d475b..7e02c6ead 100644 --- a/linode/instancedisk/tmpl/template.go +++ b/linode/instancedisk/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instanceip/resource.go b/linode/instanceip/resource.go index 5ad1f2c50..6aa77a465 100644 --- a/linode/instanceip/resource.go +++ b/linode/instanceip/resource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/instanceip/resource_test.go b/linode/instanceip/resource_test.go index 132917045..5cb903c15 100644 --- a/linode/instanceip/resource_test.go +++ b/linode/instanceip/resource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/instanceip/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/instanceip/tmpl" ) const testInstanceIPResName = "linode_instance_ip.test" diff --git a/linode/instanceip/tmpl/template.go b/linode/instanceip/tmpl/template.go index 000fe4a77..c3ecfe8af 100644 --- a/linode/instanceip/tmpl/template.go +++ b/linode/instanceip/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instancenetworking/datasource_test.go b/linode/instancenetworking/datasource_test.go index c337d817b..101dacc0c 100644 --- a/linode/instancenetworking/datasource_test.go +++ b/linode/instancenetworking/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/instancenetworking/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/instancenetworking/tmpl" ) const testInstanceNetworkResName = "data.linode_instance_networking.test" diff --git a/linode/instancenetworking/framework_datasource.go b/linode/instancenetworking/framework_datasource.go index fa41b8dab..0a8c3c475 100644 --- a/linode/instancenetworking/framework_datasource.go +++ b/linode/instancenetworking/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/instancenetworking/tmpl/template.go b/linode/instancenetworking/tmpl/template.go index b21454eb8..a0a1fd728 100644 --- a/linode/instancenetworking/tmpl/template.go +++ b/linode/instancenetworking/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instancesharedips/resource.go b/linode/instancesharedips/resource.go index 686e3e490..94e296ba6 100644 --- a/linode/instancesharedips/resource.go +++ b/linode/instancesharedips/resource.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/instancesharedips/resource_test.go b/linode/instancesharedips/resource_test.go index 211a4655e..5c0255e6d 100644 --- a/linode/instancesharedips/resource_test.go +++ b/linode/instancesharedips/resource_test.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/instancesharedips" - "github.com/linode/terraform-provider-linode/linode/instancesharedips/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/instancesharedips" + "github.com/linode/terraform-provider-linode/v2/linode/instancesharedips/tmpl" ) const ( diff --git a/linode/instancesharedips/tmpl/template.go b/linode/instancesharedips/tmpl/template.go index d0e39037a..b4060ac9a 100644 --- a/linode/instancesharedips/tmpl/template.go +++ b/linode/instancesharedips/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instancetype/datasource_test.go b/linode/instancetype/datasource_test.go index 80f870580..e75d504a3 100644 --- a/linode/instancetype/datasource_test.go +++ b/linode/instancetype/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/instancetype/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/instancetype/tmpl" ) func TestAccDataSourceLinodeInstanceType_basic(t *testing.T) { diff --git a/linode/instancetype/framework_datasource.go b/linode/instancetype/framework_datasource.go index 254537c94..906bfb82c 100644 --- a/linode/instancetype/framework_datasource.go +++ b/linode/instancetype/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/instancetype/tmpl/template.go b/linode/instancetype/tmpl/template.go index 1732cfd94..e58f7c322 100644 --- a/linode/instancetype/tmpl/template.go +++ b/linode/instancetype/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/instancetypes/datasource_test.go b/linode/instancetypes/datasource_test.go index b60d5c3c6..f367b84fa 100644 --- a/linode/instancetypes/datasource_test.go +++ b/linode/instancetypes/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/instancetypes/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/instancetypes/tmpl" ) func TestAccDataSourceInstanceTypes_basic(t *testing.T) { diff --git a/linode/instancetypes/framework_datasource.go b/linode/instancetypes/framework_datasource.go index 6167b5bc6..b3e4c3127 100644 --- a/linode/instancetypes/framework_datasource.go +++ b/linode/instancetypes/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/instancetypes/framework_datasource_schema.go b/linode/instancetypes/framework_datasource_schema.go index fdb348191..047473341 100644 --- a/linode/instancetypes/framework_datasource_schema.go +++ b/linode/instancetypes/framework_datasource_schema.go @@ -2,8 +2,8 @@ package instancetypes import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/instancetype" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/instancetype" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/instancetypes/framework_models.go b/linode/instancetypes/framework_models.go index fb9fb8176..6dbfa8dbf 100644 --- a/linode/instancetypes/framework_models.go +++ b/linode/instancetypes/framework_models.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/instancetype" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/instancetype" ) type InstanceTypeFilterModel struct { diff --git a/linode/instancetypes/tmpl/template.go b/linode/instancetypes/tmpl/template.go index 43a585307..b58686152 100644 --- a/linode/instancetypes/tmpl/template.go +++ b/linode/instancetypes/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) func DataBasic(t *testing.T) string { diff --git a/linode/ipv6range/datasource_test.go b/linode/ipv6range/datasource_test.go index e94ea45e7..c819670cd 100644 --- a/linode/ipv6range/datasource_test.go +++ b/linode/ipv6range/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/ipv6range/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/ipv6range/tmpl" ) func TestAccDataSourceIPv6Range_basic(t *testing.T) { diff --git a/linode/ipv6range/framework_datasource.go b/linode/ipv6range/framework_datasource.go index d1422a697..d1133ff17 100644 --- a/linode/ipv6range/framework_datasource.go +++ b/linode/ipv6range/framework_datasource.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/ipv6range/framework_resource.go b/linode/ipv6range/framework_resource.go index 99398e5a6..99f0151fe 100644 --- a/linode/ipv6range/framework_resource.go +++ b/linode/ipv6range/framework_resource.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/ipv6range/resource_test.go b/linode/ipv6range/resource_test.go index 653e02ab2..7654e6df0 100644 --- a/linode/ipv6range/resource_test.go +++ b/linode/ipv6range/resource_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/ipv6range/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/ipv6range/tmpl" ) // TODO: don't hardcode this once IPv6 sharing has a proper capability string diff --git a/linode/ipv6range/tmpl/template.go b/linode/ipv6range/tmpl/template.go index 83a2fefd3..dc96e4fff 100644 --- a/linode/ipv6range/tmpl/template.go +++ b/linode/ipv6range/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/kernel/datasource_test.go b/linode/kernel/datasource_test.go index dac9c1784..198539c18 100644 --- a/linode/kernel/datasource_test.go +++ b/linode/kernel/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/kernel/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/kernel/tmpl" ) func TestAccDataSourceKernel_basic(t *testing.T) { diff --git a/linode/kernel/framework_datasource.go b/linode/kernel/framework_datasource.go index 2b8227659..72e0dc026 100644 --- a/linode/kernel/framework_datasource.go +++ b/linode/kernel/framework_datasource.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/kernel/tmpl/template.go b/linode/kernel/tmpl/template.go index c0e3219d3..8a8ea2843 100644 --- a/linode/kernel/tmpl/template.go +++ b/linode/kernel/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/kernels/datasource_test.go b/linode/kernels/datasource_test.go index 58836c49c..c0b2109d7 100644 --- a/linode/kernels/datasource_test.go +++ b/linode/kernels/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/kernels/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/kernels/tmpl" ) func TestAccDataSourceKernels_basic(t *testing.T) { diff --git a/linode/kernels/framework_datasource.go b/linode/kernels/framework_datasource.go index a098a7412..04d07692f 100644 --- a/linode/kernels/framework_datasource.go +++ b/linode/kernels/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/kernels/framework_datasource_schema.go b/linode/kernels/framework_datasource_schema.go index fd1ea5fa9..813f72997 100644 --- a/linode/kernels/framework_datasource_schema.go +++ b/linode/kernels/framework_datasource_schema.go @@ -2,8 +2,8 @@ package kernels import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/kernel" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/kernel" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/kernels/framework_models.go b/linode/kernels/framework_models.go index f0252a865..de8624b5f 100644 --- a/linode/kernels/framework_models.go +++ b/linode/kernels/framework_models.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/kernel" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/kernel" ) // KernelFilterModel describes the Terraform resource data model to match the diff --git a/linode/kernels/tmpl/template.go b/linode/kernels/tmpl/template.go index 9f53eddae..81bec797c 100644 --- a/linode/kernels/tmpl/template.go +++ b/linode/kernels/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/lke/cluster.go b/linode/lke/cluster.go index a9e699a1e..8396f2658 100644 --- a/linode/lke/cluster.go +++ b/linode/lke/cluster.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type NodePoolSpec struct { diff --git a/linode/lke/cluster_test.go b/linode/lke/cluster_test.go index c82891ae9..27e24a2e7 100644 --- a/linode/lke/cluster_test.go +++ b/linode/lke/cluster_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/lke" + "github.com/linode/terraform-provider-linode/v2/linode/lke" ) func TestReconcileLKENodePoolSpecs(t *testing.T) { diff --git a/linode/lke/datasource.go b/linode/lke/datasource.go index abbc4ba5a..6bedcca5d 100644 --- a/linode/lke/datasource.go +++ b/linode/lke/datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func DataSource() *schema.Resource { diff --git a/linode/lke/datasource_test.go b/linode/lke/datasource_test.go index 8649b321a..90acba6d4 100644 --- a/linode/lke/datasource_test.go +++ b/linode/lke/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/lke/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/lke/tmpl" ) const dataSourceClusterName = "data.linode_lke_cluster.test" diff --git a/linode/lke/resource.go b/linode/lke/resource.go index 690a39444..6aca64151 100644 --- a/linode/lke/resource.go +++ b/linode/lke/resource.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" k8scondition "github.com/linode/linodego/k8s/pkg/condition" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/lke/resource_test.go b/linode/lke/resource_test.go index 81e736078..d08693b96 100644 --- a/linode/lke/resource_test.go +++ b/linode/lke/resource_test.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/lke/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/lke/tmpl" ) var ( diff --git a/linode/lke/tmpl/template.go b/linode/lke/tmpl/template.go index e50976921..5f30cb0a1 100644 --- a/linode/lke/tmpl/template.go +++ b/linode/lke/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/lkeversions/datasource_test.go b/linode/lkeversions/datasource_test.go index f439aef76..e96a10eda 100644 --- a/linode/lkeversions/datasource_test.go +++ b/linode/lkeversions/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/lkeversions/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/lkeversions/tmpl" ) func TestAccDataSourceLinodeLkeVersions_basic(t *testing.T) { diff --git a/linode/lkeversions/framework_datasource.go b/linode/lkeversions/framework_datasource.go index 179cb1e76..89e07aad7 100644 --- a/linode/lkeversions/framework_datasource.go +++ b/linode/lkeversions/framework_datasource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/lkeversions/tmpl/template.go b/linode/lkeversions/tmpl/template.go index 47cdbc06e..3a9f98fcb 100644 --- a/linode/lkeversions/tmpl/template.go +++ b/linode/lkeversions/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) func DataBasic(t *testing.T) string { diff --git a/linode/nb/datasource_test.go b/linode/nb/datasource_test.go index ac5dc4d5a..cf2e4e94c 100644 --- a/linode/nb/datasource_test.go +++ b/linode/nb/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nb/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nb/tmpl" ) func TestAccDataSourceNodeBalancer_basic(t *testing.T) { diff --git a/linode/nb/framework_datasource.go b/linode/nb/framework_datasource.go index ab241083c..c2eb5e0e6 100644 --- a/linode/nb/framework_datasource.go +++ b/linode/nb/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/nb/framework_models.go b/linode/nb/framework_models.go index dd137e61b..00eece79b 100644 --- a/linode/nb/framework_models.go +++ b/linode/nb/framework_models.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // NodeBalancerModel describes the Terraform resource data model to match the diff --git a/linode/nb/framework_resource.go b/linode/nb/framework_resource.go index 5887af1a7..32cdf6685 100644 --- a/linode/nb/framework_resource.go +++ b/linode/nb/framework_resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var _ resource.ResourceWithUpgradeState = &Resource{} diff --git a/linode/nb/framework_resource_schema.go b/linode/nb/framework_resource_schema.go index 9f09e468e..0a21f2912 100644 --- a/linode/nb/framework_resource_schema.go +++ b/linode/nb/framework_resource_schema.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var frameworkResourceSchema = schema.Schema{ diff --git a/linode/nb/resource_test.go b/linode/nb/resource_test.go index 643ca1b2f..14e196b4b 100644 --- a/linode/nb/resource_test.go +++ b/linode/nb/resource_test.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/nb" - "github.com/linode/terraform-provider-linode/linode/nb/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/nb" + "github.com/linode/terraform-provider-linode/v2/linode/nb/tmpl" ) var testRegion string diff --git a/linode/nb/tmpl/template.go b/linode/nb/tmpl/template.go index 67342c534..fb30d92c9 100644 --- a/linode/nb/tmpl/template.go +++ b/linode/nb/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/nbconfig/datasource_test.go b/linode/nbconfig/datasource_test.go index 8b3105228..f87a99cb1 100644 --- a/linode/nbconfig/datasource_test.go +++ b/linode/nbconfig/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nbconfig/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nbconfig/tmpl" ) func TestAccDataSourceNodeBalancerConfig_basic(t *testing.T) { diff --git a/linode/nbconfig/framework_datasource.go b/linode/nbconfig/framework_datasource.go index 5a0af9d7e..a118d0219 100644 --- a/linode/nbconfig/framework_datasource.go +++ b/linode/nbconfig/framework_datasource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/nbconfig/resource.go b/linode/nbconfig/resource.go index 3bde72175..6e7f918f5 100644 --- a/linode/nbconfig/resource.go +++ b/linode/nbconfig/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func resourceStatus() *schema.Resource { diff --git a/linode/nbconfig/resource_test.go b/linode/nbconfig/resource_test.go index 458a882e3..796d2df6f 100644 --- a/linode/nbconfig/resource_test.go +++ b/linode/nbconfig/resource_test.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/nbconfig" - "github.com/linode/terraform-provider-linode/linode/nbconfig/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/nbconfig" + "github.com/linode/terraform-provider-linode/v2/linode/nbconfig/tmpl" ) var testRegion string diff --git a/linode/nbconfig/tmpl/template.go b/linode/nbconfig/tmpl/template.go index 1258f3d9f..3cd106276 100644 --- a/linode/nbconfig/tmpl/template.go +++ b/linode/nbconfig/tmpl/template.go @@ -3,8 +3,8 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - nodebalancer "github.com/linode/terraform-provider-linode/linode/nb/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + nodebalancer "github.com/linode/terraform-provider-linode/v2/linode/nb/tmpl" ) var ( diff --git a/linode/nbnode/datasource_test.go b/linode/nbnode/datasource_test.go index ea8ffdfb9..6d12e7a2b 100644 --- a/linode/nbnode/datasource_test.go +++ b/linode/nbnode/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nbnode/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nbnode/tmpl" ) func TestAccDataSourceNodeBalancerNode_basic(t *testing.T) { diff --git a/linode/nbnode/framework_datasource.go b/linode/nbnode/framework_datasource.go index b03345d19..b0b44a9d5 100644 --- a/linode/nbnode/framework_datasource.go +++ b/linode/nbnode/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/nbnode/resource.go b/linode/nbnode/resource.go index 515980749..ca7898865 100644 --- a/linode/nbnode/resource.go +++ b/linode/nbnode/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/nbnode/resource_test.go b/linode/nbnode/resource_test.go index e1f3bc17c..e06eb1140 100644 --- a/linode/nbnode/resource_test.go +++ b/linode/nbnode/resource_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nbnode/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nbnode/tmpl" ) var testRegion string diff --git a/linode/nbnode/tmpl/template.go b/linode/nbnode/tmpl/template.go index 735c1c5fc..e4c48ace5 100644 --- a/linode/nbnode/tmpl/template.go +++ b/linode/nbnode/tmpl/template.go @@ -3,9 +3,9 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nb/tmpl" - config "github.com/linode/terraform-provider-linode/linode/nbconfig/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nb/tmpl" + config "github.com/linode/terraform-provider-linode/v2/linode/nbconfig/tmpl" ) type TemplateData struct { diff --git a/linode/nbs/datasource_test.go b/linode/nbs/datasource_test.go index 2fef42a55..e59721e68 100644 --- a/linode/nbs/datasource_test.go +++ b/linode/nbs/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/nbs/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/nbs/tmpl" ) func TestAccDataSourceNodeBalancers_basic(t *testing.T) { diff --git a/linode/nbs/framework_datasource.go b/linode/nbs/framework_datasource.go index 64346c9ef..ba6607664 100644 --- a/linode/nbs/framework_datasource.go +++ b/linode/nbs/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/nbs/framework_models.go b/linode/nbs/framework_models.go index a96e40cdc..05460d9a0 100644 --- a/linode/nbs/framework_models.go +++ b/linode/nbs/framework_models.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/nb" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/nb" ) // NodeBalancerFilterModel describes the Terraform resource data model to match the diff --git a/linode/nbs/framework_schema_datasource.go b/linode/nbs/framework_schema_datasource.go index 90d5209bd..d177cefda 100644 --- a/linode/nbs/framework_schema_datasource.go +++ b/linode/nbs/framework_schema_datasource.go @@ -2,8 +2,8 @@ package nbs import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/nb" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/nb" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/nbs/tmpl/template.go b/linode/nbs/tmpl/template.go index fccbc91b1..2b94baa08 100644 --- a/linode/nbs/tmpl/template.go +++ b/linode/nbs/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/networkingip/datasource_test.go b/linode/networkingip/datasource_test.go index 9bdf5457b..d6b3f6762 100644 --- a/linode/networkingip/datasource_test.go +++ b/linode/networkingip/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/networkingip/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/networkingip/tmpl" ) var testRegion string diff --git a/linode/networkingip/framework_datasource.go b/linode/networkingip/framework_datasource.go index 0bcc6b245..8a9b3e175 100644 --- a/linode/networkingip/framework_datasource.go +++ b/linode/networkingip/framework_datasource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/networkingip/tmpl/template.go b/linode/networkingip/tmpl/template.go index 272df20ef..b0e78e177 100644 --- a/linode/networkingip/tmpl/template.go +++ b/linode/networkingip/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/obj/resource.go b/linode/obj/resource.go index c3d5cf412..c5b56fdca 100644 --- a/linode/obj/resource.go +++ b/linode/obj/resource.go @@ -16,7 +16,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func Resource() *schema.Resource { diff --git a/linode/obj/resource_test.go b/linode/obj/resource_test.go index 2af6c0cf9..83582af51 100644 --- a/linode/obj/resource_test.go +++ b/linode/obj/resource_test.go @@ -15,9 +15,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/obj/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/obj/tmpl" ) var testCluster string diff --git a/linode/obj/tmpl/template.go b/linode/obj/tmpl/template.go index 624d00b38..e32331ae1 100644 --- a/linode/obj/tmpl/template.go +++ b/linode/obj/tmpl/template.go @@ -3,9 +3,9 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - objectbucket "github.com/linode/terraform-provider-linode/linode/objbucket/tmpl" - objectkey "github.com/linode/terraform-provider-linode/linode/objkey/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + objectbucket "github.com/linode/terraform-provider-linode/v2/linode/objbucket/tmpl" + objectkey "github.com/linode/terraform-provider-linode/v2/linode/objkey/tmpl" ) type TemplateData struct { diff --git a/linode/objbucket/datasource_test.go b/linode/objbucket/datasource_test.go index 6c0bc5c35..5abb65230 100644 --- a/linode/objbucket/datasource_test.go +++ b/linode/objbucket/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/objbucket/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/objbucket/tmpl" ) func TestAccDataSourceBucket_basic(t *testing.T) { diff --git a/linode/objbucket/framework_datasource.go b/linode/objbucket/framework_datasource.go index fff7dbd90..eccafba15 100644 --- a/linode/objbucket/framework_datasource.go +++ b/linode/objbucket/framework_datasource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/objbucket/resource.go b/linode/objbucket/resource.go index f3758499b..2444d4800 100644 --- a/linode/objbucket/resource.go +++ b/linode/objbucket/resource.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func resourceLifecycleExpiration() *schema.Resource { diff --git a/linode/objbucket/resource_test.go b/linode/objbucket/resource_test.go index 7f1070b01..ce3680bf6 100644 --- a/linode/objbucket/resource_test.go +++ b/linode/objbucket/resource_test.go @@ -28,10 +28,10 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/objbucket" - "github.com/linode/terraform-provider-linode/linode/objbucket/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/objbucket" + "github.com/linode/terraform-provider-linode/v2/linode/objbucket/tmpl" ) const ( diff --git a/linode/objbucket/tmpl/template.go b/linode/objbucket/tmpl/template.go index 54a775adc..30fd47f2f 100644 --- a/linode/objbucket/tmpl/template.go +++ b/linode/objbucket/tmpl/template.go @@ -3,8 +3,8 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" - objkey "github.com/linode/terraform-provider-linode/linode/objkey/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + objkey "github.com/linode/terraform-provider-linode/v2/linode/objkey/tmpl" ) type TemplateData struct { diff --git a/linode/objcluster/datasource_test.go b/linode/objcluster/datasource_test.go index 1d71aa68d..f9ffa6b28 100644 --- a/linode/objcluster/datasource_test.go +++ b/linode/objcluster/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/objcluster/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/objcluster/tmpl" ) func TestAccDataSourceObjectCluster_basic(t *testing.T) { diff --git a/linode/objcluster/framework_datasource.go b/linode/objcluster/framework_datasource.go index 72e563d2f..1dc597732 100644 --- a/linode/objcluster/framework_datasource.go +++ b/linode/objcluster/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/objcluster/tmpl/template.go b/linode/objcluster/tmpl/template.go index 0cee59c95..71c424343 100644 --- a/linode/objcluster/tmpl/template.go +++ b/linode/objcluster/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/objkey/framework_resource.go b/linode/objkey/framework_resource.go index ffb05f22f..e9310a74c 100644 --- a/linode/objkey/framework_resource.go +++ b/linode/objkey/framework_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/objkey/resource_test.go b/linode/objkey/resource_test.go index 4bac85dca..86cbc2b8f 100644 --- a/linode/objkey/resource_test.go +++ b/linode/objkey/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/objkey/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/objkey/tmpl" ) var testCluster string diff --git a/linode/objkey/tmpl/template.go b/linode/objkey/tmpl/template.go index c237ecc01..62bc07b3f 100644 --- a/linode/objkey/tmpl/template.go +++ b/linode/objkey/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/profile/datasource_test.go b/linode/profile/datasource_test.go index 033408766..ea34197a6 100644 --- a/linode/profile/datasource_test.go +++ b/linode/profile/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/profile/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/profile/tmpl" ) func TestAccDataSourceProfile_basic(t *testing.T) { diff --git a/linode/profile/framework_datasource.go b/linode/profile/framework_datasource.go index d8c42ae71..b8ead7227 100644 --- a/linode/profile/framework_datasource.go +++ b/linode/profile/framework_datasource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/profile/tmpl/template.go b/linode/profile/tmpl/template.go index a5f6031a9..447257965 100644 --- a/linode/profile/tmpl/template.go +++ b/linode/profile/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct{} diff --git a/linode/provider.go b/linode/provider.go index 70acc2cbe..2c80b06cc 100644 --- a/linode/provider.go +++ b/linode/provider.go @@ -10,28 +10,28 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/databaseaccesscontrols" - "github.com/linode/terraform-provider-linode/linode/databasemysql" - "github.com/linode/terraform-provider-linode/linode/databasemysqlbackups" - "github.com/linode/terraform-provider-linode/linode/databasepostgresql" - "github.com/linode/terraform-provider-linode/linode/domain" - "github.com/linode/terraform-provider-linode/linode/domainrecord" - "github.com/linode/terraform-provider-linode/linode/firewall" - "github.com/linode/terraform-provider-linode/linode/firewalldevice" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/image" - "github.com/linode/terraform-provider-linode/linode/instance" - "github.com/linode/terraform-provider-linode/linode/instanceconfig" - "github.com/linode/terraform-provider-linode/linode/instancedisk" - "github.com/linode/terraform-provider-linode/linode/instanceip" - "github.com/linode/terraform-provider-linode/linode/instancesharedips" - "github.com/linode/terraform-provider-linode/linode/lke" - "github.com/linode/terraform-provider-linode/linode/nbconfig" - "github.com/linode/terraform-provider-linode/linode/nbnode" - "github.com/linode/terraform-provider-linode/linode/obj" - "github.com/linode/terraform-provider-linode/linode/objbucket" - "github.com/linode/terraform-provider-linode/linode/user" - "github.com/linode/terraform-provider-linode/linode/volume" + "github.com/linode/terraform-provider-linode/v2/linode/databaseaccesscontrols" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysql" + "github.com/linode/terraform-provider-linode/v2/linode/databasemysqlbackups" + "github.com/linode/terraform-provider-linode/v2/linode/databasepostgresql" + "github.com/linode/terraform-provider-linode/v2/linode/domain" + "github.com/linode/terraform-provider-linode/v2/linode/domainrecord" + "github.com/linode/terraform-provider-linode/v2/linode/firewall" + "github.com/linode/terraform-provider-linode/v2/linode/firewalldevice" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/image" + "github.com/linode/terraform-provider-linode/v2/linode/instance" + "github.com/linode/terraform-provider-linode/v2/linode/instanceconfig" + "github.com/linode/terraform-provider-linode/v2/linode/instancedisk" + "github.com/linode/terraform-provider-linode/v2/linode/instanceip" + "github.com/linode/terraform-provider-linode/v2/linode/instancesharedips" + "github.com/linode/terraform-provider-linode/v2/linode/lke" + "github.com/linode/terraform-provider-linode/v2/linode/nbconfig" + "github.com/linode/terraform-provider-linode/v2/linode/nbnode" + "github.com/linode/terraform-provider-linode/v2/linode/obj" + "github.com/linode/terraform-provider-linode/v2/linode/objbucket" + "github.com/linode/terraform-provider-linode/v2/linode/user" + "github.com/linode/terraform-provider-linode/v2/linode/volume" ) // Provider creates and manages the resources in a Linode configuration. diff --git a/linode/provider_test.go b/linode/provider_test.go index 2a69878b6..9485a3abf 100644 --- a/linode/provider_test.go +++ b/linode/provider_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func TestAccProvider_Overrides(t *testing.T) { diff --git a/linode/rdns/framework_models.go b/linode/rdns/framework_models.go index be5e5857e..9b2bf807f 100644 --- a/linode/rdns/framework_models.go +++ b/linode/rdns/framework_models.go @@ -3,7 +3,7 @@ package rdns import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" ) type ResourceModel struct { diff --git a/linode/rdns/framework_models_unit_test.go b/linode/rdns/framework_models_unit_test.go index d0676764f..ec1577ce4 100644 --- a/linode/rdns/framework_models_unit_test.go +++ b/linode/rdns/framework_models_unit_test.go @@ -5,7 +5,7 @@ package rdns import ( "testing" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" diff --git a/linode/rdns/framework_resource.go b/linode/rdns/framework_resource.go index 2a34c33cc..876fc71ef 100644 --- a/linode/rdns/framework_resource.go +++ b/linode/rdns/framework_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/rdns/framework_resource_schema.go b/linode/rdns/framework_resource_schema.go index 54416a602..62c9c4444 100644 --- a/linode/rdns/framework_resource_schema.go +++ b/linode/rdns/framework_resource_schema.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" ) var frameworkResourceSchema = schema.Schema{ diff --git a/linode/rdns/resource_test.go b/linode/rdns/resource_test.go index e7fad8925..0ea7690ad 100644 --- a/linode/rdns/resource_test.go +++ b/linode/rdns/resource_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/rdns/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/rdns/tmpl" ) var testRegion string diff --git a/linode/rdns/tmpl/template.go b/linode/rdns/tmpl/template.go index f3cbfbdce..e93a6a629 100644 --- a/linode/rdns/tmpl/template.go +++ b/linode/rdns/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/region/datasource_test.go b/linode/region/datasource_test.go index 76bb06c00..6aeaa2d39 100644 --- a/linode/region/datasource_test.go +++ b/linode/region/datasource_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/region/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/region/tmpl" ) var ( diff --git a/linode/region/framework_datasource.go b/linode/region/framework_datasource.go index c372d04c0..7d75999ce 100644 --- a/linode/region/framework_datasource.go +++ b/linode/region/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/region/framework_models.go b/linode/region/framework_models.go index cb138af07..13d31a037 100644 --- a/linode/region/framework_models.go +++ b/linode/region/framework_models.go @@ -3,7 +3,7 @@ package region import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) // RegionResolversModel represents a region's resolver. diff --git a/linode/region/tmpl/template.go b/linode/region/tmpl/template.go index 7ca799ab5..1c4432ef1 100644 --- a/linode/region/tmpl/template.go +++ b/linode/region/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/regions/datasource_test.go b/linode/regions/datasource_test.go index f01476868..c3053fd92 100644 --- a/linode/regions/datasource_test.go +++ b/linode/regions/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/regions/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/regions/tmpl" ) func TestAccDataSourceRegions_basic_smoke(t *testing.T) { diff --git a/linode/regions/framework_datasource.go b/linode/regions/framework_datasource.go index efd796766..271836617 100644 --- a/linode/regions/framework_datasource.go +++ b/linode/regions/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/regions/framework_datasource_schema.go b/linode/regions/framework_datasource_schema.go index a48221b85..5aab740fe 100644 --- a/linode/regions/framework_datasource_schema.go +++ b/linode/regions/framework_datasource_schema.go @@ -3,7 +3,7 @@ package regions import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/regions/framework_models.go b/linode/regions/framework_models.go index 8cf0d86f8..080c3adee 100644 --- a/linode/regions/framework_models.go +++ b/linode/regions/framework_models.go @@ -3,7 +3,7 @@ package regions import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) // RegionResolversModel represents a region's resolver. diff --git a/linode/regions/tmpl/template.go b/linode/regions/tmpl/template.go index 7add9f9cd..26673288a 100644 --- a/linode/regions/tmpl/template.go +++ b/linode/regions/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/sshkey/datasource_test.go b/linode/sshkey/datasource_test.go index 2bcec993f..1093183ce 100644 --- a/linode/sshkey/datasource_test.go +++ b/linode/sshkey/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/sshkey/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey/tmpl" ) func TestAccDataSourceSSHKey_basic(t *testing.T) { diff --git a/linode/sshkey/framework_datasource.go b/linode/sshkey/framework_datasource.go index 35a1bb038..a95807f1c 100644 --- a/linode/sshkey/framework_datasource.go +++ b/linode/sshkey/framework_datasource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/sshkey/framework_resource.go b/linode/sshkey/framework_resource.go index 028bb0446..2bc71b32f 100644 --- a/linode/sshkey/framework_resource.go +++ b/linode/sshkey/framework_resource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/sshkey/resource_test.go b/linode/sshkey/resource_test.go index 2daafa004..be5ab727a 100644 --- a/linode/sshkey/resource_test.go +++ b/linode/sshkey/resource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/sshkey/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey/tmpl" ) func init() { diff --git a/linode/sshkey/tmpl/template.go b/linode/sshkey/tmpl/template.go index 3680e6847..74a8984a7 100644 --- a/linode/sshkey/tmpl/template.go +++ b/linode/sshkey/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/sshkeys/datasource_test.go b/linode/sshkeys/datasource_test.go index 9c44de583..15e381124 100644 --- a/linode/sshkeys/datasource_test.go +++ b/linode/sshkeys/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/sshkeys/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/sshkeys/tmpl" ) func TestAccDataSourceSSHKeys_basic(t *testing.T) { diff --git a/linode/sshkeys/framework_datasource.go b/linode/sshkeys/framework_datasource.go index f2cb6ca39..517806687 100644 --- a/linode/sshkeys/framework_datasource.go +++ b/linode/sshkeys/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/sshkeys/framework_datasource_schema.go b/linode/sshkeys/framework_datasource_schema.go index b935c2e81..b2393fb43 100644 --- a/linode/sshkeys/framework_datasource_schema.go +++ b/linode/sshkeys/framework_datasource_schema.go @@ -2,9 +2,9 @@ package sshkeys import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/sshkey" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/sshkeys/framework_models.go b/linode/sshkeys/framework_models.go index e4f5e2a7b..bcd2f8279 100644 --- a/linode/sshkeys/framework_models.go +++ b/linode/sshkeys/framework_models.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/sshkey" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey" ) // NodeBalancerFilterModel describes the Terraform resource data model to match the diff --git a/linode/sshkeys/framework_models_unit_test.go b/linode/sshkeys/framework_models_unit_test.go index e0cefaff0..a1bdc6729 100644 --- a/linode/sshkeys/framework_models_unit_test.go +++ b/linode/sshkeys/framework_models_unit_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/sshkey" + "github.com/linode/terraform-provider-linode/v2/linode/sshkey" "github.com/stretchr/testify/assert" ) diff --git a/linode/sshkeys/tmpl/template.go b/linode/sshkeys/tmpl/template.go index 309f70d6e..c72e8536e 100644 --- a/linode/sshkeys/tmpl/template.go +++ b/linode/sshkeys/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/stackscript/datasource_test.go b/linode/stackscript/datasource_test.go index c57a9e7c4..d1cabd3e6 100644 --- a/linode/stackscript/datasource_test.go +++ b/linode/stackscript/datasource_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/stackscript/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/stackscript/tmpl" ) var basicStackScript = `#!/bin/bash diff --git a/linode/stackscript/framework_datasource.go b/linode/stackscript/framework_datasource.go index 8c6df2a04..88a8a13f7 100644 --- a/linode/stackscript/framework_datasource.go +++ b/linode/stackscript/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/stackscript/framework_resource.go b/linode/stackscript/framework_resource.go index 227cbb2a4..2899b47c5 100644 --- a/linode/stackscript/framework_resource.go +++ b/linode/stackscript/framework_resource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/stackscript/resource_test.go b/linode/stackscript/resource_test.go index 7e7418734..f1371091a 100644 --- a/linode/stackscript/resource_test.go +++ b/linode/stackscript/resource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/stackscript/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/stackscript/tmpl" ) func init() { diff --git a/linode/stackscript/tmpl/template.go b/linode/stackscript/tmpl/template.go index cbcfdc7db..9759c8790 100644 --- a/linode/stackscript/tmpl/template.go +++ b/linode/stackscript/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/stackscripts/datasource_test.go b/linode/stackscripts/datasource_test.go index 2b325e77a..05c866322 100644 --- a/linode/stackscripts/datasource_test.go +++ b/linode/stackscripts/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/stackscripts/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/stackscripts/tmpl" ) var basicStackScript = `#!/bin/bash diff --git a/linode/stackscripts/framework_datasource.go b/linode/stackscripts/framework_datasource.go index 73fd8838f..db9450637 100644 --- a/linode/stackscripts/framework_datasource.go +++ b/linode/stackscripts/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/stackscripts/framework_models.go b/linode/stackscripts/framework_models.go index d796d8786..7286c0b3f 100644 --- a/linode/stackscripts/framework_models.go +++ b/linode/stackscripts/framework_models.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/stackscript" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/stackscript" ) // StackscriptFilterModel describes the Terraform resource data model to match the diff --git a/linode/stackscripts/framework_schema_datasource.go b/linode/stackscripts/framework_schema_datasource.go index 5c609273f..035512458 100644 --- a/linode/stackscripts/framework_schema_datasource.go +++ b/linode/stackscripts/framework_schema_datasource.go @@ -2,8 +2,8 @@ package stackscripts import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/stackscript" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/stackscript" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/stackscripts/tmpl/template.go b/linode/stackscripts/tmpl/template.go index 266f4b46c..de24e507b 100644 --- a/linode/stackscripts/tmpl/template.go +++ b/linode/stackscripts/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/token/framework_model.go b/linode/token/framework_model.go index 4cb583e61..51cb95573 100644 --- a/linode/token/framework_model.go +++ b/linode/token/framework_model.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" ) // ResourceModel describes the Terraform resource rm model to match the diff --git a/linode/token/framework_models_unit_test.go b/linode/token/framework_models_unit_test.go index 341af8430..46531eda9 100644 --- a/linode/token/framework_models_unit_test.go +++ b/linode/token/framework_models_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" "github.com/stretchr/testify/assert" ) diff --git a/linode/token/framework_resource.go b/linode/token/framework_resource.go index d896006ad..85e453289 100644 --- a/linode/token/framework_resource.go +++ b/linode/token/framework_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/token/framework_resource_schema.go b/linode/token/framework_resource_schema.go index df2f1f3ba..25ec689b9 100644 --- a/linode/token/framework_resource_schema.go +++ b/linode/token/framework_resource_schema.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/customtypes" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/customtypes" ) const ( diff --git a/linode/token/resource_test.go b/linode/token/resource_test.go index 619222707..46f364f05 100644 --- a/linode/token/resource_test.go +++ b/linode/token/resource_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/token/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/token/tmpl" ) func init() { diff --git a/linode/token/tmpl/template.go b/linode/token/tmpl/template.go index a79d91c7e..8ee94a30a 100644 --- a/linode/token/tmpl/template.go +++ b/linode/token/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/user/datasource_test.go b/linode/user/datasource_test.go index 6033b6391..f52615b56 100644 --- a/linode/user/datasource_test.go +++ b/linode/user/datasource_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/user/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/user/tmpl" ) func TestAccDataSourceUser_basic(t *testing.T) { diff --git a/linode/user/framework_datasource.go b/linode/user/framework_datasource.go index 1232400f3..e7d9e7a3f 100644 --- a/linode/user/framework_datasource.go +++ b/linode/user/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/user/resource.go b/linode/user/resource.go index 9f1832e72..3bb79814b 100644 --- a/linode/user/resource.go +++ b/linode/user/resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) var resourceLinodeUserGrantFields = []string{ diff --git a/linode/user/resource_test.go b/linode/user/resource_test.go index f218ab8d5..ed80e638e 100644 --- a/linode/user/resource_test.go +++ b/linode/user/resource_test.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/user/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/user/tmpl" ) const testUserResName = "linode_user.test" diff --git a/linode/user/tmpl/template.go b/linode/user/tmpl/template.go index 5e57f3b2f..ce51c5d15 100644 --- a/linode/user/tmpl/template.go +++ b/linode/user/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/users/datasource_test.go b/linode/users/datasource_test.go index c4da179f4..f828d14d5 100644 --- a/linode/users/datasource_test.go +++ b/linode/users/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/users/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/users/tmpl" ) func TestAccDataSourceUsers_basic(t *testing.T) { diff --git a/linode/users/framework_datasource.go b/linode/users/framework_datasource.go index d7fdc117e..dc58938da 100644 --- a/linode/users/framework_datasource.go +++ b/linode/users/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/users/framework_datasource_schema.go b/linode/users/framework_datasource_schema.go index ba5b29b73..83c2404db 100644 --- a/linode/users/framework_datasource_schema.go +++ b/linode/users/framework_datasource_schema.go @@ -2,8 +2,8 @@ package users import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/user" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/user" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/users/framework_models.go b/linode/users/framework_models.go index 3355e61e0..263e11087 100644 --- a/linode/users/framework_models.go +++ b/linode/users/framework_models.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/user" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/user" ) // UserFilterModel describes the Terraform resource data model to match the diff --git a/linode/users/tmpl/template.go b/linode/users/tmpl/template.go index 0445ba272..67848ce8a 100644 --- a/linode/users/tmpl/template.go +++ b/linode/users/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/vlan/datasource_test.go b/linode/vlan/datasource_test.go index 3bd884d0b..c1e7ebe82 100644 --- a/linode/vlan/datasource_test.go +++ b/linode/vlan/datasource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/vlan/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/vlan/tmpl" ) var testRegion string diff --git a/linode/vlan/framework_datasource.go b/linode/vlan/framework_datasource.go index 34c68f130..515937ce3 100644 --- a/linode/vlan/framework_datasource.go +++ b/linode/vlan/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type DataSource struct { diff --git a/linode/vlan/framework_model.go b/linode/vlan/framework_model.go index e447660ee..38b7408ef 100644 --- a/linode/vlan/framework_model.go +++ b/linode/vlan/framework_model.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) type VLANModel struct { diff --git a/linode/vlan/framework_schema_datasource.go b/linode/vlan/framework_schema_datasource.go index 875c6e6a4..664e2a2a4 100644 --- a/linode/vlan/framework_schema_datasource.go +++ b/linode/vlan/framework_schema_datasource.go @@ -3,8 +3,8 @@ package vlan import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/vlan/tmpl/template.go b/linode/vlan/tmpl/template.go index e42ad830f..96b215cc1 100644 --- a/linode/vlan/tmpl/template.go +++ b/linode/vlan/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/volume/datasource_test.go b/linode/volume/datasource_test.go index 1a41bfda2..247c3f3bb 100644 --- a/linode/volume/datasource_test.go +++ b/linode/volume/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/volume/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/volume/tmpl" ) func TestAccDataSourceVolume_basic(t *testing.T) { diff --git a/linode/volume/framework_datasource.go b/linode/volume/framework_datasource.go index 71b0d018e..e6e1a453a 100644 --- a/linode/volume/framework_datasource.go +++ b/linode/volume/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/path" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/volume/framework_model.go b/linode/volume/framework_model.go index a518a47ea..c7eae37ca 100644 --- a/linode/volume/framework_model.go +++ b/linode/volume/framework_model.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) type VolumeModel struct { diff --git a/linode/volume/resource.go b/linode/volume/resource.go index 5133489c7..eecda36a1 100644 --- a/linode/volume/resource.go +++ b/linode/volume/resource.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) const ( diff --git a/linode/volume/resource_test.go b/linode/volume/resource_test.go index 57f05f730..530fcd432 100644 --- a/linode/volume/resource_test.go +++ b/linode/volume/resource_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/volume" - "github.com/linode/terraform-provider-linode/linode/volume/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/volume" + "github.com/linode/terraform-provider-linode/v2/linode/volume/tmpl" ) var testRegion string diff --git a/linode/volume/tmpl/template.go b/linode/volume/tmpl/template.go index 4d97bfcf2..52243497d 100644 --- a/linode/volume/tmpl/template.go +++ b/linode/volume/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/volumes/datasource_test.go b/linode/volumes/datasource_test.go index 235408223..c31a537d5 100644 --- a/linode/volumes/datasource_test.go +++ b/linode/volumes/datasource_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/volumes/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/volumes/tmpl" ) var testRegion string diff --git a/linode/volumes/framework_datasource.go b/linode/volumes/framework_datasource.go index 9c08def39..6d11691be 100644 --- a/linode/volumes/framework_datasource.go +++ b/linode/volumes/framework_datasource.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/volumes/framework_models.go b/linode/volumes/framework_models.go index ef7d59df7..ce85e7885 100644 --- a/linode/volumes/framework_models.go +++ b/linode/volumes/framework_models.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/volume" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/volume" ) type VolumeFilterModel struct { diff --git a/linode/volumes/framework_schema_datasource.go b/linode/volumes/framework_schema_datasource.go index ae9eea0da..1c87c1431 100644 --- a/linode/volumes/framework_schema_datasource.go +++ b/linode/volumes/framework_schema_datasource.go @@ -2,8 +2,8 @@ package volumes import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/volume" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/volume" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/volumes/tmpl/template.go b/linode/volumes/tmpl/template.go index 56f2df958..b08e6e718 100644 --- a/linode/volumes/tmpl/template.go +++ b/linode/volumes/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/vpc/datasource_test.go b/linode/vpc/datasource_test.go index d9cf7e478..166906152 100644 --- a/linode/vpc/datasource_test.go +++ b/linode/vpc/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/vpc/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/vpc/tmpl" ) func TestAccDataSourceVPC_basic(t *testing.T) { diff --git a/linode/vpc/framework_datasource.go b/linode/vpc/framework_datasource.go index 3b585d8f8..bb6140e6a 100644 --- a/linode/vpc/framework_datasource.go +++ b/linode/vpc/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/vpc/framework_resource.go b/linode/vpc/framework_resource.go index ec83051cd..793456b04 100644 --- a/linode/vpc/framework_resource.go +++ b/linode/vpc/framework_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/vpc/resource_test.go b/linode/vpc/resource_test.go index 98150dcda..ef0a2f1b3 100644 --- a/linode/vpc/resource_test.go +++ b/linode/vpc/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/vpc/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/vpc/tmpl" ) var testRegion string diff --git a/linode/vpc/tmpl/template.go b/linode/vpc/tmpl/template.go index d12710956..a5ad0b538 100644 --- a/linode/vpc/tmpl/template.go +++ b/linode/vpc/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/vpcs/datasource_test.go b/linode/vpcs/datasource_test.go index 8b0fe4ac3..6a6a40e61 100644 --- a/linode/vpcs/datasource_test.go +++ b/linode/vpcs/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/vpcs/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/vpcs/tmpl" ) func TestAccDataSourceVPCs_basic_smoke(t *testing.T) { diff --git a/linode/vpcs/framework_datasource.go b/linode/vpcs/framework_datasource.go index 41abd394a..7a8178016 100644 --- a/linode/vpcs/framework_datasource.go +++ b/linode/vpcs/framework_datasource.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/vpcs/framework_models.go b/linode/vpcs/framework_models.go index 821c4f6cc..e827baf2b 100644 --- a/linode/vpcs/framework_models.go +++ b/linode/vpcs/framework_models.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/vpc" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/vpc" ) // VPCFilterModel describes the Terraform resource data model to match the diff --git a/linode/vpcs/framework_schema_datasource.go b/linode/vpcs/framework_schema_datasource.go index f2d854a91..73db7da55 100644 --- a/linode/vpcs/framework_schema_datasource.go +++ b/linode/vpcs/framework_schema_datasource.go @@ -2,8 +2,8 @@ package vpcs import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/vpc" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/vpc" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/vpcs/tmpl/template.go b/linode/vpcs/tmpl/template.go index fc040eee5..7229cc149 100644 --- a/linode/vpcs/tmpl/template.go +++ b/linode/vpcs/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/vpcsubnet/datasource_test.go b/linode/vpcsubnet/datasource_test.go index a2bb9c343..3cc9311e4 100644 --- a/linode/vpcsubnet/datasource_test.go +++ b/linode/vpcsubnet/datasource_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/vpcsubnet/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet/tmpl" ) func TestAccDataSourceVPCSubnet_basic(t *testing.T) { diff --git a/linode/vpcsubnet/framework_datasource.go b/linode/vpcsubnet/framework_datasource.go index 6c8157488..156ab6d46 100644 --- a/linode/vpcsubnet/framework_datasource.go +++ b/linode/vpcsubnet/framework_datasource.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/datasource" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/vpcsubnet/framework_resource.go b/linode/vpcsubnet/framework_resource.go index 0713e8581..8cb45310a 100644 --- a/linode/vpcsubnet/framework_resource.go +++ b/linode/vpcsubnet/framework_resource.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewResource() resource.Resource { diff --git a/linode/vpcsubnet/resource_test.go b/linode/vpcsubnet/resource_test.go index c1f298fae..c1b757d03 100644 --- a/linode/vpcsubnet/resource_test.go +++ b/linode/vpcsubnet/resource_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/helper" - "github.com/linode/terraform-provider-linode/linode/vpcsubnet/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet/tmpl" ) var testRegion string diff --git a/linode/vpcsubnet/tmpl/template.go b/linode/vpcsubnet/tmpl/template.go index 7d9d927df..2f8d595ff 100644 --- a/linode/vpcsubnet/tmpl/template.go +++ b/linode/vpcsubnet/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/linode/vpcsubnets/datasource_test.go b/linode/vpcsubnets/datasource_test.go index 2a70709f4..d5cac45e7 100644 --- a/linode/vpcsubnets/datasource_test.go +++ b/linode/vpcsubnets/datasource_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/linode/terraform-provider-linode/linode/acceptance" - "github.com/linode/terraform-provider-linode/linode/vpcsubnets/tmpl" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnets/tmpl" ) func TestAccDataSourceVPCSubnets_basic_smoke(t *testing.T) { diff --git a/linode/vpcsubnets/framework_datasource.go b/linode/vpcsubnets/framework_datasource.go index f5d74624e..5033a10e1 100644 --- a/linode/vpcsubnets/framework_datasource.go +++ b/linode/vpcsubnets/framework_datasource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper" + "github.com/linode/terraform-provider-linode/v2/linode/helper" ) func NewDataSource() datasource.DataSource { diff --git a/linode/vpcsubnets/framework_models.go b/linode/vpcsubnets/framework_models.go index 5d479f6eb..f876bd35a 100644 --- a/linode/vpcsubnets/framework_models.go +++ b/linode/vpcsubnets/framework_models.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/linode/linodego" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/vpcsubnet" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet" ) // VPCSubnetFilterModel describes the Terraform resource data model to match the diff --git a/linode/vpcsubnets/framework_schema_datasource.go b/linode/vpcsubnets/framework_schema_datasource.go index 7ecb619d8..22c8b4c83 100644 --- a/linode/vpcsubnets/framework_schema_datasource.go +++ b/linode/vpcsubnets/framework_schema_datasource.go @@ -3,8 +3,8 @@ package vpcsubnets import ( "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" - "github.com/linode/terraform-provider-linode/linode/helper/frameworkfilter" - "github.com/linode/terraform-provider-linode/linode/vpcsubnet" + "github.com/linode/terraform-provider-linode/v2/linode/helper/frameworkfilter" + "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet" ) var filterConfig = frameworkfilter.Config{ diff --git a/linode/vpcsubnets/tmpl/template.go b/linode/vpcsubnets/tmpl/template.go index 09b930060..25fb34b8e 100644 --- a/linode/vpcsubnets/tmpl/template.go +++ b/linode/vpcsubnets/tmpl/template.go @@ -3,7 +3,7 @@ package tmpl import ( "testing" - "github.com/linode/terraform-provider-linode/linode/acceptance" + "github.com/linode/terraform-provider-linode/v2/linode/acceptance" ) type TemplateData struct { diff --git a/main.go b/main.go index 1a0117b39..d041ecb86 100644 --- a/main.go +++ b/main.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server" "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" - "github.com/linode/terraform-provider-linode/linode" - "github.com/linode/terraform-provider-linode/version" + "github.com/linode/terraform-provider-linode/v2/linode" + "github.com/linode/terraform-provider-linode/v2/version" ) func main() { From 8447e4fd101131b4da2ec81dc238f7a9148eb616 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:45:19 -0500 Subject: [PATCH 02/12] build(deps): bump github.com/aws/aws-sdk-go from 1.47.0 to 1.48.5 (#1160) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.47.0 to 1.48.5. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.47.0...v1.48.5) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d489ac9f5..88592a6e4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/linode/terraform-provider-linode/v2 go 1.20 require ( - github.com/aws/aws-sdk-go v1.47.0 + github.com/aws/aws-sdk-go v1.48.5 github.com/go-resty/resty/v2 v2.9.1 github.com/google/go-cmp v0.6.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 diff --git a/go.sum b/go.sum index d8ac71665..72464762a 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/aws/aws-sdk-go v1.47.0 h1:/JUg9V1+xh+qBn8A6ec/l15ETPaMaBqxkjz+gg63dNk= -github.com/aws/aws-sdk-go v1.47.0/go.mod h1:DlEaEbWKZmsITVbqlSVvekPARM1HzeV9PMYg15ymSDA= +github.com/aws/aws-sdk-go v1.48.5 h1:cp3inTx9trQNCNZV/Id5S5egpilBXKdF32uKtb1LszI= +github.com/aws/aws-sdk-go v1.48.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= From edf11e4d755840b6eb81c2914d78efc07cb33b2c Mon Sep 17 00:00:00 2001 From: Lena Garber <114949949+lgarber-akamai@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:28:51 -0500 Subject: [PATCH 03/12] Add retry for all LKE tests (#1147) --- linode/accountsettings/datasource_test.go | 2 + linode/lke/datasource_test.go | 154 +++---- linode/lke/resource_test.go | 508 +++++++++++----------- 3 files changed, 343 insertions(+), 321 deletions(-) diff --git a/linode/accountsettings/datasource_test.go b/linode/accountsettings/datasource_test.go index f46531f01..9d633bc55 100644 --- a/linode/accountsettings/datasource_test.go +++ b/linode/accountsettings/datasource_test.go @@ -13,6 +13,8 @@ import ( ) func TestAccDataSourceLinodeAccountSettings_basic(t *testing.T) { + acceptance.OptInTest(t) + t.Parallel() resourceName := "data.linode_account_settings.foobar" diff --git a/linode/lke/datasource_test.go b/linode/lke/datasource_test.go index 90acba6d4..a8f869885 100644 --- a/linode/lke/datasource_test.go +++ b/linode/lke/datasource_test.go @@ -16,95 +16,101 @@ const dataSourceClusterName = "data.linode_lke_cluster.test" func TestAccDataSourceLKECluster_basic(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.DataBasic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), - resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), - resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "3"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "3"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.autoscaler.#", "0"), - resource.TestCheckResourceAttr(dataSourceClusterName, "control_plane.0.high_availability", "false"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "dashboard_url"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.DataBasic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), + resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), + resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "3"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "3"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.autoscaler.#", "0"), + resource.TestCheckResourceAttr(dataSourceClusterName, "control_plane.0.high_availability", "false"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "dashboard_url"), + ), + }, }, - }, + }) }) } func TestAccDataSourceLKECluster_autoscaler(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.DataAutoscaler(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), - resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), - resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "3"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "3"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.DataAutoscaler(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), + resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), + resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "3"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "3"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "5"), - ), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "5"), + ), + }, }, - }, + }) }) } func TestAccDataSourceLKECluster_controlPlane(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.DataControlPlane(t, clusterName, k8sVersionLatest, testRegion, true), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), - resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), - resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "1"), - resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.autoscaler.#", "0"), - resource.TestCheckResourceAttr(dataSourceClusterName, "control_plane.0.high_availability", "true"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), - resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.DataControlPlane(t, clusterName, k8sVersionLatest, testRegion, true), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(dataSourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(dataSourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(dataSourceClusterName, "k8s_version", k8sVersionLatest), + resource.TestCheckResourceAttr(dataSourceClusterName, "status", "ready"), + resource.TestCheckResourceAttr(dataSourceClusterName, "tags.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.type", "g6-standard-2"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.count", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.nodes.#", "1"), + resource.TestCheckResourceAttr(dataSourceClusterName, "pools.0.autoscaler.#", "0"), + resource.TestCheckResourceAttr(dataSourceClusterName, "control_plane.0.high_availability", "true"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "pools.0.id"), + resource.TestCheckResourceAttrSet(dataSourceClusterName, "kubeconfig"), + ), + }, }, - }, + }) }) } diff --git a/linode/lke/resource_test.go b/linode/lke/resource_test.go index d08693b96..4388b0930 100644 --- a/linode/lke/resource_test.go +++ b/linode/lke/resource_test.go @@ -167,33 +167,35 @@ func waitForAllNodesReady(t *testing.T, cluster *linodego.LKECluster, pollInterv func TestAccResourceLKECluster_basic_smoke(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionLatest), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.type", "g6-standard-2"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.nodes.#", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "control_plane.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "false"), - resource.TestCheckResourceAttrSet(resourceClusterName, "id"), - resource.TestCheckResourceAttrSet(resourceClusterName, "pool.0.id"), - resource.TestCheckResourceAttrSet(resourceClusterName, "kubeconfig"), - resource.TestCheckResourceAttrSet(resourceClusterName, "dashboard_url"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionLatest), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.type", "g6-standard-2"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.nodes.#", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "control_plane.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "false"), + resource.TestCheckResourceAttrSet(resourceClusterName, "id"), + resource.TestCheckResourceAttrSet(resourceClusterName, "pool.0.id"), + resource.TestCheckResourceAttrSet(resourceClusterName, "kubeconfig"), + resource.TestCheckResourceAttrSet(resourceClusterName, "dashboard_url"), + ), + }, }, - }, + }) }) } @@ -202,36 +204,38 @@ func TestAccResourceLKECluster_k8sUpgrade(t *testing.T) { var cluster linodego.LKECluster - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.ManyPools(t, clusterName, k8sVersionPrevious, testRegion), - Check: resource.ComposeTestCheckFunc( - checkLKEExists(&cluster), - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionPrevious), - ), - }, - { - PreConfig: func() { - // Before we upgrade the Cluster to a newer version of Kubernetes, we need to first - // ensure that every Node in each of this cluster's NodePool is ready. Otherwise, the - // recycle will not actually occur. - waitForAllNodesReady(t, &cluster, time.Second*5, time.Minute*5) + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.ManyPools(t, clusterName, k8sVersionPrevious, testRegion), + Check: resource.ComposeTestCheckFunc( + checkLKEExists(&cluster), + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionPrevious), + ), + }, + { + PreConfig: func() { + // Before we upgrade the Cluster to a newer version of Kubernetes, we need to first + // ensure that every Node in each of this cluster's NodePool is ready. Otherwise, the + // recycle will not actually occur. + waitForAllNodesReady(t, &cluster, time.Second*5, time.Minute*5) + }, + Config: tmpl.ManyPools(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), + resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionLatest), + ), }, - Config: tmpl.ManyPools(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "region", testRegion), - resource.TestCheckResourceAttr(resourceClusterName, "k8s_version", k8sVersionLatest), - ), }, - }, + }) }) } @@ -266,73 +270,77 @@ func TestAccResourceLKECluster_basicUpdates(t *testing.T) { return nil }) - clusterName := acctest.RandomWithPrefix("tf_test") - newClusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - Providers: providerMap, - Steps: []resource.TestStep{ - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - ), - }, - { - Config: tmpl.Updates(t, newClusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", newClusterName), - resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "2"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "4"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + newClusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: providerMap, + Steps: []resource.TestStep{ + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + ), + }, + { + Config: tmpl.Updates(t, newClusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", newClusterName), + resource.TestCheckResourceAttr(resourceClusterName, "tags.#", "2"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "4"), + ), + }, }, - }, + }) }) } func TestAccResourceLKECluster_poolUpdates(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - newClusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.ComplexPools(t, newClusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", newClusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "2"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.1.count", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.2.count", "2"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.3.count", "2"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + newClusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.ComplexPools(t, newClusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", newClusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "2"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.1.count", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.2.count", "2"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.3.count", "2"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, }, - }, + }) }) } @@ -341,156 +349,162 @@ func TestAccResourceLKECluster_removeUnmanagedPool(t *testing.T) { var cluster linodego.LKECluster - clusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - checkLKEExists(&cluster), - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - ), - }, - { - PreConfig: func() { - client := acceptance.TestAccProvider.Meta().(*helper.ProviderMeta).Client - if _, err := client.CreateLKENodePool(context.Background(), cluster.ID, linodego.LKENodePoolCreateOptions{ - Count: 1, - Type: "g6-standard-1", - }); err != nil { - t.Errorf("failed to create unmanaged pool for cluster %d: %s", cluster.ID, err) - } - - pools, err := client.ListLKENodePools(context.Background(), cluster.ID, nil) - if err != nil { - t.Errorf("failed to get pools for cluster %d: %s", cluster.ID, err) - } - - if len(pools) != 2 { - t.Errorf("expected cluster to have 2 pools but got %d", len(pools)) - } + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + checkLKEExists(&cluster), + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + ), + }, + { + PreConfig: func() { + client := acceptance.TestAccProvider.Meta().(*helper.ProviderMeta).Client + if _, err := client.CreateLKENodePool(context.Background(), cluster.ID, linodego.LKENodePoolCreateOptions{ + Count: 1, + Type: "g6-standard-1", + }); err != nil { + t.Errorf("failed to create unmanaged pool for cluster %d: %s", cluster.ID, err) + } + + pools, err := client.ListLKENodePools(context.Background(), cluster.ID, nil) + if err != nil { + t.Errorf("failed to get pools for cluster %d: %s", cluster.ID, err) + } + + if len(pools) != 2 { + t.Errorf("expected cluster to have 2 pools but got %d", len(pools)) + } + }, + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), }, - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), }, - }, + }) }) } func TestAccResourceLKECluster_autoScaler(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - // newClusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.Autoscaler(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "5"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.AutoscalerUpdates(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "8"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.AutoscalerManyPools(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "2"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "5"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "8"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.1.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.0.min", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.0.max", "8"), - resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), - ), - }, - { - Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), - ), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + // newClusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.Autoscaler(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "5"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.AutoscalerUpdates(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "8"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.AutoscalerManyPools(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "2"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "5"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.min", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.0.max", "8"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.1.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.0.min", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.1.autoscaler.0.max", "8"), + resource.TestCheckResourceAttr(resourceClusterName, "status", "ready"), + ), + }, + { + Config: tmpl.Basic(t, clusterName, k8sVersionLatest, testRegion), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "3"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), + ), + }, }, - }, + }) }) } func TestAccResourceLKECluster_controlPlane(t *testing.T) { t.Parallel() - clusterName := acctest.RandomWithPrefix("tf_test") - // newClusterName := acctest.RandomWithPrefix("tf_test") - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckLKEClusterDestroy, - Steps: []resource.TestStep{ - { - Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, false), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), - resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "false"), - ), - }, - { - Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, true), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), - resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "1"), - resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), - resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "true"), - ), - }, - { - Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, false), + acceptance.RunTestRetry(t, 2, func(tRetry *acceptance.TRetry) { + clusterName := acctest.RandomWithPrefix("tf_test") + // newClusterName := acctest.RandomWithPrefix("tf_test") + resource.Test(tRetry, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: acceptance.CheckLKEClusterDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, false), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), + resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "false"), + ), + }, + { + Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, true), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceClusterName, "label", clusterName), + resource.TestCheckResourceAttr(resourceClusterName, "pool.#", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.count", "1"), + resource.TestCheckResourceAttr(resourceClusterName, "pool.0.autoscaler.#", "0"), + resource.TestCheckResourceAttr(resourceClusterName, "control_plane.0.high_availability", "true"), + ), + }, + { + Config: tmpl.ControlPlane(t, clusterName, k8sVersionLatest, testRegion, false), - // Expect a 400 response when attempting to disable HA - ExpectError: regexp.MustCompile("\\[400]"), + // Expect a 400 response when attempting to disable HA + ExpectError: regexp.MustCompile("\\[400]"), + }, }, - }, + }) }) } From eaeb69f14771993d6343ea57c92a0c01a1243382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:55:38 -0500 Subject: [PATCH 04/12] build(deps): bump golang.org/x/crypto from 0.15.0 to 0.16.0 (#1159) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.15.0 to 0.16.0. - [Commits](https://github.com/golang/crypto/compare/v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 88592a6e4..bbdb6e882 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/linode/linodego v1.25.0 github.com/linode/linodego/k8s v1.25.1 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.15.0 + golang.org/x/crypto v0.16.0 golang.org/x/net v0.18.0 ) @@ -83,8 +83,8 @@ require ( golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect golang.org/x/mod v0.13.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect - golang.org/x/sys v0.14.0 // indirect - golang.org/x/term v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 72464762a..2e240e0ba 100644 --- a/go.sum +++ b/go.sum @@ -206,8 +206,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -256,8 +256,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -265,8 +265,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From e6a9b14a568c24588e166539201d761a02bfaefe Mon Sep 17 00:00:00 2001 From: Zhiwei Liang <121905282+zliang-akamai@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:11:51 -0500 Subject: [PATCH 05/12] Add go badges (#1157) --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c6c14ba21..851cb6e72 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,13 @@ # Terraform Provider for Linode +[![Release](https://img.shields.io/github/v/release/linode/terraform-provider-linode)](https://github.com/linode/terraform-provider-linode/releases/latest) +[![GoDoc](https://godoc.org/github.com/linode/terraform-provider-linode?status.svg)](https://godoc.org/github.com/linode/terraform-provider-linode) +[![Go Report Card](https://goreportcard.com/badge/github.com/linode/terraform-provider-linode)](https://goreportcard.com/report/github.com/linode/linodego) +[![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby) + + - Website: - Documentation: -- [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby) - Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool) From 041af3f94fdc6b08886bb3386b10c07725670110 Mon Sep 17 00:00:00 2001 From: Youjung Kim <126618609+ykim-1@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:32:32 -0800 Subject: [PATCH 06/12] test: remove unnecessary tests (#1161) * debug gha * found the issue. missed replacing json with xml :( * remove unnecessary tests --- linode/instance/resource_test.go | 45 -------------------------------- linode/vlan/datasource_test.go | 45 -------------------------------- 2 files changed, 90 deletions(-) diff --git a/linode/instance/resource_test.go b/linode/instance/resource_test.go index 4c8287722..d0a42e8ca 100644 --- a/linode/instance/resource_test.go +++ b/linode/instance/resource_test.go @@ -1108,51 +1108,6 @@ func TestAccResourceInstance_tagWithVolume(t *testing.T) { }) } -func TestAccResourceInstance_diskRawDeleted(t *testing.T) { - t.Skip("This test is currently disabled as null disk " + - "configurations are now computed by default.") - - t.Parallel() - var instance linodego.Instance - instanceName := acctest.RandomWithPrefix("tf_test") - resName := "linode_instance.foobar" - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - CheckDestroy: acceptance.CheckInstanceDestroy, - Steps: []resource.TestStep{ - // Start off with a Linode 1024 - { - Config: tmpl.RawDisk(t, instanceName, testRegion), - Check: resource.ComposeTestCheckFunc( - acceptance.CheckInstanceExists(resName, &instance), - resource.TestCheckResourceAttr(resName, "specs.0.disk", "25600"), - resource.TestCheckResourceAttr(resName, "config.#", "0"), - resource.TestCheckResourceAttr(resName, "disk.#", "1"), - resource.TestCheckResourceAttr(resName, "disk.0.size", "3000"), - resource.TestCheckResourceAttr(resName, "disk.0.label", "disk"), - resource.TestCheckResourceAttr(resName, "type", "g6-nanode-1"), - resource.TestCheckResourceAttr(resName, "swap_size", "0"), - checkInstanceDisks(&instance, testDisk("disk", testDiskSize(3000))), - ), - }, - // Bump it to a 2048, and expand the disk - { - Config: tmpl.RawDiskDeleted(t, instanceName, testRegion), - Check: resource.ComposeTestCheckFunc( - acceptance.CheckInstanceExists(resName, &instance), - resource.TestCheckResourceAttr(resName, "specs.0.disk", "25600"), - resource.TestCheckResourceAttr(resName, "config.#", "0"), - resource.TestCheckResourceAttr(resName, "disk.#", "0"), - resource.TestCheckResourceAttr(resName, "type", "g6-nanode-1"), - resource.TestCheckResourceAttr(resName, "swap_size", "0"), - ), - }, - }, - }) -} - func TestAccResourceInstance_diskResize(t *testing.T) { t.Parallel() var instance linodego.Instance diff --git a/linode/vlan/datasource_test.go b/linode/vlan/datasource_test.go index c1e7ebe82..ef4e1fabd 100644 --- a/linode/vlan/datasource_test.go +++ b/linode/vlan/datasource_test.go @@ -94,51 +94,6 @@ func TestAccDataSourceVLANs_regex(t *testing.T) { }) } -// This test is necessary to test a race-condition introduced by provisioning -// multiple concurrent VLAN instances. -// This test is opt-in as it has the potential to spawn a large number of VLANs, -// which cannot be deleted without admin intervention. -func TestAccDataSourceVLANs_ensureNoDuplicates(t *testing.T) { - acceptance.OptInTest(t) - - t.Parallel() - - instanceName := acctest.RandomWithPrefix("tf_test") - vlanName := "tf-test" - resourceName := "data.linode_vlans.foolan" - - createValidateSteps := func(i int) []resource.TestStep { - vlanName := fmt.Sprintf("%s-%d", vlanName, i) - - return []resource.TestStep{ - { - Config: tmpl.DataCheckDuplicate(t, instanceName, testRegion, vlanName), - }, - { - PreConfig: preConfigVLANPoll(t, vlanName), - Config: tmpl.DataCheckDuplicate(t, instanceName, testRegion, vlanName), - Check: resource.ComposeTestCheckFunc( - // Ensure only one VLAN is created - resource.TestCheckResourceAttr(resourceName, "vlans.#", "1"), - ), - }, - } - } - - var steps []resource.TestStep - - // Run this test multiple times to test on updates - for i := 0; i < 3; i++ { - steps = append(steps, createValidateSteps(i)...) - } - - resource.Test(t, resource.TestCase{ - PreCheck: func() { acceptance.PreCheck(t) }, - ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, - Steps: steps, - }) -} - // waitForVLANWithLabel polls for a VLAN with the given label to exist // This is necessary in this context because it is not guaranteed that a VLAN will // be created immediately after the instance is created. From c7d10934e85508cc4adf8397d7cb236936887ed5 Mon Sep 17 00:00:00 2001 From: Lena Garber <114949949+lgarber-akamai@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:14:08 -0500 Subject: [PATCH 07/12] Fix panic when using linode_instance_config on an instance in rescue mode (#1163) --- linode/helper/instance.go | 5 ++ linode/instanceconfig/resource_test.go | 73 ++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/linode/helper/instance.go b/linode/helper/instance.go index 471bebf16..c2ceaeacd 100644 --- a/linode/helper/instance.go +++ b/linode/helper/instance.go @@ -129,6 +129,11 @@ func GetCurrentBootedConfig(ctx context.Context, client *linodego.Client, instID return 0, nil } + // Special case for instances booted into rescue mode + if events[0].SecondaryEntity == nil { + return 0, nil + } + return int(events[0].SecondaryEntity.ID.(float64)), nil } diff --git a/linode/instanceconfig/resource_test.go b/linode/instanceconfig/resource_test.go index 85fd459de..5f5771d59 100644 --- a/linode/instanceconfig/resource_test.go +++ b/linode/instanceconfig/resource_test.go @@ -388,6 +388,79 @@ func TestAccResourceInstanceConfig_vpcInterface(t *testing.T) { }) } +// Test case to ensure instances manually booted into rescue mode +// will not crash the provider. +func TestAccResourceInstanceConfig_rescueBooted(t *testing.T) { + t.Parallel() + + var instance linodego.Instance + + resName := "linode_instance_config.foobar" + instanceResName := "linode_instance.foobar" + + instanceName := acctest.RandomWithPrefix("tf_test") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + ProtoV5ProviderFactories: acceptance.ProtoV5ProviderFactories, + CheckDestroy: checkDestroy, + Steps: []resource.TestStep{ + { + Config: tmpl.Complex(t, instanceName, testRegion), + Check: resource.ComposeTestCheckFunc( + checkExists(resName, nil), + acceptance.CheckInstanceExists(instanceResName, &instance), + ), + }, + { + PreConfig: func() { + client, err := acceptance.GetTestClient() + if err != nil { + t.Fatal(err) + } + + poller, err := client.NewEventPoller(context.Background(), instance.ID, linodego.EntityLinode, linodego.ActionLinodeReboot) + if err != nil { + t.Fatalf("failed to create event poller: %v", err) + } + + if err := client.RescueInstance(context.Background(), instance.ID, linodego.InstanceRescueOptions{}); err != nil { + t.Fatalf("failed to boot instance into rescue mode: %v", err) + } + + if _, err := poller.WaitForFinished(context.Background(), 240); err != nil { + t.Fatalf("failed to wait for instance to boot into rescue mode: %v", err) + } + }, + Config: tmpl.ComplexUpdates(t, instanceName, testRegion), + Check: resource.ComposeTestCheckFunc( + checkExists(resName, nil), + acceptance.CheckInstanceExists(instanceResName, &instance), + + // The provider should not be booted into this config + resource.TestCheckResourceAttr(resName, "booted", "false"), + ), + }, + { + Config: tmpl.Complex(t, instanceName, testRegion), + Check: resource.ComposeTestCheckFunc( + checkExists(resName, nil), + acceptance.CheckInstanceExists(instanceResName, &instance), + + // The provider should now have been rebooted into this config + resource.TestCheckResourceAttr(resName, "booted", "true"), + ), + }, + { + ResourceName: resName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: resourceImportStateID, + }, + }, + }) +} + func checkExists(name string, config *linodego.InstanceConfig) resource.TestCheckFunc { return func(s *terraform.State) error { client := acceptance.TestAccProvider.Meta().(*helper.ProviderMeta).Client From 02f3f4d808d6e9a486cf772ceccd9f165f688624 Mon Sep 17 00:00:00 2001 From: Marvin Wichmann Date: Thu, 30 Nov 2023 21:32:23 +0100 Subject: [PATCH 08/12] chore(docs): fix typo in linode_user (#1155) --- docs/resources/user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/user.md b/docs/resources/user.md index 68e1885a7..4617c1834 100644 --- a/docs/resources/user.md +++ b/docs/resources/user.md @@ -79,7 +79,7 @@ In addition to all the arguments above, the following attributes are exported. ## Global Grants -* `account-access` - (optional) The level of access this User has to Account-level actions, like billing information. (`read_only`, `read_write`) +* `account_access` - (optional) The level of access this User has to Account-level actions, like billing information. (`read_only`, `read_write`) * `add_domains` - (optional) If true, this User may add Domains. From 432f76ff316cb22101700237363ba3b1fb89ebd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:32:53 -0500 Subject: [PATCH 09/12] build(deps): bump actions/github-script from 6 to 7 (#1136) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/integration_tests_pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests_pr.yml b/.github/workflows/integration_tests_pr.yml index 6f0739a5c..7546d1abf 100644 --- a/.github/workflows/integration_tests_pr.yml +++ b/.github/workflows/integration_tests_pr.yml @@ -30,7 +30,7 @@ jobs: - run: go version - run: make tooldeps - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: disallowed-character-check env: text: ${{ inputs.module }} @@ -82,7 +82,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: update-check-run if: ${{ steps.disallowed-character-check.outputs.result == 'pass' && inputs.pull_request_number != '' && fromJson(steps.commit-hash.outputs.data).repository.pullRequest.headRef.target.oid == inputs.sha }} env: From 7a708a9ce8af99cf8f961e079ea3173f16217f4d Mon Sep 17 00:00:00 2001 From: Zhiwei Liang <121905282+zliang-akamai@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:33:12 -0500 Subject: [PATCH 10/12] Migrate test helper import paths in VPC modules (#1165) --- linode/vpc/datasource_test.go | 2 +- linode/vpc/resource_test.go | 2 +- linode/vpcsubnet/datasource_test.go | 2 +- linode/vpcsubnet/resource_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linode/vpc/datasource_test.go b/linode/vpc/datasource_test.go index 166906152..12bea679d 100644 --- a/linode/vpc/datasource_test.go +++ b/linode/vpc/datasource_test.go @@ -5,7 +5,7 @@ package vpc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/terraform-provider-linode/v2/linode/acceptance" "github.com/linode/terraform-provider-linode/v2/linode/vpc/tmpl" diff --git a/linode/vpc/resource_test.go b/linode/vpc/resource_test.go index ef0a2f1b3..da62e1bcd 100644 --- a/linode/vpc/resource_test.go +++ b/linode/vpc/resource_test.go @@ -10,7 +10,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" diff --git a/linode/vpcsubnet/datasource_test.go b/linode/vpcsubnet/datasource_test.go index 3cc9311e4..81ff00d88 100644 --- a/linode/vpcsubnet/datasource_test.go +++ b/linode/vpcsubnet/datasource_test.go @@ -5,7 +5,7 @@ package vpcsubnet_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/linode/terraform-provider-linode/v2/linode/acceptance" "github.com/linode/terraform-provider-linode/v2/linode/vpcsubnet/tmpl" diff --git a/linode/vpcsubnet/resource_test.go b/linode/vpcsubnet/resource_test.go index c1b757d03..99918057e 100644 --- a/linode/vpcsubnet/resource_test.go +++ b/linode/vpcsubnet/resource_test.go @@ -10,7 +10,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/linode/linodego" From 68923d0d674a8d89e5e07c374d1c7ffb9da696bf Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Thu, 30 Nov 2023 15:53:29 -0500 Subject: [PATCH 11/12] Fix `make tooldeps` in PR integration test workflow --- .github/workflows/integration_tests_pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests_pr.yml b/.github/workflows/integration_tests_pr.yml index 7546d1abf..34d2a5632 100644 --- a/.github/workflows/integration_tests_pr.yml +++ b/.github/workflows/integration_tests_pr.yml @@ -28,7 +28,6 @@ jobs: with: go-version: 'stable' - run: go version - - run: make tooldeps - uses: actions/github-script@v7 id: disallowed-character-check @@ -51,6 +50,8 @@ jobs: with: ref: ${{ inputs.sha }} + - run: make tooldeps + - run: make PKG_NAME="${{ inputs.module }}" testacc if: ${{ steps.disallowed-character-check.outputs.result == 'pass' }} env: From 9443c0b0446ec48f44c62b9d943648cbbc5d0c1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:56:55 -0500 Subject: [PATCH 12/12] build(deps): bump golang.org/x/net from 0.18.0 to 0.19.0 (#1158) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.19.0. - [Commits](https://github.com/golang/net/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bbdb6e882..ba14094bb 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/linode/linodego/k8s v1.25.1 github.com/stretchr/testify v1.8.4 golang.org/x/crypto v0.16.0 - golang.org/x/net v0.18.0 + golang.org/x/net v0.19.0 ) require ( diff --git a/go.sum b/go.sum index 2e240e0ba..a6001926f 100644 --- a/go.sum +++ b/go.sum @@ -228,8 +228,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=