review

Signed-off-by: Mauritz Uphoff <mauritz.uphoff@stackit.cloud>

Author: h3adex

stackit/internal/services/iaas/machinetype/datasource.go

@@ -142,10 +142,8 @@ func (m *machineTypeDataSource) Read(ctx context.Context, req datasource.ReadReq
 
 	listMachineTypeReq := m.client.ListMachineTypes(ctx, projectId)
 
-	if !model.Filter.IsNull() && !model.Filter.IsUnknown() {
-		if filter := strings.TrimSpace(model.Filter.ValueString()); filter != "" {
-			listMachineTypeReq = listMachineTypeReq.Filter(filter)
-		}
+	if !model.Filter.IsNull() && !model.Filter.IsUnknown() && strings.TrimSpace(model.Filter.ValueString()) != "" {
+		listMachineTypeReq = listMachineTypeReq.Filter(strings.TrimSpace(model.Filter.ValueString()))
 	}
 
 	apiResp, err := listMachineTypeReq.Execute()
@@ -160,16 +158,15 @@ func (m *machineTypeDataSource) Read(ctx context.Context, req datasource.ReadReq
 		return
 	}
 
-	items := apiResp.Items
-	if items == nil || len(*items) == 0 {
+	if apiResp.Items == nil || len(*apiResp.Items) == 0 {
 		core.LogAndAddWarning(ctx, &resp.Diagnostics, "No machine types found", "No matching machine types.")
 		return
 	}
 
 	// Convert items to []*iaas.MachineType
-	machineTypes := make([]*iaas.MachineType, len(*items))
-	for i := range *items {
-		machineTypes[i] = &(*items)[i]
+	machineTypes := make([]*iaas.MachineType, len(*apiResp.Items))
+	for i := range *apiResp.Items {
+		machineTypes[i] = &(*apiResp.Items)[i]
 	}
 
 	sorted, err := sortMachineTypeByName(machineTypes, sortAscending)
@@ -184,11 +181,6 @@ func (m *machineTypeDataSource) Read(ctx context.Context, req datasource.ReadReq
 		return
 	}
 
-	if err := mapDataSourceFields(ctx, first, &model); err != nil {
-		core.LogAndAddError(ctx, &resp.Diagnostics, "Mapping error", fmt.Sprintf("Failed to translate API response: %v", err))
-		return
-	}
-
 	resp.Diagnostics.Append(resp.State.Set(ctx, model)...)
 	tflog.Info(ctx, "Successfully read machine type")
 }
@@ -201,9 +193,8 @@ func mapDataSourceFields(ctx context.Context, machineType *iaas.MachineType, mod
 	if machineType.Name == nil || *machineType.Name == "" {
 		return fmt.Errorf("machine type name is missing")
 	}
-	name := *machineType.Name
 
-	model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), name)
+	model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), *machineType.Name)
 	model.Name = types.StringPointerValue(machineType.Name)
 	model.Description = types.StringPointerValue(machineType.Description)
 	model.Disk = types.Int64PointerValue(machineType.Disk)

stackit/internal/services/iaas/machinetype/datasource_test.go

@@ -45,10 +45,10 @@ func TestMapDataSourceFields(t *testing.T) {
 				Disk:        types.Int64Value(20),
 				Ram:         types.Int64Value(2048),
 				Vcpus:       types.Int64Value(2),
-				ExtraSpecs: mustMapString(map[string]string{
-					"cpu":         "amd-epycrome-7702",
-					"overcommit":  "1",
-					"environment": "general",
+				ExtraSpecs: types.MapValueMust(types.StringType, map[string]attr.Value{
+					"cpu":         types.StringValue("amd-epycrome-7702"),
+					"overcommit":  types.StringValue("1"),
+					"environment": types.StringValue("general"),
 				}),
 			},
 			expectError: false,
@@ -209,13 +209,6 @@ func TestSortMachineTypeByName(t *testing.T) {
 			ascending:   true,
 			expectError: true,
 		},
-		{
-			name:        "equal names are stable",
-			input:       []*iaas.MachineType{{Name: utils.Ptr("same")}, {Name: utils.Ptr("same")}, {Name: utils.Ptr("same")}},
-			ascending:   true,
-			expected:    []string{"same", "same", "same"},
-			expectError: false,
-		},
 	}
 
 	for _, tt := range tests {
@@ -246,19 +239,3 @@ func TestSortMachineTypeByName(t *testing.T) {
 		})
 	}
 }
-
-func mustMapString(val map[string]string) types.Map {
-	m, diags := types.MapValue(types.StringType, convertToAttr(val))
-	if diags.HasError() {
-		panic("invalid test: " + diags.Errors()[0].Detail())
-	}
-	return m
-}
-
-func convertToAttr(m map[string]string) map[string]attr.Value {
-	res := make(map[string]attr.Value, len(m))
-	for k, v := range m {
-		res[k] = types.StringValue(v)
-	}
-	return res
-}