iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename method writeSpecField to goFieldToCtyType (#8687)

This commit is contained in:
Sylvia Moss 2020-02-04 16:37:25 +01:00 committed by GitHub
parent 08b0bd1d2c
commit bc11853ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go
View File

@ -229,7 +229,7 @@ func outputHCL2SpecField(w io.Writer, accessor string, fieldType types.Type, tag
fmt.Fprintf(w, `(&%s{}).HCL2Spec()`, fieldType.String()) fmt.Fprintf(w, `(&%s{}).HCL2Spec()`, fieldType.String())
return return
} }
spec, _ := writeSpecField(accessor, fieldType) spec, _ := goFieldToCtyType(accessor, fieldType)
switch spec := spec.(type) { switch spec := spec.(type) {
case string: case string:
fmt.Fprintf(w, spec) fmt.Fprintf(w, spec)
@ -246,10 +246,10 @@ func outputHCL2SpecField(w io.Writer, accessor string, fieldType types.Type, tag
// a cty.Type or a string. The second argument is used for recursion and is the // a cty.Type or a string. The second argument is used for recursion and is the
// type that will be used by the parent. For example when fieldType is a []string; a // type that will be used by the parent. For example when fieldType is a []string; a
// recursive goFieldToCtyType call will return a cty.String. // recursive goFieldToCtyType call will return a cty.String.
func writeSpecField(accessor string, fieldType types.Type) (interface{}, cty.Type) { func goFieldToCtyType(accessor string, fieldType types.Type) (interface{}, cty.Type) {
switch f := fieldType.(type) { switch f := fieldType.(type) {
case *types.Pointer: case *types.Pointer:
return writeSpecField(accessor, f.Elem()) return goFieldToCtyType(accessor, f.Elem())
case *types.Basic: case *types.Basic:
ctyType := basicKindToCtyType(f.Kind()) ctyType := basicKindToCtyType(f.Kind())
return &hcldec.AttrSpec{ return &hcldec.AttrSpec{
@ -275,7 +275,7 @@ func writeSpecField(accessor string, fieldType types.Type) (interface{}, cty.Typ
return fmt.Sprintf(`&hcldec.BlockSpec{TypeName: "%s",`+ return fmt.Sprintf(`&hcldec.BlockSpec{TypeName: "%s",`+
` Nested: hcldec.ObjectSpec((*%s)(nil).HCL2Spec())}`, accessor, f.String()), cty.NilType ` Nested: hcldec.ObjectSpec((*%s)(nil).HCL2Spec())}`, accessor, f.String()), cty.NilType
default: default:
return writeSpecField(accessor, underlyingType) return goFieldToCtyType(accessor, underlyingType)
} }
case *types.Slice: case *types.Slice:
elem := f.Elem() elem := f.Elem()
@ -295,9 +295,9 @@ func writeSpecField(accessor string, fieldType types.Type) (interface{}, cty.Typ
} }
return fmt.Sprintf(`&hcldec.BlockListSpec{TypeName: "%s", Nested: %s}`, accessor, b.String()), cty.NilType return fmt.Sprintf(`&hcldec.BlockListSpec{TypeName: "%s", Nested: %s}`, accessor, b.String()), cty.NilType
default: default:
_, specType := writeSpecField(accessor, elem) _, specType := goFieldToCtyType(accessor, elem)
if specType == cty.NilType { if specType == cty.NilType {
return writeSpecField(accessor, elem.Underlying()) return goFieldToCtyType(accessor, elem.Underlying())
} }
return &hcldec.AttrSpec{ return &hcldec.AttrSpec{
Name: accessor, Name: accessor,