Implementation of Delete() for entry and uuid-style lists

Author: kklimonda-cl

pkg/translate/terraform_provider/funcs.go

@@ -1967,29 +1967,59 @@ func ResourceUpdateFunction(resourceTyp properties.ResourceType, names *NameProv
 	return processTemplate(tmpl, "resource-update-function", data, funcMap)
 }
 
-func ResourceDeleteFunction(resourceTyp properties.ResourceType, structName string, serviceName string, paramSpec *properties.Normalization, resourceSDKName string) (string, error) {
+func ResourceDeleteFunction(resourceTyp properties.ResourceType, names *NameProvider, serviceName string, paramSpec *properties.Normalization, resourceSDKName string) (string, error) {
 	if strings.Contains(serviceName, "group") {
 		serviceName = "group"
 	}
 
+	var tmpl string
+	var listAttribute string
+	var exhaustive bool
+	switch resourceTyp {
+	case properties.ResourceEntry:
+		tmpl = resourceDeleteFunction
+	case properties.ResourceEntryPlural:
+		tmpl = resourceDeleteManyFunction
+		listAttribute = pascalCase(paramSpec.TerraformProviderConfig.PluralName)
+	case properties.ResourceUuid:
+		tmpl = resourceDeleteManyFunction
+		listAttribute = pascalCase(paramSpec.TerraformProviderConfig.PluralName)
+		exhaustive = true
+	case properties.ResourceUuidPlural:
+		tmpl = resourceDeleteManyFunction
+		listAttribute = pascalCase(paramSpec.TerraformProviderConfig.PluralName)
+	}
+
+	listAttributeVariant := &properties.NameVariant{
+		Underscore:     naming.Underscore("", listAttribute, ""),
+		CamelCase:      naming.CamelCase("", listAttribute, "", true),
+		LowerCamelCase: naming.CamelCase("", listAttribute, "", false),
+	}
+
+	var resourceIsMap bool
+	if resourceTyp == properties.ResourceEntryPlural {
+		resourceIsMap = true
+	}
+
 	data := map[string]interface{}{
 		"HasEncryptedResources": paramSpec.HasEncryptedResources(),
+		"ResourceIsMap":         resourceIsMap,
 		"EntryOrConfig":         paramSpec.EntryOrConfig(),
+		"ListAttribute":         listAttributeVariant,
+		"Exhaustive":            exhaustive,
 		"HasEntryName":          paramSpec.HasEntryName(),
-		"structName":            structName,
+		"structName":            names.ResourceStructName,
 		"serviceName":           naming.CamelCase("", serviceName, "", false),
 		"resourceSDKName":       resourceSDKName,
 	}
 
-	var tmpl string
-	switch resourceTyp {
-	case properties.ResourceEntry:
-		tmpl = resourceDeleteFunction
-	case properties.ResourceUuid, properties.ResourceUuidPlural:
-		tmpl = resourceDeleteManyFunction
+	funcMap := template.FuncMap{
+		"RenderLocationsStateToPango": func(source string, dest string) (string, error) {
+			return RenderLocationsStateToPango(names, paramSpec, source, dest)
+		},
 	}
 
-	return processTemplate(tmpl, "resource-delete-function", data, nil)
+	return processTemplate(tmpl, "resource-delete-function", data, funcMap)
 }
 
 func ConfigEntry(entryName string, param *properties.SpecParam) (string, error) {

pkg/translate/terraform_provider/template.go

@@ -1250,6 +1250,13 @@ findMatchingStateEntry := func(entry *{{ $resourceSDKStructName }}) (*{{ $resour
 	if found == nil {
 		return nil, false
 	}
+
+	// If matched entry already exists in the plan, this is not a rename
+	// but adding a missing entry.
+	if _, ok := planEntriesByName[found.Name]; ok {
+		return nil, false
+	}
+
 	return found, true
 }
 
@@ -1592,7 +1599,84 @@ const resourceUpdateFunction = `
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 `
 
-const resourceDeleteManyFunction = ``
+const resourceDeleteManyFunction = `
+{{ $resourceSDKStructName := printf "%s.%s" .resourceSDKName .EntryOrConfig }}
+{{ $resourceTFStructName := printf "%s%sObject" .structName .ListAttribute.CamelCase }}
+
+var state {{ .structName }}Model
+resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+if resp.Diagnostics.HasError() {
+	return
+}
+
+// Basic logging.
+tflog.Info(ctx, "performing resource delete", map[string]any{
+	"resource_name": "panos_{{ UnderscoreName .structName }}",
+	"function":      "Delete",
+})
+
+{{- if .ResourceIsMap }}
+elements := make(map[string]{{ $resourceTFStructName }}, len(state.{{ .ListAttribute.CamelCase }}.Elements()))
+state.{{ .ListAttribute.CamelCase }}.ElementsAs(ctx, &elements, false)
+{{- else }}
+var elements []{{ $resourceTFStructName }}
+state.{{ .ListAttribute.CamelCase }}.ElementsAs(ctx, &elements, false)
+{{- end }}
+
+var location {{ .resourceSDKName }}.Location
+{{ RenderLocationsStateToPango "state.Location" "location" }}
+
+updates := xmlapi.NewMultiConfig(len(elements))
+
+{{- if .Exhausitive }}
+existing, err := svc.List(ctx, location, "get", "", "")
+if err != nil {
+	resp.Diagnostics.AddError("sdk error while listing entries", err.Error())
+}
+for _, elt := range existing {
+	path, err := location.XpathWithEntryName(r.client.Versioning(), elt.Name)
+	if err != nil {
+		resp.Diagnostics.AddError("sdk error while creating xpath", err.Error())
+	}
+	updates.Add(&xmlapi.Config{
+		Action: "delete",
+		Xpath:  util.AsXpath(path),
+		Target: r.client.GetTarget(),
+	})
+}
+{{- else if .ResourceIsMap }}
+for name, _ := range elements {
+	path, err := location.XpathWithEntryName(r.client.Versioning(), name)
+	if err != nil {
+		resp.Diagnostics.AddError("sdk error while creating xpath", err.Error())
+	}
+	updates.Add(&xmlapi.Config{
+		Action: "delete",
+		Xpath:  util.AsXpath(path),
+		Target: r.client.GetTarget(),
+	})
+}
+{{- else }}
+for _, elt := range elements {
+	path, err := location.XpathWithEntryName(r.client.Versioning(), elt.Name.ValueString())
+	if err != nil {
+		resp.Diagnostics.AddError("sdk error while creating xpath", err.Error())
+	}
+	updates.Add(&xmlapi.Config{
+		Action: "delete",
+		Xpath:  util.AsXpath(path),
+		Target: r.client.GetTarget(),
+	})
+}
+{{- end }}
+
+if len(updates.Operations) > 0 {
+	if _, _, _, err := r.client.MultiConfig(ctx, updates, false, nil); err != nil {
+		resp.Diagnostics.AddError("error updating entries", err.Error())
+		return
+	}
+}
+`
 
 const resourceDeleteFunction = `
 	var state {{ .structName }}Model

pkg/translate/terraform_provider/terraform_provider_file.go

@@ -143,7 +143,7 @@ func (g *GenerateTerraformProvider) GenerateTerraformResource(resourceTyp proper
 			return ResourceUpdateFunction(resourceTyp, names, serviceName, spec, names.PackageName)
 		},
 		"ResourceDeleteFunction": func(structName string, serviceName string) (string, error) {
-			return ResourceDeleteFunction(resourceTyp, structName, serviceName, spec, names.PackageName)
+			return ResourceDeleteFunction(resourceTyp, names, serviceName, spec, names.PackageName)
 		},
 		"ParamToModelResource": ParamToModelResource,
 		"ModelNestedStruct":    ModelNestedStruct,