Revert "add unit test for user_id query param"

Emyrk · Emyrk · commit 4256a6ce4f1b · 2025-06-13T11:37:48.000-05:00
This reverts commit 2015837.
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -58,25 +58,11 @@ func (api *API) templateVersionDynamicParametersEvaluate(rw http.ResponseWriter,
 // @Router /templateversions/{templateversion}/dynamic-parameters [get]
 func (api *API) templateVersionDynamicParametersWebsocket(rw http.ResponseWriter, r *http.Request) {
 	apikey := httpmw.APIKey(r)
-	userID := apikey.UserID
-
-	qUserID := r.URL.Query().Get("user_id")
-	if qUserID != "" {
-		uid, err := uuid.Parse(qUserID)
-		if err != nil {
-			httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
-				Message: "Invalid user_id query parameter",
-				Detail:  err.Error(),
-			})
-			return
-		}
-		userID = uid
-	}
 
 	api.templateVersionDynamicParameters(true, codersdk.DynamicParametersRequest{
 		ID:      -1,
 		Inputs:  map[string]string{},
-		OwnerID: userID,
+		OwnerID: apikey.UserID,
 	})(rw, r)
 }
 
diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go
@@ -56,7 +56,7 @@ func TestDynamicParametersOwnerSSHPublicKey(t *testing.T) {
 	_ = coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)
 
 	ctx := testutil.Context(t, testutil.WaitShort)
-	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, codersdk.Me, version.ID)
+	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, version.ID)
 	require.NoError(t, err)
 	defer stream.Close(websocket.StatusGoingAway)
 
@@ -387,7 +387,7 @@ func setupDynamicParamsTest(t *testing.T, args setupDynamicParamsTestParams) dyn
 	require.NoError(t, err)
 
 	ctx := testutil.Context(t, testutil.WaitShort)
-	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, codersdk.Me, version.ID)
+	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, version.ID)
 	if args.expectWebsocketError {
 		require.Errorf(t, err, "expected error forming websocket")
 	} else {
diff --git a/codersdk/parameters.go b/codersdk/parameters.go
@@ -125,17 +125,8 @@ type DynamicParametersResponse struct {
 	// TODO: Workspace tags
 }
 
-func (c *Client) TemplateVersionDynamicParameters(ctx context.Context, userID string, version uuid.UUID) (*wsjson.Stream[DynamicParametersResponse, DynamicParametersRequest], error) {
-	endpoint := fmt.Sprintf("/api/v2/templateversions/%s/dynamic-parameters", version)
-	if userID != Me {
-		uid, err := uuid.Parse(userID)
-		if err != nil {
-			return nil, fmt.Errorf("invalid user ID: %w", err)
-		}
-		endpoint += fmt.Sprintf("?user_id=%s", uid.String())
-	}
-
-	conn, err := c.Dial(ctx, endpoint, nil)
+func (c *Client) TemplateVersionDynamicParameters(ctx context.Context, version uuid.UUID) (*wsjson.Stream[DynamicParametersResponse, DynamicParametersRequest], error) {
+	conn, err := c.Dial(ctx, fmt.Sprintf("/api/v2/templateversions/%s/dynamic-parameters", version), nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/enterprise/coderd/parameters_test.go b/enterprise/coderd/parameters_test.go
@@ -32,7 +32,6 @@ func TestDynamicParametersOwnerGroups(t *testing.T) {
 		},
 	)
 	templateAdmin, templateAdminUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())
-	_, noGroupUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
 
 	// Create the group to be asserted
 	group := coderdtest.CreateGroup(t, ownerClient, owner.OrganizationID, "bloob", templateAdminUser)
@@ -58,24 +57,7 @@ func TestDynamicParametersOwnerGroups(t *testing.T) {
 	_ = coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)
 
 	ctx := testutil.Context(t, testutil.WaitShort)
-
-	// First check with a no group admin user, that they do not see the extra group
-	// Use the admin client, as the user might not have access to the template.
-	// Also checking that the admin can see the form for the other user.
-	noGroupStream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, noGroupUser.ID.String(), version.ID)
-	require.NoError(t, err)
-	defer noGroupStream.Close(websocket.StatusGoingAway)
-	noGroupPreviews := noGroupStream.Chan()
-	noGroupPreview := testutil.RequireReceive(ctx, t, noGroupPreviews)
-	require.Equal(t, -1, noGroupPreview.ID)
-	require.Empty(t, noGroupPreview.Diagnostics)
-	require.Equal(t, "group", noGroupPreview.Parameters[0].Name)
-	require.Equal(t, database.EveryoneGroup, noGroupPreview.Parameters[0].Value.Value)
-	require.Equal(t, 1, len(noGroupPreview.Parameters[0].Options)) // Only 1 group
-	noGroupStream.Close(websocket.StatusGoingAway)
-
-	// Now try with a user with more than 1 group
-	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, codersdk.Me, version.ID)
+	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, version.ID)
 	require.NoError(t, err)
 	defer stream.Close(websocket.StatusGoingAway)
 
