comment-1

Author: kadupoornima

pkg/telemetry/collector_test.go

@@ -3077,29 +3077,41 @@ func TestGetMachineCategory(t *testing.T) {
 			want: "a100-40gb-1:GPU,v6e-4:TPU",
 		},
 		{
-			name: "Handles memory-optimized machine types correctly as CPU",
+			name: "Handles unknown CPU prefixes securely falling back to CPU via string shapes",
 			bp: config.Blueprint{
 				Groups: []config.Group{
 					{
 						Name: config.GroupName("primary"),
 						Modules: []config.Module{
 							{
-								ID: config.ModuleID("compute_mem_1"),
+								ID: config.ModuleID("compute_node_fallback_1"),
 								Settings: config.NewDict(map[string]cty.Value{
-									"machine_type": cty.StringVal("m1-megamem-96"),
+									"machine_type": cty.StringVal("z9-standard-8"),
 								}),
 							},
 							{
-								ID: config.ModuleID("compute_mem_2"),
+								ID: config.ModuleID("compute_node_fallback_2"),
 								Settings: config.NewDict(map[string]cty.Value{
-									"machine_type": cty.StringVal("m2-ultramem-208"),
+									"machine_type": cty.StringVal("q4-highmem-32"),
+								}),
+							},
+							{
+								ID: config.ModuleID("compute_node_fallback_3"),
+								Settings: config.NewDict(map[string]cty.Value{
+									"machine_type": cty.StringVal("p2-highcpu-4"),
+								}),
+							},
+							{
+								ID: config.ModuleID("compute_node_fallback_4"),
+								Settings: config.NewDict(map[string]cty.Value{
+									"machine_type": cty.StringVal("custom-3-4096"),
 								}),
 							},
 						},
 					},
 				},
 			},
-			want: "m1-megamem-96:CPU,m2-ultramem-208:CPU",
+			want: "z9-standard-8:CPU,q4-highmem-32:CPU,p2-highcpu-4:CPU,custom-3-4096:CPU",
 		},
 		{
 			name: "Handles unknown machine types mapped to Other",

pkg/telemetry/collector_util.go

@@ -1114,8 +1114,8 @@ func detectMachineCategory(mType string) string {
 // isCPUFallback checks if the machine type contains any of the standard CPU identifiers.
 func isCPUFallback(mType string) bool {
 	cpuKeywords := []string{
-		"-standard-", "-highmem-", "-highcpu-",
-		"-megamem-", "-ultramem-", "custom-",
+		"-standard-", "-highmem-", "-highcpu-", "-megamem-",
+		"-ultramem-", "custom-", "-micro", "-small", "-medium", "-metal",
 	}
 	for _, kw := range cpuKeywords {
 		if strings.Contains(mType, kw) {