Merge pull request #29648 from hashicorp/jbardin/tfproto6.1

tfproto version 6.1
This commit is contained in:
James Bardin
2021-10-28 16:00:02 -04:00
committed by GitHub
10 changed files with 645 additions and 362 deletions

View File

@@ -22,8 +22,6 @@ type attribute struct {
type nestedType struct {
Attributes map[string]*attribute `json:"attributes,omitempty"`
NestingMode string `json:"nesting_mode,omitempty"`
MinItems uint64 `json:"min_items,omitempty"`
MaxItems uint64 `json:"max_items,omitempty"`
}
func marshalStringKind(sk configschema.StringKind) string {
@@ -55,8 +53,6 @@ func marshalAttribute(attr *configschema.Attribute) *attribute {
if attr.NestedType != nil {
nestedTy := nestedType{
MinItems: uint64(attr.NestedType.MinItems),
MaxItems: uint64(attr.NestedType.MaxItems),
NestingMode: nestingModeString(attr.NestedType.Nesting),
}
attrs := make(map[string]*attribute, len(attr.NestedType.Attributes))