Update to hashicorp/go-cty

paultyng · paultyng · commit 5f3e0969cf8d · 2020-04-16T12:12:03.000-04:00
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-plugin-sdk/v2
 go 1.14
 
 require (
-	github.com/agext/levenshtein v1.2.2
+	github.com/agext/levenshtein v1.2.2 // indirect
 	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
 	github.com/apparentlymart/go-cidr v1.0.1
 	github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0
@@ -15,6 +15,7 @@ require (
 	github.com/google/go-cmp v0.3.1
 	github.com/hashicorp/errwrap v1.0.0
 	github.com/hashicorp/go-cleanhttp v0.5.1
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/go-hclog v0.9.2 // indirect
 	github.com/hashicorp/go-multierror v1.0.0
 	github.com/hashicorp/go-plugin v1.2.0
diff --git a/go.sum b/go.sum
@@ -22,6 +22,7 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU
 github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
+github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
@@ -71,6 +72,8 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI=
+github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs=
 github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw=
 github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
diff --git a/helper/schema/core_schema.go b/helper/schema/core_schema.go
@@ -3,7 +3,7 @@ package schema
 import (
 	"fmt"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/helper/schema/core_schema_test.go b/helper/schema/core_schema_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
diff --git a/helper/schema/resource.go b/helper/schema/resource.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
diff --git a/helper/schema/resource_test.go b/helper/schema/resource_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/zclconf/go-cty/cty"
-	ctyjson "github.com/zclconf/go-cty/cty/json"
+	"github.com/hashicorp/go-cty/cty"
+	ctyjson "github.com/hashicorp/go-cty/cty/json"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
diff --git a/helper/schema/shims.go b/helper/schema/shims.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/zclconf/go-cty/cty"
-	ctyjson "github.com/zclconf/go-cty/cty/json"
+	"github.com/hashicorp/go-cty/cty"
+	ctyjson "github.com/hashicorp/go-cty/cty/json"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"
diff --git a/helper/schema/shims_test.go b/helper/schema/shims_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/hashcode"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
diff --git a/internal/configs/configschema/coerce_value.go b/internal/configs/configschema/coerce_value.go
@@ -3,8 +3,8 @@ package configschema
 import (
 	"fmt"
 
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/convert"
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty/convert"
 )
 
 // CoerceValue attempts to force the given value to conform to the type
diff --git a/internal/configs/configschema/coerce_value_test.go b/internal/configs/configschema/coerce_value_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfdiags"
 )
diff --git a/internal/configs/configschema/empty_value.go b/internal/configs/configschema/empty_value.go
@@ -1,7 +1,7 @@
 package configschema
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // EmptyValue returns the "empty value" for the recieving block, which for
diff --git a/internal/configs/configschema/empty_value_test.go b/internal/configs/configschema/empty_value_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/apparentlymart/go-dump/dump"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 func TestBlockEmptyValue(t *testing.T) {
diff --git a/internal/configs/configschema/implied_type.go b/internal/configs/configschema/implied_type.go
@@ -1,7 +1,7 @@
 package configschema
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // ImpliedType returns the cty.Type that would result from decoding a
diff --git a/internal/configs/configschema/implied_type_test.go b/internal/configs/configschema/implied_type_test.go
@@ -3,7 +3,7 @@ package configschema
 import (
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 func TestBlockImpliedType(t *testing.T) {
diff --git a/internal/configs/configschema/schema.go b/internal/configs/configschema/schema.go
@@ -1,7 +1,7 @@
 package configschema
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // StringKind represents the format a string is in.
diff --git a/internal/configs/hcl2shim/flatmap.go b/internal/configs/hcl2shim/flatmap.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/convert"
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty/convert"
 )
 
 // FlatmapValueFromHCL2 converts a value from HCL2 (really, from the cty dynamic
diff --git a/internal/configs/hcl2shim/flatmap_test.go b/internal/configs/hcl2shim/flatmap_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-test/deep"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 func TestFlatmapValueFromHCL2(t *testing.T) {
diff --git a/internal/configs/hcl2shim/paths.go b/internal/configs/hcl2shim/paths.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // RequiresReplace takes a list of flatmapped paths from a
diff --git a/internal/configs/hcl2shim/paths_test.go b/internal/configs/hcl2shim/paths_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 var (
diff --git a/internal/configs/hcl2shim/values.go b/internal/configs/hcl2shim/values.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/configs/hcl2shim/values_equiv.go b/internal/configs/hcl2shim/values_equiv.go
@@ -1,7 +1,7 @@
 package hcl2shim
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // ValuesSDKEquivalent returns true if both of the given values seem equivalent
diff --git a/internal/configs/hcl2shim/values_equiv_test.go b/internal/configs/hcl2shim/values_equiv_test.go
@@ -5,7 +5,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 func TestValuesSDKEquivalent(t *testing.T) {
diff --git a/internal/configs/hcl2shim/values_test.go b/internal/configs/hcl2shim/values_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/helper/plugin/grpc_provider.go b/internal/helper/plugin/grpc_provider.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/zclconf/go-cty/cty"
-	ctyconvert "github.com/zclconf/go-cty/cty/convert"
-	"github.com/zclconf/go-cty/cty/msgpack"
+	"github.com/hashicorp/go-cty/cty"
+	ctyconvert "github.com/hashicorp/go-cty/cty/convert"
+	"github.com/hashicorp/go-cty/cty/msgpack"
 	context "golang.org/x/net/context"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
diff --git a/internal/helper/plugin/grpc_provider_test.go b/internal/helper/plugin/grpc_provider_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/msgpack"
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty/msgpack"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/plugin/convert"
diff --git a/internal/helper/plugin/unknown.go b/internal/helper/plugin/unknown.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/helper/plugin/unknown_test.go b/internal/helper/plugin/unknown_test.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/plans/objchange/normalize_obj.go b/internal/plans/objchange/normalize_obj.go
@@ -1,7 +1,7 @@
 package objchange
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/plans/objchange/normalize_obj_test.go b/internal/plans/objchange/normalize_obj_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/apparentlymart/go-dump/dump"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 )
diff --git a/internal/plugin/convert/diagnostics.go b/internal/plugin/convert/diagnostics.go
@@ -1,7 +1,7 @@
 package convert
 
 import (
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfdiags"
 	proto "github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfplugin5"
diff --git a/internal/plugin/convert/diagnostics_test.go b/internal/plugin/convert/diagnostics_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfdiags"
 	proto "github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfplugin5"
diff --git a/internal/plugin/convert/schema_test.go b/internal/plugin/convert/schema_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	proto "github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfplugin5"
diff --git a/internal/tfdiags/config_traversals.go b/internal/tfdiags/config_traversals.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 )
 
 // FormatCtyPath is a helper function to produce a user-friendly string
diff --git a/terraform/diff.go b/terraform/diff.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/zclconf/go-cty/cty"
+	"github.com/hashicorp/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"
diff --git a/terraform/resource.go b/terraform/resource.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/hashicorp/go-cty/cty"
 	"github.com/mitchellh/copystructure"
 	"github.com/mitchellh/reflectwalk"
-	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"
diff --git a/terraform/resource_test.go b/terraform/resource_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/go-cty/cty"
 	"github.com/mitchellh/reflectwalk"
-	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"
diff --git a/terraform/state.go b/terraform/state.go
@@ -12,12 +12,12 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/hashicorp/go-cty/cty"
 	multierror "github.com/hashicorp/go-multierror"
 	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/mitchellh/copystructure"
-	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/addrs"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/hcl2shim"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package schema`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/zclconf/go-cty/cty"`
	`6`	`+ "github.com/hashicorp/go-cty/cty"`
`7`	`7`
`8`	`8`	`"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/google/go-cmp/cmp"`
`8`		`- "github.com/zclconf/go-cty/cty"`
	`8`	`+ "github.com/hashicorp/go-cty/cty"`
`9`	`9`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/v2/internal/configs/configschema"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"log"`
`8`	`8`	`"strconv"`
`9`	`9`
`10`		`- "github.com/zclconf/go-cty/cty"`
	`10`	`+ "github.com/hashicorp/go-cty/cty"`
`11`	`11`
`12`	`12`	`"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package configschema`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/zclconf/go-cty/cty"`
`7`		`- "github.com/zclconf/go-cty/cty/convert"`
	`6`	`+ "github.com/hashicorp/go-cty/cty"`
	`7`	`+ "github.com/hashicorp/go-cty/cty/convert"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// CoerceValue attempts to force the given value to conform to the type`