remove redundant cty shim

Author: VenelinMartinov

pkg/valueshim/cty.go

@@ -19,97 +19,96 @@ import (
 	"fmt"
 	"math/big"
 
-	"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"
 )
 
 // Wrap a cty.Value as Value.
-func FromCtyValue(v cty.Value) Value {
-	return ctyValueShim(v)
+func FromHCtyValue(v cty.Value) Value {
+	return hctyValueShim(v)
 }
 
 // Wrap a cty.Type as Type.
-func FromCtyType(v cty.Type) Type {
-	return ctyTypeShim(v)
+func FromHCtyType(v cty.Type) Type {
+	return hctyTypeShim(v)
 }
 
-type ctyValueShim cty.Value
+type hctyValueShim cty.Value
 
-var _ Value = (*ctyValueShim)(nil)
+var _ Value = (*hctyValueShim)(nil)
 
-func (v ctyValueShim) val() cty.Value {
+func (v hctyValueShim) val() cty.Value {
 	return cty.Value(v)
 }
 
-func (v ctyValueShim) IsNull() bool {
+func (v hctyValueShim) IsNull() bool {
 	return v.val().IsNull()
 }
 
-func (v ctyValueShim) GoString() string {
+func (v hctyValueShim) GoString() string {
 	return v.val().GoString()
 }
 
-func (v ctyValueShim) Type() Type {
-	return FromCtyType(v.val().Type())
+func (v hctyValueShim) Type() Type {
+	return FromHCtyType(v.val().Type())
 }
 
-func (v ctyValueShim) StringValue() string {
+func (v hctyValueShim) StringValue() string {
 	return v.val().AsString()
 }
 
-func (v ctyValueShim) BoolValue() bool {
+func (v hctyValueShim) BoolValue() bool {
 	return v.val().True()
 }
 
-func (v ctyValueShim) NumberValue() float64 {
-	bf := v.BigFloatValue()
-	f, _ := bf.Float64()
+func (v hctyValueShim) NumberValue() float64 {
+	f, _ := v.val().AsBigFloat().Float64()
 	return f
 }
 
-func (v ctyValueShim) BigFloatValue() *big.Float {
+func (v hctyValueShim) BigFloatValue() *big.Float {
 	return v.val().AsBigFloat()
 }
 
-func (v ctyValueShim) AsValueSlice() []Value {
+func (v hctyValueShim) AsValueSlice() []Value {
 	s := v.val().AsValueSlice()
 	res := make([]Value, len(s))
 	for i, v := range s {
-		res[i] = ctyValueShim(v)
+		res[i] = hctyValueShim(v)
 	}
 	return res
 }
 
-func (v ctyValueShim) AsValueMap() map[string]Value {
+func (v hctyValueShim) AsValueMap() map[string]Value {
 	m := v.val().AsValueMap()
 	res := make(map[string]Value, len(m))
 
 	for k, v := range m {
-		res[k] = ctyValueShim(v)
+		res[k] = hctyValueShim(v)
 	}
 	return res
 }
 
-func (v ctyValueShim) Remove(key string) Value {
+func (v hctyValueShim) Remove(key string) Value {
 	switch {
 	case v.val().Type().IsObjectType():
 		m := v.val().AsValueMap()
 		delete(m, key)
 		if len(m) == 0 {
-			return ctyValueShim(cty.EmptyObjectVal)
+			return hctyValueShim(cty.EmptyObjectVal)
 		}
-		return ctyValueShim(cty.ObjectVal(m))
+		return hctyValueShim(cty.ObjectVal(m))
 	default:
 		return v
 	}
 }
 
-func (v ctyValueShim) Marshal(schemaType Type) (json.RawMessage, error) {
+func (v hctyValueShim) Marshal(schemaType Type) (json.RawMessage, error) {
 	vv := v.val()
-	tt, ok := schemaType.(ctyTypeShim)
+	tt, ok := schemaType.(hctyTypeShim)
 	if !ok {
 		return nil, fmt.Errorf("Cannot marshal to RawState: "+
-			"expected schemaType to be of type ctyTypeShim, got %#T",
+			"expected schemaType to be of type hctyTypeShim, got %#T",
 			schemaType)
 	}
 	raw, err := ctyjson.Marshal(vv, tt.ty())
@@ -119,65 +118,65 @@ func (v ctyValueShim) Marshal(schemaType Type) (json.RawMessage, error) {
 	return json.RawMessage(raw), nil
 }
 
-type ctyTypeShim cty.Type
+type hctyTypeShim cty.Type
 
-var _ Type = ctyTypeShim{}
+var _ Type = hctyTypeShim{}
 
-func (t ctyTypeShim) ty() cty.Type {
+func (t hctyTypeShim) ty() cty.Type {
 	return cty.Type(t)
 }
 
-func (t ctyTypeShim) IsNumberType() bool {
+func (t hctyTypeShim) IsNumberType() bool {
 	return t.ty().Equals(cty.Number)
 }
 
-func (t ctyTypeShim) IsBooleanType() bool {
+func (t hctyTypeShim) IsBooleanType() bool {
 	return t.ty().Equals(cty.Bool)
 }
 
-func (t ctyTypeShim) IsStringType() bool {
+func (t hctyTypeShim) IsStringType() bool {
 	return t.ty().Equals(cty.String)
 }
 
-func (t ctyTypeShim) IsListType() bool {
+func (t hctyTypeShim) IsListType() bool {
 	return t.ty().IsListType()
 }
 
-func (t ctyTypeShim) IsMapType() bool {
+func (t hctyTypeShim) IsMapType() bool {
 	return t.ty().IsMapType()
 }
 
-func (t ctyTypeShim) IsSetType() bool {
+func (t hctyTypeShim) IsSetType() bool {
 	return t.ty().IsSetType()
 }
 
-func (t ctyTypeShim) IsObjectType() bool {
+func (t hctyTypeShim) IsObjectType() bool {
 	return t.ty().IsObjectType()
 }
 
-func (t ctyTypeShim) IsDynamicType() bool {
+func (t hctyTypeShim) IsDynamicType() bool {
 	return t.ty().Equals(cty.DynamicPseudoType)
 }
 
-func (t ctyTypeShim) AttributeType(name string) (Type, bool) {
+func (t hctyTypeShim) AttributeType(name string) (Type, bool) {
 	tt := t.ty()
 	if !tt.IsObjectType() {
 		return nil, false
 	}
 	if !tt.HasAttribute(name) {
 		return nil, false
 	}
-	return FromCtyType(tt.AttributeType(name)), true
+	return FromHCtyType(tt.AttributeType(name)), true
 }
 
-func (t ctyTypeShim) ElementType() (Type, bool) {
+func (t hctyTypeShim) ElementType() (Type, bool) {
 	tt := t.ty()
 	if !tt.IsCollectionType() {
 		return nil, false
 	}
-	return FromCtyType(tt.ElementType()), true
+	return FromHCtyType(tt.ElementType()), true
 }
 
-func (t ctyTypeShim) GoString() string {
+func (t hctyTypeShim) GoString() string {
 	return t.ty().GoString()
 }