[ignore] Add changes to custom type and remove reflect from rn constr…

…uction function
CiscoDevNet · Nov 11, 2024 · 24898fb · 24898fb
1 parent 079f3e4
commit 24898fb
Show file tree

Hide file tree

Showing 80 changed files with 166 additions and 515 deletions.
diff --git a/gen/generator.go b/gen/generator.go
@@ -134,6 +134,8 @@ var templateFuncs = template.FuncMap{
 	"definedInList":                     DefinedInList,
 	"keyExists":                         KeyExists,
 	"isNewNamedClassAttributeMatch":     IsNewNamedClassAttributeMatch,
+	"getRnFormat":                       GetRnFormat,
+	"identifierIsCustomType":            IdentifierIsCustomType,
 }
 
 func ContainsRequired(properties map[string]Property) bool {
@@ -211,6 +213,24 @@ func GetPropertyNameForLegacyAttribute(name string, legacyAttributes map[string]
 	return ""
 }
 
+func GetRnFormat(rnformat string, identifiers []interface{}) string {
+	if len(identifiers) > 0 {
+		for _, identifier := range identifiers {
+			rnformat = strings.ReplaceAll(rnformat, fmt.Sprintf("{%s}", identifier), "%s")
+		}
+	}
+	return rnformat
+}
+
+func IdentifierIsCustomType(identifier string, properties map[string]Property) bool {
+	for propertyName, property := range properties {
+		if propertyName == identifier {
+			return property.HasCustomType
+		}
+	}
+	return false
+}
+
 func GetLegacyChildAttribute(className, overwriteProperty string, property Property, legacyAttributes map[string]LegacyAttribute, legacyBlocks []LegacyBlock) string {
 
 	for _, legacyBlock := range legacyBlocks {

diff --git a/gen/templates/custom_type.go.tmpl b/gen/templates/custom_type.go.tmpl
@@ -112,6 +112,10 @@ func (v {{.ResourceClassName}}{{.Name}}StringValue) StringSemanticEquals(ctx con
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v {{.ResourceClassName}}{{.Name}}StringValue) NamedValueString() string {
+	return {{.ResourceClassName}}{{.Name}}ValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func {{.ResourceClassName}}{{.Name}}ValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 	{{- range $key, $value := .ValidValuesMap}}

diff --git a/gen/templates/datasource.go.tmpl b/gen/templates/datasource.go.tmpl
@@ -115,6 +115,9 @@ func (d *{{.ResourceClassName}}DataSource) Schema(ctx context.Context, req datas
 			{{- range .Properties}}
 				{{- if .IsNaming}}
 			"{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}": schema.StringAttribute{
+					{{- if .HasCustomType}}
+				CustomType: customTypes.{{.ResourceClassName}}{{.Name}}StringType{},
+					{{- end}}
 				Required:            true,
 				MarkdownDescription: `{{.Comment}}`,
 			},{{else if eq .ValueType "bitmask"}}

diff --git a/gen/templates/resource.go.tmpl b/gen/templates/resource.go.tmpl
@@ -1999,17 +1999,7 @@ func getAndSet{{.ResourceClassName}}Attributes(ctx context.Context, diags *diag.
 }
 
 func get{{.ResourceClassName}}Rn(ctx context.Context, data *{{.ResourceClassName}}ResourceModel) string {
-	{{- if .IdentifiedBy}}
-	rn := "{{.RnFormat}}"
-	for _, identifier := range []string{ {{- fromInterfacesToString .IdentifiedBy}} } {
-		fieldName := fmt.Sprintf("%s%s", strings.ToUpper(identifier[:1]), identifier[1:])
-		fieldValue := reflect.ValueOf(data).Elem().FieldByName(fieldName).Interface().(basetypes.StringValue).ValueString()
-		rn = strings.ReplaceAll(rn, fmt.Sprintf("{%s}", identifier), fieldValue)
-	}
-	return rn
-	{{- else}}
-	return "{{.RnFormat}}"
-	{{- end}}
+	return fmt.Sprintf("{{getRnFormat .RnFormat .IdentifiedBy}}", {{$i := 1}}{{$length := len .IdentifiedBy}}{{ range .IdentifiedBy}}data.{{capitalize .}}{{- if identifierIsCustomType . $.Properties}}.NamedValueString(){{else}}.ValueString(){{end}}{{ if ne $length $i}}{{$i = add $i 1}}, {{end}}{{- end}})
 }
 
 {{ if .HasParent}}
@@ -2138,7 +2128,11 @@ func get{{$.ResourceClassName}}{{ .ResourceClassName }}ChildPayloads(ctx context
 			{{ .PkgName }}Identifier := {{ .ResourceClassName }}Identifier{}
 					{{- range .Properties}}
 						{{- if .IsNaming}}
+							{{- if .HasCustomType}}
+			{{ .PkgName }}Identifier.{{.Name}} = basetypes.NewStringValue({{ .PkgName }}.{{- if eq .Name "Id"}}{{.ResourceClassName}}.ValueString(){{ .Name }}{{- else}}{{.Name}}.ValueString(){{- end}})
+							{{- else}}
 			{{ .PkgName }}Identifier.{{.Name}} = {{ .PkgName }}.{{- if eq .Name "Id"}}{{.ResourceClassName}}{{ .Name }}{{- else}}{{.Name}}{{- end}}
+							{{- end}}
 						{{- end}}
 					{{- end}}
 			{{ .PkgName }}Identifiers = append({{ .PkgName }}Identifiers, {{ .PkgName }}Identifier)
@@ -2151,7 +2145,11 @@ func get{{$.ResourceClassName}}{{ .ResourceClassName }}ChildPayloads(ctx context
 				if 
 					{{- range .Properties}}
 						{{- if .IsNaming }}
+							{{- if .HasCustomType}}
+					{{ .PkgName }}Identifier.{{.Name}} == basetypes.NewStringValue({{ .PkgName }}.{{- if eq .Name "Id"}}{{.ResourceClassName}}.ValueString(){{ .Name }}{{- else}}{{.Name}}.ValueString(){{- end}}){{- if ne $length $i}} {{$i = add $i 1}} && {{- end}}
+							{{- else}}
 					{{ .PkgName }}Identifier.{{.Name}} == {{ .PkgName }}.{{- if eq .Name "Id"}}{{.ResourceClassName}}{{ .Name }}{{- else}}{{.Name}}{{- end}}{{- if ne $length $i}} {{$i = add $i 1}} && {{- end}}
+							{{- end}}
 						{{- end}}
 					{{- end}} {
 					delete = false

diff --git a/internal/custom_types/fvAEPg_prio.go b/internal/custom_types/fvAEPg_prio.go
@@ -112,6 +112,10 @@ func (v FvAEPgPrioStringValue) StringSemanticEquals(ctx context.Context, newValu
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v FvAEPgPrioStringValue) NamedValueString() string {
+	return FvAEPgPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func FvAEPgPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/fvRsConsIf_prio.go b/internal/custom_types/fvRsConsIf_prio.go
@@ -112,6 +112,10 @@ func (v FvRsConsIfPrioStringValue) StringSemanticEquals(ctx context.Context, new
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v FvRsConsIfPrioStringValue) NamedValueString() string {
+	return FvRsConsIfPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func FvRsConsIfPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/fvRsCons_prio.go b/internal/custom_types/fvRsCons_prio.go
@@ -112,6 +112,10 @@ func (v FvRsConsPrioStringValue) StringSemanticEquals(ctx context.Context, newVa
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v FvRsConsPrioStringValue) NamedValueString() string {
+	return FvRsConsPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func FvRsConsPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/fvRsProv_prio.go b/internal/custom_types/fvRsProv_prio.go
@@ -112,6 +112,10 @@ func (v FvRsProvPrioStringValue) StringSemanticEquals(ctx context.Context, newVa
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v FvRsProvPrioStringValue) NamedValueString() string {
+	return FvRsProvPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func FvRsProvPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/mgmtInstP_prio.go b/internal/custom_types/mgmtInstP_prio.go
@@ -112,6 +112,10 @@ func (v MgmtInstPPrioStringValue) StringSemanticEquals(ctx context.Context, newV
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v MgmtInstPPrioStringValue) NamedValueString() string {
+	return MgmtInstPPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func MgmtInstPPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/mgmtRsOoBCons_prio.go b/internal/custom_types/mgmtRsOoBCons_prio.go
@@ -112,6 +112,10 @@ func (v MgmtRsOoBConsPrioStringValue) StringSemanticEquals(ctx context.Context,
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v MgmtRsOoBConsPrioStringValue) NamedValueString() string {
+	return MgmtRsOoBConsPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func MgmtRsOoBConsPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/netflowExporterPol_dscp.go b/internal/custom_types/netflowExporterPol_dscp.go
@@ -112,6 +112,10 @@ func (v NetflowExporterPolDscpStringValue) StringSemanticEquals(ctx context.Cont
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v NetflowExporterPolDscpStringValue) NamedValueString() string {
+	return NetflowExporterPolDscpValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func NetflowExporterPolDscpValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0":  "CS0",

diff --git a/internal/custom_types/netflowExporterPol_dstPort.go b/internal/custom_types/netflowExporterPol_dstPort.go
@@ -112,6 +112,10 @@ func (v NetflowExporterPolDstPortStringValue) StringSemanticEquals(ctx context.C
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v NetflowExporterPolDstPortStringValue) NamedValueString() string {
+	return NetflowExporterPolDstPortValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func NetflowExporterPolDstPortValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0":   "unspecified",

diff --git a/internal/custom_types/qosDppPol_be.go b/internal/custom_types/qosDppPol_be.go
@@ -112,6 +112,10 @@ func (v QosDppPolBeStringValue) StringSemanticEquals(ctx context.Context, newVal
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolBeStringValue) NamedValueString() string {
+	return QosDppPolBeValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolBeValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffffffffffffffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_burst.go b/internal/custom_types/qosDppPol_burst.go
@@ -112,6 +112,10 @@ func (v QosDppPolBurstStringValue) StringSemanticEquals(ctx context.Context, new
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolBurstStringValue) NamedValueString() string {
+	return QosDppPolBurstValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolBurstValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffffffffffffffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_conformMarkCos.go b/internal/custom_types/qosDppPol_conformMarkCos.go
@@ -112,6 +112,10 @@ func (v QosDppPolConformMarkCosStringValue) StringSemanticEquals(ctx context.Con
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolConformMarkCosStringValue) NamedValueString() string {
+	return QosDppPolConformMarkCosValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolConformMarkCosValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_conformMarkDscp.go b/internal/custom_types/qosDppPol_conformMarkDscp.go
@@ -112,6 +112,10 @@ func (v QosDppPolConformMarkDscpStringValue) StringSemanticEquals(ctx context.Co
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolConformMarkDscpStringValue) NamedValueString() string {
+	return QosDppPolConformMarkDscpValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolConformMarkDscpValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_exceedMarkCos.go b/internal/custom_types/qosDppPol_exceedMarkCos.go
@@ -112,6 +112,10 @@ func (v QosDppPolExceedMarkCosStringValue) StringSemanticEquals(ctx context.Cont
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolExceedMarkCosStringValue) NamedValueString() string {
+	return QosDppPolExceedMarkCosValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolExceedMarkCosValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_exceedMarkDscp.go b/internal/custom_types/qosDppPol_exceedMarkDscp.go
@@ -112,6 +112,10 @@ func (v QosDppPolExceedMarkDscpStringValue) StringSemanticEquals(ctx context.Con
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolExceedMarkDscpStringValue) NamedValueString() string {
+	return QosDppPolExceedMarkDscpValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolExceedMarkDscpValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_violateMarkCos.go b/internal/custom_types/qosDppPol_violateMarkCos.go
@@ -112,6 +112,10 @@ func (v QosDppPolViolateMarkCosStringValue) StringSemanticEquals(ctx context.Con
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolViolateMarkCosStringValue) NamedValueString() string {
+	return QosDppPolViolateMarkCosValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolViolateMarkCosValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/qosDppPol_violateMarkDscp.go b/internal/custom_types/qosDppPol_violateMarkDscp.go
@@ -112,6 +112,10 @@ func (v QosDppPolViolateMarkDscpStringValue) StringSemanticEquals(ctx context.Co
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v QosDppPolViolateMarkDscpStringValue) NamedValueString() string {
+	return QosDppPolViolateMarkDscpValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func QosDppPolViolateMarkDscpValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0xffff": "unspecified",

diff --git a/internal/custom_types/vzOOBBrCP_prio.go b/internal/custom_types/vzOOBBrCP_prio.go
@@ -112,6 +112,10 @@ func (v VzOOBBrCPPrioStringValue) StringSemanticEquals(ctx context.Context, newV
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v VzOOBBrCPPrioStringValue) NamedValueString() string {
+	return VzOOBBrCPPrioValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func VzOOBBrCPPrioValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0": "unspecified",

diff --git a/internal/custom_types/vzOOBBrCP_targetDscp.go b/internal/custom_types/vzOOBBrCP_targetDscp.go
@@ -112,6 +112,10 @@ func (v VzOOBBrCPTargetDscpStringValue) StringSemanticEquals(ctx context.Context
 	return priorMappedValue.Equal(newMappedValue), diags
 }
 
+func (v VzOOBBrCPTargetDscpStringValue) NamedValueString() string {
+	return VzOOBBrCPTargetDscpValueMap(basetypes.NewStringValue(v.ValueString())).ValueString()
+}
+
 func VzOOBBrCPTargetDscpValueMap(value basetypes.StringValue) basetypes.StringValue {
 	matchMap := map[string]string{
 		"0":  "CS0",

diff --git a/internal/provider/resource_aci_access_interface_override.go b/internal/provider/resource_aci_access_interface_override.go
diff --git a/internal/provider/resource_aci_annotation.go b/internal/provider/resource_aci_annotation.go
diff --git a/internal/provider/resource_aci_application_epg.go b/internal/provider/resource_aci_application_epg.go
diff --git a/internal/provider/resource_aci_bridge_domain.go b/internal/provider/resource_aci_bridge_domain.go