add IsEmpty utils function and remove cmp.Equal

Author: marceljk

stackit/internal/services/ske/cluster/resource.go

@@ -13,7 +13,6 @@ import (
 	skeUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/ske/utils"
 	stringplanmodifierUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils/planmodifiers/stringplanmodifier"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
@@ -1676,8 +1675,7 @@ func mapNetwork(cl *ske.Cluster, m *Model) error {
 	// If the network field is not provided, the SKE API returns an empty object.
 	// If we parse that object into the terraform model, it will produce an inconsistent result after apply error
 
-	emptyNetwork := &ske.Network{}
-	if cmp.Equal(cl.Network, emptyNetwork, utils.CmpIgnoreAdditionalProperties()) && m.Network.IsNull() {
+	if skeUtils.IsEmptyNetwork(cl.Network) && m.Network.IsNull() {
 		if m.Network.Attributes() == nil {
 			m.Network = types.ObjectNull(networkTypes)
 		}
@@ -1833,8 +1831,7 @@ func mapExtensions(ctx context.Context, cl *ske.Cluster, m *Model) error {
 	}
 	disabledExtensions := aclDisabled && observabilityDisabled && dnsDisabled
 
-	emptyExtensions := &ske.Extension{}
-	if cmp.Equal(cl.Extensions, emptyExtensions, utils.CmpIgnoreAdditionalProperties()) && (disabledExtensions || m.Extensions.IsNull()) {
+	if skeUtils.IsEmptyExtension(cl.Extensions) && (disabledExtensions || m.Extensions.IsNull()) {
 		if m.Extensions.Attributes() == nil {
 			m.Extensions = types.ObjectNull(extensionsTypes)
 		}

stackit/internal/services/ske/utils/util.go

@@ -28,3 +28,17 @@ func ConfigureClient(ctx context.Context, providerData *core.ProviderData, diags
 
 	return apiClient
 }
+
+func IsEmptyNetwork(network *ske.Network) bool {
+	if !network.HasId() && !network.HasControlPlane() {
+		return true
+	}
+	return false
+}
+
+func IsEmptyExtension(extension *ske.Extension) bool {
+	if !extension.HasDns() && !extension.HasAcl() && !extension.HasObservability() {
+		return true
+	}
+	return false
+}

stackit/internal/services/ske/utils/util_test.go

@@ -92,3 +92,118 @@ func TestConfigureClient(t *testing.T) {
 		})
 	}
 }
+
+func TestIsEmptyNetwork(t *testing.T) {
+	tests := []struct {
+		name  string
+		input *ske.Network
+		want  bool
+	}{
+		{
+			name:  "nil network",
+			input: nil,
+			want:  true,
+		},
+		{
+			name:  "empty",
+			input: &ske.Network{},
+			want:  true,
+		},
+		{
+			name: "only AdditionalProperties are set",
+			input: &ske.Network{
+				AdditionalProperties: map[string]interface{}{
+					"foo": "bar",
+				},
+			},
+			want: true,
+		},
+		{
+			name: "id set",
+			input: &ske.Network{
+				Id: new("network-id"),
+			},
+			want: false,
+		},
+		{
+			name: "control plane set",
+			input: &ske.Network{
+				ControlPlane: &ske.V2ControlPlaneNetwork{},
+			},
+			want: false,
+		},
+		{
+			name: "id and control plane set",
+			input: &ske.Network{
+				Id: new("network-id"),
+				ControlPlane: &ske.V2ControlPlaneNetwork{
+					AccessScope: ske.ACCESSSCOPE_SNA.Ptr(),
+				},
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := IsEmptyNetwork(tt.input); got != tt.want {
+				t.Errorf("IsEmptyNetwork() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestIsEmptyExtension(t *testing.T) {
+	tests := []struct {
+		name  string
+		input *ske.Extension
+		want  bool
+	}{
+		{
+			name:  "nil extension",
+			input: nil,
+			want:  true,
+		},
+		{
+			name:  "empty",
+			input: &ske.Extension{},
+			want:  true,
+		},
+		{
+			name: "only AdditionalProperties are set",
+			input: &ske.Extension{
+				AdditionalProperties: map[string]interface{}{
+					"foo": "bar",
+				},
+			},
+			want: true,
+		},
+		{
+			name: "acl set",
+			input: &ske.Extension{
+				Acl: ske.NewACL([]string{"1.1.1.0/24"}, true),
+			},
+			want: false,
+		},
+		{
+			name: "observability set",
+			input: &ske.Extension{
+				Observability: ske.NewObservability(true, "instance-id"),
+			},
+			want: false,
+		},
+		{
+			name: "dns set",
+			input: &ske.Extension{
+				Dns: ske.NewDNS(true),
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := IsEmptyExtension(tt.input); got != tt.want {
+				t.Errorf("IsEmptyExtension() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

stackit/internal/utils/utils.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -215,12 +214,3 @@ func PrettyApiErr(ctx context.Context, diags *diag.Diagnostics, err error) strin
 	}
 	return err.Error()
 }
-
-func CmpIgnoreAdditionalProperties() cmp.Option {
-	return cmp.FilterPath(
-		func(path cmp.Path) bool {
-			return path.Last().String() == ".AdditionalProperties"
-		},
-		cmp.Ignore(),
-	)
-}