Fix some issues related to merging previous PRs

Author: kklimonda-cl

pkg/properties/normalized.go

@@ -346,13 +346,27 @@ func schemaParameterToSpecParameter(schemaSpec *parameter.Parameter) (*SpecParam
 		})
 	}
 
+	var specHashing *SpecParamHashing
+	if schemaSpec.Hashing != nil {
+		specHashing = &SpecParamHashing{
+			Type: schemaSpec.Hashing.Type,
+		}
+	}
+	var terraformProviderConfig *SpecParamTerraformProviderConfig
+	if schemaSpec.CodegenOverrides != nil {
+		terraformProviderConfig = &SpecParamTerraformProviderConfig{
+			Computed: schemaSpec.CodegenOverrides.Terraform.Computed,
+		}
+	}
 	specParameter := &SpecParam{
-		Description: schemaSpec.Description,
-		Type:        specType,
-		Default:     defaultVal,
-		Required:    schemaSpec.Required,
-		Profiles:    profiles,
-		Spec:        innerSpec,
+		Description:             schemaSpec.Description,
+		Type:                    specType,
+		Default:                 defaultVal,
+		Required:                schemaSpec.Required,
+		TerraformProviderConfig: terraformProviderConfig,
+		Hashing:                 specHashing,
+		Profiles:                profiles,
+		Spec:                    innerSpec,
 	}
 
 	for _, v := range schemaSpec.Validators {

pkg/schema/parameter/parameter.go

@@ -23,6 +23,7 @@ type Parameter struct {
 	Description      string                `yaml:"description"`
 	Type             string                `yaml:"type"`
 	CodegenOverrides *CodegenOverrides     `yaml:"codegen_overrides"`
+	Hashing          *HashingSpec          `yaml:"hashing"`
 	Required         bool                  `yaml:"required"`
 	Profiles         []profile.Profile     `yaml:"profiles"`
 	Validators       []validator.Validator `yaml:"validators"`
@@ -49,6 +50,10 @@ type CodegenOverrides struct {
 	Terraform *CodegenOverridesTerraform `yaml:"terraform"`
 }
 
+type HashingSpec struct {
+	Type string `yaml:"type"`
+}
+
 // EnumSpec describes a parameter of type enum
 //
 // Values is a list of EnumSpecValue, where each one consisting of the PAN-OS Value

pkg/translate/terraform_provider/funcs.go

@@ -776,22 +776,11 @@ func createSchemaSpecForParameter(typ schemaType, structPrefix string, packageNa
 			LowerCamelCase: naming.CamelCase("", "name", "", false),
 		}
 
-		var computed, optional bool
-		if param.TerraformProviderConfig != nil {
-			computed = param.TerraformProviderConfig.Computed
-			optional = !computed
-		} else if param.Default != "" {
-			computed = true
-			optional = true
-		}
-
 		attributes = append(attributes, attributeCtx{
 			Package:    packageName,
 			Name:       name,
 			SchemaType: "StringAttribute",
 			Required:   true,
-			Computed:   computed,
-			Optional:   optional,
 		})
 	}
 
@@ -870,12 +859,10 @@ func createSchemaAttributeForParameter(typ schemaType, packageName string, param
 		}
 	}
 
-	var optional, computed bool
+	var computed bool
 	if param.TerraformProviderConfig != nil {
 		computed = param.TerraformProviderConfig.Computed
-		optional = !computed
 	} else if param.Default != "" {
-		optional = true
 		computed = true
 	}
 
@@ -886,7 +873,7 @@ func createSchemaAttributeForParameter(typ schemaType, packageName string, param
 		ElementType: elementType,
 		Description: param.Description,
 		Required:    param.Required,
-		Optional:    optional,
+		Optional:    !param.Required,
 		Sensitive:   param.Sensitive,
 		Default:     defaultValue,
 		Computed:    computed,

specs/device/ntp.yaml

@@ -128,7 +128,7 @@ spec:
                                 - xpath: ["key-id"]
                           variants:
                             - name: md5
-                              type: string
+                              type: object
                               profiles:
                                 - xpath: ["algorithm", "md5"]
                               spec:
@@ -149,7 +149,7 @@ spec:
                                     profiles:
                                       - xpath: ["authentication-key"]
                             - name: sha1
-                              type: string
+                              type: object
                               profiles:
                                 - xpath: ["algorithm", "sha1"]
                               spec:
@@ -217,14 +217,16 @@ spec:
                                 - xpath: ["key-id"]
                           variants:
                             - name: md5
-                              type: string
+                              type: object
                               profiles:
-                                - xpath: ["algorithm/md5"]
+                                - xpath: ["algorithm", "md5"]
                               spec:
                                 params:
                                   - name: authentication_key
                                     type: string
                                     description: "Symmetric Key MD5 String"
+                                    hashing:
+                                      type: solo
                                     validators:
                                       - type: length
                                         spec:
@@ -233,14 +235,16 @@ spec:
                                     profiles:
                                       - xpath: ["authentication-key"]
                             - name: sha1
-                              type: string
+                              type: object
                               profiles:
-                                - xpath: ["algorithm/sha1"]
+                                - xpath: ["algorithm", "sha1"]
                               spec:
                                 params:
                                   - name: authentication_key
                                     type: string
                                     description: "Symmetric Key SHA1 Hexadecimal"
+                                    hashing:
+                                      type: solo
                                     validators:
                                       - type: length
                                         spec: