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
linode · Nov 28, 2023 · a6c075e · a6c075e
1 parent 3162511
commit a6c075e
Show file tree

Hide file tree

Showing 312 changed files with 542 additions and 540 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,6 @@ modules-dev/
 !command/test-fixtures/**/.terraform/
 
 # Binary exclusions
-terraform-provider-linode
+terraform-provider-linode
+
+dist/**
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {