[ignore] add support for null to plan when state is null and plan unk…

…nown attributes inside of sets

gen/generator.go

@@ -142,6 +142,18 @@ var templateFuncs = template.FuncMap{
 	"addToChild":                            AddToChildInTestTemplate,
 	"checkDeletableChild":                   CheckDeletableChild,
 	"emptyChild":                            EmptyChild,
+	"excludeForNullInSetCheck":              ExcludeForNullInSetCheck,
+}
+
+func ExcludeForNullInSetCheck(resourceClassName string) bool {
+	// Function to exclude TagTag and TagAnnotation from the null check in the Set function
+	// Done to reduce the amount of functions created which are not needed for these classes
+	// During refactor to struct per class which is reused in children this is not needed anymore
+	var childClasses []string
+	for _, child := range alwaysIncludeChildren {
+		childClasses = append(childClasses, Capitalize(strings.ReplaceAll(child, ":", "")))
+	}
+	return !slices.Contains(childClasses, resourceClassName)
 }
 
 func ContainsRequired(properties map[string]Property) bool {

gen/templates/resource.go.tmpl

@@ -864,8 +864,8 @@ func (r *{{.ResourceClassName}}Resource) ModifyPlan(ctx context.Context, req res
 				if GetMOName(stateData.Deprecated{{$SetName}}.ValueString()) == attributeValues.{{ .Name }}.ValueString() && !attributeValues.{{ .Name }}.IsNull() {
 					planData.Deprecated{{$SetName}} = stateData.Deprecated{{$SetName}}
 				}
+									{{- end}}
 								{{- end}}
-							{{- end}}
 			}
 		} else if !configData.Deprecated{{ $SetName }}.IsNull() {
 			var newAttributeValues {{ $SetName }}{{.ParentHierarchy}}ResourceModel
@@ -1623,7 +1623,7 @@ func (r *{{.ResourceClassName}}Resource) Schema(ctx context.Context, req resourc
 				{{- if not .ReadOnly }}
 				PlanModifiers: []planmodifier.Set{
 					setplanmodifier.UseStateForUnknown(),
-					SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate(),
+					SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate(nil),
 
 				},
 				{{- end}}
@@ -2660,6 +2660,7 @@ func getEmpty{{.ResourceClassName}}{{.ParentHierarchy}}ResourceModel() {{.Resour
 		{{- end}}
     }
 }
+
 {{- if or (not .IdentifiedBy) .MaxOneClassAllowed}}
 var {{.ResourceClassName}}{{.ParentHierarchy}}Type = map[string]attr.Type{
 	{{- range .Properties}}
@@ -2698,6 +2699,40 @@ var {{.ResourceClassName}}{{.ParentHierarchy}}Type = types.ObjectType{
 	{{- end}}
 	},
 }
+
+{{- if excludeForNullInSetCheck .ResourceClassName}}
+func {{.ResourceClassName}}{{.ParentHierarchy}}SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate(ctx context.Context, planValue, stateValue types.Set) basetypes.SetValue {
+	var planSetValues, stateSetValues []{{.ResourceClassName}}{{.ParentHierarchy}}ResourceModel
+	stateValue.ElementsAs(ctx, &stateSetValues, false)
+	planValue.ElementsAs(ctx, &planSetValues, false)
+
+	// If the length of the state and plan values are different a change is already detected thus reflection can be skipped
+	if len(stateSetValues) == len(planSetValues) {
+		for index, stateValue := range stateSetValues {
+ 			nullInStateFound := false
+			{{- range .Properties}}
+			if stateValue.{{ .Name }}.IsNull() {
+				nullInStateFound = true
+				{{- if eq .ValueType "bitmask"}}
+				planSetValues[index].{{ .Name }} = basetypes.NewSetNull(types.StringType)
+ 				{{- else if .HasCustomType}}
+ 				planSetValues[index].{{ .Name }} = customTypes.New{{.ResourceClassName}}{{.Name}}StringNull()
+				{{- else}}
+				planSetValues[index].{{ .Name }} = basetypes.NewStringNull()
+ 				{{- end}}
+			}
+			{{- end}}
+ 			if !nullInStateFound {
+				// when there are no null fields we can conclude the version supports all attributes in set
+				break
+			}
+		}
+	}
+	planSet, _ := types.SetValueFrom(ctx, {{.ResourceClassName}}{{.ParentHierarchy}}Type, planSetValues)
+	return planSet
+
+}
+{{- end}}
 {{- end}}
 {{- range .Children}}
 	{{- template "childStructsAndAttributeTypes" . }}
@@ -2780,6 +2815,11 @@ var {{.ResourceClassName}}{{.ParentHierarchy}}Type = types.ObjectType{
     Computed:            true,
     PlanModifiers: []planmodifier.Set{
         setplanmodifier.UseStateForUnknown(),
+		{{- if excludeForNullInSetCheck .ResourceClassName}}
+		SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate({{.ResourceClassName}}{{.ParentHierarchy}}SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate),
+		{{- else}}
+		SetToSetNullWhenStateIsNullPlanIsUnknownDuringUpdate(nil),
+		{{- end}}
     },
     NestedObject: schema.NestedAttributeObject{
         Attributes: map[string]schema.Attribute{