Use Related metadata only when the noun heuristics find nothing

Checking Related before the heuristics changed 47 existing completions
against the bundled API cache, many of them wrong: registerIso projectid
resolved to listProjectAccounts instead of listProjects, acquirePodIpAddress
podid to listZones instead of listPods, and executeWebhookDelivery webhookid
to listWebhookDeliveries instead of listWebhooks. The loose Related match
picks the first list API in the array, whatever its noun.

Move the Related lookup after the noun heuristics and run it only when they
found no API. That keeps all 142 new completions Related metadata adds and
leaves every existing completion untouched. Add a test pinning the ordering.

Author: borisstoyanov

cli/completer.go

@@ -269,33 +269,6 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap map[st
 		relatedNoun = pluralizeNoun(base)
 	}
 
-	// Prefer authoritative Related metadata: a list API whose noun matches
-	// the related noun derived above.
-	for _, relatedAPI := range arg.Related {
-		if !strings.HasPrefix(strings.ToLower(relatedAPI), "list") {
-			continue
-		}
-		for _, listAPI := range apiMap["list"] {
-			if strings.EqualFold(listAPI.Name, relatedAPI) && strings.EqualFold(listAPI.Noun, relatedNoun) {
-				config.Debug("Autocomplete: API found using Related metadata: ", listAPI.Name)
-				return listAPI
-			}
-		}
-	}
-
-	// Fall back to any list API named in the Related metadata.
-	for _, relatedAPI := range arg.Related {
-		if !strings.HasPrefix(strings.ToLower(relatedAPI), "list") {
-			continue
-		}
-		for _, listAPI := range apiMap["list"] {
-			if strings.EqualFold(listAPI.Name, relatedAPI) {
-				config.Debug("Autocomplete: API found using Related metadata fallback: ", listAPI.Name)
-				return listAPI
-			}
-		}
-	}
-
 	config.Debug("Possible related noun for the arg: ", relatedNoun, " and type: ", arg.Type)
 	autocompleteAPI = findAPI(apiMap, relatedNoun)
 
@@ -314,6 +287,22 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap map[st
 		relatedNoun = relatedNoun[:len(relatedNoun)-1]
 	}
 
+	// Prefer the API's own Related metadata when the noun heuristics found
+	// nothing, so entity-reference args still get completions.
+	if autocompleteAPI == nil {
+		for _, relatedAPI := range arg.Related {
+			if !strings.HasPrefix(strings.ToLower(relatedAPI), "list") {
+				continue
+			}
+			for _, listAPI := range apiMap["list"] {
+				if strings.EqualFold(listAPI.Name, relatedAPI) {
+					config.Debug("Autocomplete: API found using Related metadata: ", listAPI.Name)
+					return listAPI
+				}
+			}
+		}
+	}
+
 	// Heuristic: find any list API that contains the arg name
 	if autocompleteAPI == nil {
 		config.Debug("Finding possible API that have: ", argName, " related APIs: ", arg.Related)

cli/completer_test.go

@@ -163,3 +163,44 @@ func TestFindAutocompleteAPIMapTypeReturnsNil(t *testing.T) {
 		t.Fatalf("expected nil, got %v", result)
 	}
 }
+
+func TestFindAutocompleteAPIHeuristicWinsOverRelated(t *testing.T) {
+	// registerIso's projectid arg lists many related APIs; the noun heuristic
+	// must keep winning so the completion stays listProjects.
+	arg := &config.APIArg{
+		Name: "projectid=",
+		Related: []string{
+			"listProjectAccounts",
+			"listProjects",
+		},
+	}
+
+	apiFound := &config.API{
+		Name: "registerIso",
+		Verb: "register",
+		Noun: "iso",
+	}
+
+	apiMap := map[string][]*config.API{
+		"list": {
+			{
+				Name: "listProjectAccounts",
+				Noun: "projectaccounts",
+			},
+			{
+				Name: "listProjects",
+				Noun: "projects",
+			},
+		},
+	}
+
+	result := findAutocompleteAPI(arg, apiFound, apiMap)
+
+	if result == nil {
+		t.Fatal("expected API, got nil")
+	}
+
+	if result.Name != "listProjects" {
+		t.Fatalf("expected listProjects, got %s", result.Name)
+	}
+}