Move tftypes package to root of module. (#70)

Rather than making tftypes a namespaced package and having one per protocol version, we're going to use the same implementation across protocol versions. To reflect this, move tftypes to the root of the module, not namespaced by a protocol version, and rewrite the imports for it.
hashicorp · Mar 31, 2021 · 014db87 · 014db87
1 parent bbc1a4d
commit 014db87
Show file tree

Hide file tree

Showing 36 changed files with 17 additions and 14 deletions.
diff --git a/.changelog/70.txt b/.changelog/70.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+The `tftypes` package has been moved to the root of the module and is no longer under the `tfprotov5` package. Providers can automatically rewrite their import paths using a command like `sed -i 's/"github.com\/hashicorp\/terraform-plugin-go\/tfprotov5\/tftypes"/"github.com\/hashicorp\/terraform-plugin-go\/tftypes"/g' **/*.go` on Unix-like systems.
+```
diff --git a/tfprotov5/diagnostic.go b/tfprotov5/diagnostic.go
@@ -1,6 +1,6 @@
 package tfprotov5
 
-import "github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+import "github.com/hashicorp/terraform-plugin-go/tftypes"
 
 const (
 	// DiagnosticSeverityInvalid is used to indicate an invalid

diff --git a/tfprotov5/dynamic_value.go b/tfprotov5/dynamic_value.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/vmihailenco/msgpack"
 )
 

diff --git a/tfprotov5/dynamic_value_json.go b/tfprotov5/dynamic_value_json.go
@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func jsonByteDecoder(buf []byte) *json.Decoder {

diff --git a/tfprotov5/dynamic_value_json_test.go b/tfprotov5/dynamic_value_json_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestDynamicValueJSON(t *testing.T) {

diff --git a/tfprotov5/dynamic_value_msgpack.go b/tfprotov5/dynamic_value_msgpack.go
@@ -3,7 +3,7 @@ package tfprotov5
 import (
 	"math/big"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/vmihailenco/msgpack"
 	msgpackCodes "github.com/vmihailenco/msgpack/codes"
 )

diff --git a/tfprotov5/dynamic_value_msgpack_test.go b/tfprotov5/dynamic_value_msgpack_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestDynamicValueMsgPack(t *testing.T) {

diff --git a/tfprotov5/internal/fromproto/attribute_path.go b/tfprotov5/internal/fromproto/attribute_path.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/internal/tfplugin5"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 var ErrUnknownAttributePathStepType = errors.New("unknown type of AttributePath_Step")

diff --git a/tfprotov5/internal/fromproto/schema.go b/tfprotov5/internal/fromproto/schema.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/internal/tfplugin5"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func Schema(in *tfplugin5.Schema) (*tfprotov5.Schema, error) {

diff --git a/tfprotov5/internal/toproto/attribute_path.go b/tfprotov5/internal/toproto/attribute_path.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/internal/tfplugin5"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 var ErrUnknownAttributePathStepType = errors.New("unknown type of AttributePath_Step")

diff --git a/tfprotov5/internal/toproto/dynamic_value.go b/tfprotov5/internal/toproto/dynamic_value.go
diff --git a/tfprotov5/resource.go b/tfprotov5/resource.go
@@ -3,7 +3,7 @@ package tfprotov5
 import (
 	"context"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 // ResourceServer is an interface containing the methods a resource

diff --git a/tfprotov5/schema.go b/tfprotov5/schema.go
@@ -1,6 +1,6 @@
 package tfprotov5
 
-import "github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+import "github.com/hashicorp/terraform-plugin-go/tftypes"
 
 const (
 	// SchemaNestedBlockNestingModeInvalid indicates that the nesting mode

diff --git a/tfprotov5/state.go b/tfprotov5/state.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 // ErrUnknownRawStateType is returned when a RawState has no Flatmap or JSON

diff --git a/tfprotov5/tftypes/attribute_path.go → tftypes/attribute_path.go b/tfprotov5/tftypes/attribute_path.go → tftypes/attribute_path.go
diff --git a/tfprotov5/tftypes/attribute_path_error.go → tftypes/attribute_path_error.go b/tfprotov5/tftypes/attribute_path_error.go → tftypes/attribute_path_error.go
diff --git a/tfprotov5/tftypes/attribute_path_test.go → tftypes/attribute_path_test.go b/tfprotov5/tftypes/attribute_path_test.go → tftypes/attribute_path_test.go
diff --git a/tfprotov5/tftypes/diff.go → tftypes/diff.go b/tfprotov5/tftypes/diff.go → tftypes/diff.go
diff --git a/tfprotov5/tftypes/diff_test.go → tftypes/diff_test.go b/tfprotov5/tftypes/diff_test.go → tftypes/diff_test.go
diff --git a/tfprotov5/tftypes/doc.go → tftypes/doc.go b/tfprotov5/tftypes/doc.go → tftypes/doc.go
diff --git a/tfprotov5/tftypes/list.go → tftypes/list.go b/tfprotov5/tftypes/list.go → tftypes/list.go
diff --git a/tfprotov5/tftypes/map.go → tftypes/map.go b/tfprotov5/tftypes/map.go → tftypes/map.go
diff --git a/tfprotov5/tftypes/object.go → tftypes/object.go b/tfprotov5/tftypes/object.go → tftypes/object.go
diff --git a/tfprotov5/tftypes/primitive.go → tftypes/primitive.go b/tfprotov5/tftypes/primitive.go → tftypes/primitive.go
diff --git a/tfprotov5/tftypes/set.go → tftypes/set.go b/tfprotov5/tftypes/set.go → tftypes/set.go
diff --git a/tfprotov5/tftypes/tuple.go → tftypes/tuple.go b/tfprotov5/tftypes/tuple.go → tftypes/tuple.go
diff --git a/tfprotov5/tftypes/type.go → tftypes/type.go b/tfprotov5/tftypes/type.go → tftypes/type.go
diff --git a/tfprotov5/tftypes/type_json_test.go → tftypes/type_json_test.go b/tfprotov5/tftypes/type_json_test.go → tftypes/type_json_test.go
diff --git a/tfprotov5/tftypes/unknown_value.go → tftypes/unknown_value.go b/tfprotov5/tftypes/unknown_value.go → tftypes/unknown_value.go
diff --git a/tfprotov5/tftypes/value.go → tftypes/value.go b/tfprotov5/tftypes/value.go → tftypes/value.go
diff --git a/tfprotov5/tftypes/value_example_test.go → tftypes/value_example_test.go b/tfprotov5/tftypes/value_example_test.go → tftypes/value_example_test.go
@@ -3,7 +3,7 @@ package tftypes_test
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func ExampleValue_As_string() {

diff --git a/tfprotov5/tftypes/value_msgpack.go → tftypes/value_msgpack.go b/tfprotov5/tftypes/value_msgpack.go → tftypes/value_msgpack.go
diff --git a/tfprotov5/tftypes/value_number_test.go → tftypes/value_number_test.go b/tfprotov5/tftypes/value_number_test.go → tftypes/value_number_test.go
diff --git a/tfprotov5/tftypes/value_test.go → tftypes/value_test.go b/tfprotov5/tftypes/value_test.go → tftypes/value_test.go
diff --git a/tfprotov5/tftypes/walk.go → tftypes/walk.go b/tfprotov5/tftypes/walk.go → tftypes/walk.go
diff --git a/tfprotov5/tftypes/walk_test.go → tftypes/walk_test.go b/tfprotov5/tftypes/walk_test.go → tftypes/walk_test.go