Rename config to ListOf and MapOf

Author: Nicholas Thomson

pkg/generate/config/field.go

@@ -139,13 +139,13 @@ type PrintFieldConfig struct {
 // CustomField instructs the code generator to create a new field that does
 // not exist in the SDK.
 type CustomFieldConfig struct {
-	// MemberShape provides the name of the SDK shape which will become the
+	// ListOf provides the name of the SDK shape which will become the
 	// member of a custom slice field.
-	MemberShape string `json:"member_shape,omitempty"`
-	// ValueShape provides the name of the SDK shape which will become the value
+	ListOf string `json:"list_of,omitempty"`
+	// MapOf provides the name of the SDK shape which will become the value
 	// shape for a custom map field. All maps will have `string` as their key
 	// type.
-	ValueShape string `json:"value_shape,omitempty"`
+	MapOf string `json:"map_of,omitempty"`
 }
 
 // LateInitializeConfig contains instructions for how to handle the

pkg/model/model.go

@@ -158,10 +158,10 @@ func (m *Model) GetCRDs() ([]*CRD, error) {
 				}
 			} else if fieldConfig.CustomField != nil {
 				customField := fieldConfig.CustomField
-				if customField.MemberShape != "" {
-					memberShapeRef, found = m.SDKAPI.GetCustomListRef(customField.MemberShape)
+				if customField.ListOf != "" {
+					memberShapeRef, found = m.SDKAPI.GetCustomListRef(customField.ListOf)
 				} else {
-					memberShapeRef, found = m.SDKAPI.GetCustomMapRef(customField.ValueShape)
+					memberShapeRef, found = m.SDKAPI.GetCustomMapRef(customField.MapOf)
 				}
 				if !found {
 					// This is a compile-time failure, just bomb out...
@@ -250,10 +250,10 @@ func (m *Model) GetCRDs() ([]*CRD, error) {
 				}
 			} else if fieldConfig.CustomField != nil {
 				customField := fieldConfig.CustomField
-				if customField.MemberShape != "" {
-					memberShapeRef, found = m.SDKAPI.GetCustomListRef(customField.MemberShape)
+				if customField.ListOf != "" {
+					memberShapeRef, found = m.SDKAPI.GetCustomListRef(customField.ListOf)
 				} else {
-					memberShapeRef, found = m.SDKAPI.GetCustomMapRef(customField.ValueShape)
+					memberShapeRef, found = m.SDKAPI.GetCustomMapRef(customField.MapOf)
 				}
 				if !found {
 					// This is a compile-time failure, just bomb out...

pkg/sdk/custom_shapes.go

@@ -77,8 +77,8 @@ func (h *Helper) getCustomListFieldMembers() []string {
 
 	for _, resource := range h.cfg.Resources {
 		for _, field := range resource.Fields {
-			if field.CustomField != nil && field.CustomField.MemberShape != "" {
-				members = append(members, field.CustomField.MemberShape)
+			if field.CustomField != nil && field.CustomField.ListOf != "" {
+				members = append(members, field.CustomField.ListOf)
 			}
 		}
 	}
@@ -93,8 +93,8 @@ func (h *Helper) getCustomMapFieldMembers() []string {
 
 	for _, resource := range h.cfg.Resources {
 		for _, field := range resource.Fields {
-			if field.CustomField != nil && field.CustomField.ValueShape != "" {
-				members = append(members, field.CustomField.ValueShape)
+			if field.CustomField != nil && field.CustomField.MapOf != "" {
+				members = append(members, field.CustomField.MapOf)
 			}
 		}
 	}