fix(api): require selector on v1 query GET

Signed-off-by: Tjark Gunnar Rasche <trasche@nvidia.com>

Author: tjrasche

api/aicr/v1/server.yaml

@@ -646,9 +646,10 @@ paths:
                     useOpenKernelModules: true
         "400":
           description: >
-            Invalid request: malformed criteria, allowlist violation, a resolved
-            profile (which requires `/v2/query`), or a stated criteria dimension
-            not honored by any applicable recipe overlay (uncovered dimension).
+            Invalid request: an omitted selector, malformed criteria, allowlist
+            violation, a resolved profile (which requires `/v2/query`), or a stated
+            criteria dimension not honored by any applicable recipe overlay
+            (uncovered dimension).
             Uncovered-dimension errors carry a machine-readable
             `details.uncovered` array (dimension, requestedValue,
             validCompletions). Snapshot-driven resolution (CLI `--snapshot` / Go
@@ -663,6 +664,16 @@ paths:
               schema:
                 $ref: "#/components/schemas/Error"
               examples:
+                missingSelector:
+                  summary: Required selector omitted
+                  value:
+                    code: INVALID_REQUEST
+                    message: "Invalid query criteria"
+                    details:
+                      error: "[INVALID_REQUEST] selector is required on /v1/query"
+                    requestId: "550e8400-e29b-41d4-a716-446655440000"
+                    timestamp: "2025-01-15T10:30:00Z"
+                    retryable: false
                 invalidParameter:
                   summary: Invalid query parameter
                   value:

docs/user/api-reference.md

@@ -346,6 +346,8 @@ All GET /v1/recipe parameters are supported, plus:
 
 **Error Responses:**
 
+Omitting `selector` returns `400 Bad Request` with code `INVALID_REQUEST`. An explicitly empty `selector=` remains valid and returns the entire hydrated recipe.
+
 `GET /v1/query` and `POST /v1/query` resolve a recipe through the same engine as `/v1/recipe`, so a stated criteria dimension not honored by any applicable overlay fails the same way: `400 Bad Request` with the `details.uncovered` array described in the [POST /v1/recipe error responses](#post-v1recipe) above.
 
 **Examples:**

pkg/server/recipe_handler.go

@@ -406,10 +406,17 @@ func (h *recipeHandler) handleQuery(w http.ResponseWriter, r *http.Request, v2 b
 			if err != nil {
 				break
 			}
-		} else if _, supplied := r.URL.Query()[keyProfile]; supplied {
-			err = aicrerrors.New(aicrerrors.ErrCodeInvalidRequest,
-				"profile selection is available only on /v2/query")
-			break
+		} else {
+			if _, supplied := r.URL.Query()[keyProfile]; supplied {
+				err = aicrerrors.New(aicrerrors.ErrCodeInvalidRequest,
+					"profile selection is available only on /v2/query")
+				break
+			}
+			if !r.URL.Query().Has("selector") {
+				err = aicrerrors.New(aicrerrors.ErrCodeInvalidRequest,
+					"selector is required on /v1/query")
+				break
+			}
 		}
 		criteria, err = recipe.ParseCriteriaFromRequest(r, h.client.CriteriaRegistry())
 		if !v2 {

pkg/server/recipe_handler_test.go

@@ -1002,25 +1002,59 @@ func TestHandleQuery_SelectorNotFound(t *testing.T) {
 	}
 }
 
-// TestHandleQuery_NoSelector verifies a query with no selector returns the
-// entire hydrated recipe structure (as the legacy handler does).
-func TestHandleQuery_NoSelector(t *testing.T) {
+// TestHandleQuery_SelectorPresence verifies an omitted selector is rejected
+// while an explicitly empty selector returns the entire hydrated recipe.
+func TestHandleQuery_SelectorPresence(t *testing.T) {
 	h := newTestHandler(t, nil)
 
-	req := httptest.NewRequest(http.MethodGet, "/v1/query?service=eks&accelerator=h100&intent=training", nil)
-	w := httptest.NewRecorder()
+	tests := []struct {
+		name       string
+		target     string
+		wantStatus int
+		wantError  string
+	}{
+		{
+			name:       "missing selector",
+			target:     "/v1/query?service=eks&accelerator=h100&intent=training",
+			wantStatus: http.StatusBadRequest,
+			wantError:  "[INVALID_REQUEST] selector is required on /v1/query",
+		},
+		{
+			name:       "explicitly empty selector",
+			target:     "/v1/query?service=eks&accelerator=h100&intent=training&selector=",
+			wantStatus: http.StatusOK,
+		},
+	}
 
-	h.HandleQuery(w, req)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := httptest.NewRequest(http.MethodGet, tt.target, nil)
+			w := httptest.NewRecorder()
 
-	if w.Code != http.StatusOK {
-		t.Fatalf("status = %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
-	}
-	var hydrated map[string]any
-	if err := json.Unmarshal(w.Body.Bytes(), &hydrated); err != nil {
-		t.Fatalf("failed to decode hydrated recipe: %v; body: %s", err, w.Body.String())
-	}
-	if _, ok := hydrated["components"]; !ok {
-		t.Errorf("expected hydrated recipe to contain a components key; got keys %v", keysOf(hydrated))
+			h.HandleQuery(w, req)
+
+			if w.Code != tt.wantStatus {
+				t.Fatalf("status = %d, want %d; body: %s", w.Code, tt.wantStatus, w.Body.String())
+			}
+			if tt.wantError != "" {
+				errResp := decodeErrorBody(t, w.Body.Bytes())
+				if errResp.Code != "INVALID_REQUEST" {
+					t.Errorf("code = %q, want INVALID_REQUEST", errResp.Code)
+				}
+				if got := errResp.Details[keyError]; got != tt.wantError {
+					t.Errorf("details.error = %q, want %q", got, tt.wantError)
+				}
+				return
+			}
+
+			var hydrated map[string]any
+			if err := json.Unmarshal(w.Body.Bytes(), &hydrated); err != nil {
+				t.Fatalf("failed to decode hydrated recipe: %v; body: %s", err, w.Body.String())
+			}
+			if _, ok := hydrated["components"]; !ok {
+				t.Errorf("expected hydrated recipe to contain a components key; got keys %v", keysOf(hydrated))
+			}
+		})
 	}
 }