fix(iaas): network_area_region default nameservers reconcile issue (#1191)

Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>

Author: Fyusel

stackit/internal/services/iaas/networkarearegion/resource.go

@@ -503,12 +503,21 @@ func mapFields(ctx context.Context, networkAreaRegion *iaas.RegionalArea, model
 	model.Id = utils.BuildInternalTerraformId(model.OrganizationId.ValueString(), model.NetworkAreaId.ValueString(), region)
 	model.Region = types.StringValue(region)
 
-	model.Ipv4 = &ipv4Model{}
+	// This mapFields() function is also used for the datasource where model.Ipv4 is computed.
+	if model.Ipv4 == nil {
+		model.Ipv4 = &ipv4Model{}
+	}
+
 	if networkAreaRegion.Ipv4 != nil {
 		model.Ipv4.TransferNetwork = types.StringPointerValue(networkAreaRegion.Ipv4.TransferNetwork)
 		model.Ipv4.DefaultPrefixLength = types.Int64PointerValue(networkAreaRegion.Ipv4.DefaultPrefixLen)
 		model.Ipv4.MaxPrefixLength = types.Int64PointerValue(networkAreaRegion.Ipv4.MaxPrefixLen)
 		model.Ipv4.MinPrefixLength = types.Int64PointerValue(networkAreaRegion.Ipv4.MinPrefixLen)
+		// map network ranges
+		err := mapIpv4NetworkRanges(ctx, networkAreaRegion.Ipv4.NetworkRanges, model)
+		if err != nil {
+			return fmt.Errorf("mapping network ranges: %w", err)
+		}
 	}
 
 	// map default nameservers
@@ -531,12 +540,6 @@ func mapFields(ctx context.Context, networkAreaRegion *iaas.RegionalArea, model
 		model.Ipv4.DefaultNameservers = defaultNameserversTF
 	}
 
-	// map network ranges
-	err := mapIpv4NetworkRanges(ctx, networkAreaRegion.Ipv4.NetworkRanges, model)
-	if err != nil {
-		return fmt.Errorf("mapping network ranges: %w", err)
-	}
-
 	return nil
 }
 

stackit/internal/services/iaas/networkarearegion/resource_test.go

@@ -55,6 +55,7 @@ func Test_mapFields(t *testing.T) {
 				model: &Model{
 					OrganizationId: types.StringValue(organizationId),
 					NetworkAreaId:  types.StringValue(networkAreaId),
+					Ipv4:           &ipv4Model{},
 				},
 				networkAreaRegion: &iaas.RegionalArea{
 					Ipv4: &iaas.RegionalAreaIPv4{
@@ -118,6 +119,28 @@ func Test_mapFields(t *testing.T) {
 			want:    nil,
 			wantErr: true,
 		},
+		{
+			name: "model.Ipv4 is nil",
+			args: args{
+				model: &Model{
+					OrganizationId: types.StringValue(organizationId),
+					NetworkAreaId:  types.StringValue(networkAreaId),
+					Ipv4:           nil,
+				},
+				networkAreaRegion: &iaas.RegionalArea{},
+				region:            "eu01",
+			},
+			want: &Model{
+				Id:             types.StringValue(fmt.Sprintf("%s,%s,eu01", organizationId, networkAreaId)),
+				OrganizationId: types.StringValue(organizationId),
+				NetworkAreaId:  types.StringValue(networkAreaId),
+				Region:         types.StringValue("eu01"),
+				Ipv4: &ipv4Model{
+					DefaultNameservers: types.ListNull(types.StringType),
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "network area region response is nil",
 			args: args{