WIP: Adding support for Create() and Delete() of non-exhaustive lists

pkg/translate/terraform_provider/funcs.go

@@ -1614,10 +1614,16 @@ func ResourceCreateFunction(resourceTyp properties.ResourceType, names *NameProv
 
 	var tmpl string
 	var listAttribute string
+	var exhaustive bool
 	switch resourceTyp {
 	case properties.ResourceEntry:
 		tmpl = resourceCreateFunction
-	default:
+	case properties.ResourceEntryPlural, properties.ResourceUuid:
+		exhaustive = true
+		tmpl = resourceCreateManyFunction
+		listAttribute = pascalCase(paramSpec.TerraformProviderConfig.PluralName)
+	case properties.ResourceUuidPlural:
+		exhaustive = false
 		tmpl = resourceCreateManyFunction
 		listAttribute = pascalCase(paramSpec.TerraformProviderConfig.PluralName)
 	}
@@ -1630,6 +1636,7 @@ func ResourceCreateFunction(resourceTyp properties.ResourceType, names *NameProv
 
 	data := map[string]interface{}{
 		"HasEncryptedResources": paramSpec.HasEncryptedResources(),
+		"Exhaustive":            exhaustive,
 		"ListAttribute":         listAttributeVariant,
 		"EntryOrConfig":         paramSpec.EntryOrConfig(),
 		"HasEntryName":          paramSpec.HasEntryName(),
@@ -1724,6 +1731,7 @@ func ResourceReadFunction(resourceTyp properties.ResourceType, names *NameProvid
 		"EntryOrConfig":         paramSpec.EntryOrConfig(),
 		"HasEntryName":          paramSpec.HasEntryName(),
 		"structName":            names.StructName,
+		"datasourceStructName":  names.DataSourceStructName,
 		"resourceStructName":    names.ResourceStructName,
 		"serviceName":           naming.CamelCase("", serviceName, "", false),
 		"resourceSDKName":       resourceSDKName,

pkg/translate/terraform_provider/template.go

@@ -203,6 +203,9 @@ func (r *{{ resourceStructName }}) ImportState(ctx context.Context, req resource
 {{- /* Done */ -}}`
 
 const resourceCreateManyFunction = `
+{{ $resourceSDKStructName := printf "%s.%s" .resourceSDKName .EntryOrConfig }}
+{{ $resourceTFStructName := printf "%s%sObject" .structName .ListAttribute.CamelCase }}
+
 var state, createdState {{ .structName }}Model
 resp.Diagnostics.Append(req.Plan.Get(ctx, &state)...)
 if resp.Diagnostics.HasError() {
@@ -220,12 +223,12 @@ svc := {{ .resourceSDKName }}.NewService(r.client)
 var location {{ .resourceSDKName }}.Location
 {{ RenderLocationsStateToPango "state.Location" "location" }}
 
-var elements []{{ .structName }}{{ .ListAttribute.CamelCase }}Object
+var elements []{{ $resourceTFStructName }}
 state.{{ .ListAttribute.CamelCase }}.ElementsAs(ctx, &elements, false)
-entries := make([]*{{ .resourceSDKName }}.{{ .EntryOrConfig }}, len(elements))
+entries := make([]*{{ $resourceSDKStructName }}, len(elements))
 for idx, elt := range elements {
 	var list_diags diag.Diagnostics
-	var entry *{{ .resourceSDKName }}.{{ .EntryOrConfig }}
+	var entry *{{ $resourceSDKStructName }}
 	entry, list_diags = elt.CopyToPango(ctx, nil)
 	resp.Diagnostics.Append(list_diags...)
 	if resp.Diagnostics.HasError() {
@@ -234,18 +237,141 @@ for idx, elt := range elements {
 	entries[idx] = entry
 }
 
-objects := make([]{{ .structName }}{{ .ListAttribute.CamelCase }}Object, len(entries))
+specifier, _, err := {{ .resourceSDKName }}.Versioning(r.client.Versioning())
+if err != nil {
+	resp.Diagnostics.AddError("error while creating specifier", err.Error())
+	return
+}
+
+updates := xmlapi.NewMultiConfig(len(entries))
+
+objects := make([]{{ $resourceTFStructName }}, len(entries))
+for _, elt := range entries {
+	path, err := location.XpathWithEntryName(r.client.Versioning(), elt.Name)
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to create xpath for existing entry", err.Error())
+		return
+	}
+
+	xmlEntry, err := specifier(*elt)
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to transform Entry into XML document", err.Error())
+		return
+	}
+
+	updates.Add(&xmlapi.Config{
+		Action:  "edit",
+		Xpath:   util.AsXpath(path),
+		Element: xmlEntry,
+		Target:  r.client.GetTarget(),
+	})
+}
+
+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
+	}
+}
+
+existing, err := svc.List(ctx, location, "get", "", "")
+if err != nil && err.Error() != "Object not found" {
+	resp.Diagnostics.AddError("sdk error while listing resources", err.Error())
+	return
+}
+
+var movementRequired bool
+{{- if .Exhaustive }}
+// We manage the entire list of PAN-OS objects, so the order of entries
+// from the plan is compared against all existing PAN-OS objects.
+for idx, elt := range existing {
+	if processedStateEntries[elt.Name].StateIdx != idx {
+		movementRequired = true
+	}
+	processedStateEntries[elt.Name].Entry.Uuid = elt.Uuid
+}
+{{- else }}
+// We only manage a subset of PAN-OS object on the given list, so care
+// has to be taken to calculate the order of those managed elements on the
+// PAN-OS side.
+type entryWithState struct {
+	Entry    *{{ $resourceSDKStructName }}
+	StateIdx int
+}
+
+
+plannedEntriesByName := make(map[string]*entryWithState, len(entries))
 for idx, elt := range entries {
-	created, err := svc.Create(ctx, location, *elt)
+	plannedEntriesByName[elt.Name] = &entryWithState{
+		Entry:    elt,
+		StateIdx: idx,
+	}
+}
+
+// We filter all existing entries to end up with a list of entries that
+// are in the plan. For every element of that list, we store its PAN-OS
+// list index as StateIdx. Finally, the managedEntries index will serve
+// as a way to check if managed entries are in order relative to each
+// other.
+managedEntries := make([]*entryWithState, len(entries))
+for idx, elt := range existing {
+	if _, found := plannedEntriesByName[elt.Name]; found {
+		managedEntries = append(managedEntries, &entryWithState{
+			Entry: &elt,
+			StateIdx: idx,
+		})
+	}
+}
+
+var previousManagedEntry, previousPlannedEntry *entryWithState
+for idx, elt := range managedEntries {
+	// plannedEntriesByName is a map of entries from the plan indexed by their
+	// name. If idx doesn't match StateIdx of the entry from the plan, the PAN-OS
+	// object is out of order.
+	plannedEntry := plannedEntriesByName[elt.Entry.Name]
+	if plannedEntry.StateIdx != idx {
+		movementRequired = true
+		break
+	}
+	// If this is the first element we are comparing, store it for future reference
+	// and continue. We will use it to calculate distance between two elements in
+	// PAN-OS list.
+	if previousManagedEntry == nil {
+		previousManagedEntry = elt
+		previousPlannedEntry = plannedEntry
+		continue
+	}
+
+	serverDistance := elt.StateIdx - previousManagedEntry.StateIdx
+	planDistance := plannedEntry.StateIdx - previousPlannedEntry.StateIdx
+
+	// If the distance between previous and current object differs between
+	// PAN-OS and the plan, we need to move objects around.
+	if serverDistance != planDistance {
+		movementRequired = true
+		break
+	}
+
+	previousManagedEntry = elt
+	previousPlannedEntry = plannedEntry
+}
+{{- end }}
+
+if movementRequired {
+	entries := make([]{{ $resourceSDKStructName }}, len(plannedEntriesByName))
+	for _, elt := range plannedEntriesByName {
+		entries[elt.StateIdx] = *elt.Entry
+	}
+
+	trueValue := true
+	err = svc.MoveGroup(ctx, location, rule.Position{First: &trueValue}, entries)
 	if err != nil {
-		resp.Diagnostics.AddError("SDK error during create", err.Error())
+		resp.Diagnostics.AddError("Failed to reorder entries", err.Error())
 		return
 	}
-	var object {{ .structName }}{{ .ListAttribute.CamelCase }}Object
-	object.CopyFromPango(ctx, created, nil)
-	objects[idx] = object
 }
 
+
 var list_diags diag.Diagnostics
 createdState.Location = state.Location
 createdState.{{ .ListAttribute.CamelCase }}, list_diags = types.ListValueFrom(ctx, state.getTypeFor("{{ .ListAttribute.Underscore }}"), objects)
@@ -363,6 +489,17 @@ const resourceCreateFunction = `
 `
 
 const resourceReadManyFunction = `
+{{- $structName := "" }}
+{{- if eq .ResourceOrDS "DataSource" }}
+  {{ $structName = .dataSourceStructName }}
+{{- else }}
+  {{ $structName = .resourceStructName }}
+{{- end }}
+{{- $resourceSDKStructName := printf "%s.%s" .resourceSDKName .EntryOrConfig }}
+{{- $resourceTFStructName := printf "%s%sObject" $structName .ListAttribute.CamelCase }}
+// {{ $resourceSDKStructName }}
+// {{ $resourceTFStructName }}
+
 {{- $stateName := "" }}
 {{- if eq .ResourceOrDS "DataSource" }}
   {{- $stateName = "Config" }}
@@ -393,19 +530,35 @@ if err != nil {
 	return
 }
 
-{{- if not .Exhaustive }}
-// FIXME: For non-exhaustive variants (security_policy_rules etc.) we only want
-// to check if all entries are in place, and in the correct position.
-{{- end }}
-
-
+{{- if .Exhaustive }}
+// For resources that take sole ownership of a given list, Read()
+// will return all existing entries from the server.
 objects := make([]{{ .structName }}{{ .ResourceOrDS }}{{ .ListAttribute.CamelCase }}Object, len(existing))
 for idx, elt := range existing {
-	fmt.Printf("Read() entry: %v %v", elt.Name, *elt.Uuid)
 	var object {{ .structName }}{{ .ResourceOrDS }}{{ .ListAttribute.CamelCase }}Object
 	object.CopyFromPango(ctx, &elt, nil)
 	objects[idx] = object
 }
+{{- else }}
+// For resources that only manage their own items in the list, Read()
+// must only objects that are already part of the state.
+var elements []{{ $resourceTFStructName }}
+state.{{ .ListAttribute.CamelCase }}.ElementsAs(ctx, &elements, false)
+stateObjectsByName := make(map[string]*{{ $resourceTFStructName }}, len(elements))
+for _, elt := range elements {
+	stateObjectsByName[elt.Name.ValueString()] = &elt
+}
+
+objects := make([]{{ .structName }}{{ .ResourceOrDS }}{{ .ListAttribute.CamelCase }}Object, len(state.{{ .ListAttribute.CamelCase }}.Elements()))
+for idx, elt := range existing {
+	if _, found := stateObjectsByName[elt.Name]; !found {
+		continue
+	}
+	var object {{ .structName }}{{ .ResourceOrDS }}{{ .ListAttribute.CamelCase }}Object
+	object.CopyFromPango(ctx, &elt, nil)
+	objects[idx] = object
+}
+{{- end }}
 
 
 var list_diags diag.Diagnostics
@@ -707,6 +860,7 @@ for _, existingElt := range existing {
 		continue
 	}
 
+{{- if .Exhaustive }}
 	processedElt, found := processedStateEntries[existingElt.Name]
 	if !found {
 		// If existing entry is not found in the processedEntries map, it's not
@@ -716,7 +870,10 @@ for _, existingElt := range existing {
 			Xpath:  util.AsXpath(path),
 			Target: r.client.GetTarget(),
 		})
-	} else if processedElt.Entry.Uuid != nil && *processedElt.Entry.Uuid == *existingElt.Uuid {
+		continue
+	}
+{{- end }}
+	if processedElt.Entry.Uuid != nil && *processedElt.Entry.Uuid == *existingElt.Uuid {
 		// XXX: If entry from the plan is in process of being renamed, and its content
 		// differs from what exists on the server we should switch its state to entryOutdated
 		// instead.