for item with type object, render []string, which will contain all me…

…mbers
PaloAltoNetworks · Mar 13, 2024 · b51801b · b51801b
1 parent 2939d86
commit b51801b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/pkg/properties/normalized.go b/pkg/properties/normalized.go
@@ -97,6 +97,7 @@ type SpecParamCount struct {
 type SpecParamItems struct {
 	Type   string                `json:"type" yaml:"type"`
 	Length *SpecParamItemsLength `json:"length" yaml:"length"`
+	Ref    []*string             `json:"ref" yaml:"ref"`
 }
 
 type SpecParamItemsLength struct {

diff --git a/pkg/properties/normalized_test.go b/pkg/properties/normalized_test.go
@@ -283,6 +283,7 @@ spec:
                 length:
                     min: null
                     max: 127
+                ref: []
             profiles:
                 - xpath:
                     - tag

diff --git a/pkg/translate/funcs.go b/pkg/translate/funcs.go
@@ -27,7 +27,7 @@ func NormalizeAssignment(param *properties.SpecParam) string {
 	var builder strings.Builder
 
 	if param.Type == "list" && param.Profiles != nil && len(param.Profiles) > 0 && param.Profiles[0].Type == "member" {
-		builder.WriteString(fmt.Sprintf("entry.%s = entryXml.%s", param.Name.CamelCase, param.Name.CamelCase))
+		builder.WriteString(fmt.Sprintf("entry.%s = o.%s", param.Name.CamelCase, param.Name.CamelCase))
 	} else if param.Spec != nil {
 		for _, subParam := range param.Spec.Params {
 			builder.WriteString(nestedObjectDeclaration([]string{param.Name.CamelCase}, subParam))
@@ -41,7 +41,7 @@ func NormalizeAssignment(param *properties.SpecParam) string {
 		}
 		builder.WriteString("}\n")
 	} else {
-		builder.WriteString(fmt.Sprintf("entry.%s = entryXml.%s", param.Name.CamelCase, param.Name.CamelCase))
+		builder.WriteString(fmt.Sprintf("entry.%s = o.%s", param.Name.CamelCase, param.Name.CamelCase))
 	}
 
 	return builder.String()

diff --git a/pkg/translate/structs.go b/pkg/translate/structs.go
@@ -56,7 +56,11 @@ func SpecParamType(param *properties.SpecParam) string {
 
 	calculatedType := ""
 	if param.Type == "list" && param.Items != nil {
-		calculatedType = param.Items.Type
+		if param.Items.Type == "object" && param.Items.Ref != nil {
+			calculatedType = "string"
+		} else {
+			calculatedType = param.Items.Type
+		}
 	} else if param.Spec != nil {
 		calculatedType = fmt.Sprintf("Spec%s", naming.CamelCase("", param.Name.CamelCase, "", true))
 	} else {

diff --git a/specs/objects/address-group.yaml b/specs/objects/address-group.yaml
@@ -100,6 +100,7 @@ spec:
         type: 'object'
         ref:
           - '#/specs/objects/address.yaml'
+          - '#/specs/objects/address-group.yaml'
       profiles:
         -
           type: 'member'
-Original file line number
+Diff line change
@@ Expand Up / @@ -283,6 +283,7 @@ spec: @@
                     length:
                         min: null
                         max: 127
+                    ref: []
                 profiles:
                     - xpath:
                         - tag
@@ Expand Down @@