remove need to constantly send owner id

Emyrk · Emyrk · commit 67644cc99cc4 · 2025-06-18T14:09:31.000-05:00
diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go
@@ -105,7 +105,7 @@ func (r *Loader) Load(ctx context.Context, db database.Store) error {
 	return nil
 }
 
-func (r *Loader) loaded() bool {
+func (r *Loader) isReady() bool {
 	return r.templateVersion != nil && r.job != nil && r.terraformValues != nil
 }
 
@@ -117,7 +117,7 @@ func (r *Loader) loaded() bool {
 // do not have the database state to support dynamic parameters. A constant
 // warning will be displayed for these template versions.
 func (r *Loader) Renderer(ctx context.Context, db database.Store, cache *files.Cache) (Renderer, error) {
-	if !r.loaded() {
+	if !r.isReady() {
 		return nil, xerrors.New("Load() must be called before Renderer()")
 	}
 
@@ -154,11 +154,11 @@ func (r *Loader) dynamicRenderer(ctx context.Context, db database.Store, cache *
 	}
 
 	return &DynamicRenderer{
-		data:         r,
-		templateFS:   templateFS,
-		db:           db,
-		plan:         plan,
-		failedOwners: make(map[uuid.UUID]error),
+		data:        r,
+		templateFS:  templateFS,
+		db:          db,
+		plan:        plan,
+		ownerErrors: make(map[uuid.UUID]error),
 		close: func() {
 			cache.Release(r.job.FileID)
 			if moduleFilesFS != nil {
@@ -174,22 +174,23 @@ type DynamicRenderer struct {
 	templateFS fs.FS
 	plan       json.RawMessage
 
-	failedOwners map[uuid.UUID]error
-	currentOwner *previewtypes.WorkspaceOwner
+	ownerErrors    map[uuid.UUID]error
+	currentOwner   *previewtypes.WorkspaceOwner
+	currentOwnerID uuid.UUID
 
 	once  sync.Once
 	close func()
 }
 
 func (r *DynamicRenderer) Render(ctx context.Context, ownerID uuid.UUID, values map[string]string) (*preview.Output, hcl.Diagnostics) {
 	// Always start with the cached error, if we have one.
-	ownerErr := r.failedOwners[ownerID]
+	ownerErr := r.ownerErrors[ownerID]
 	if ownerErr == nil {
 		ownerErr = r.getWorkspaceOwnerData(ctx, ownerID)
 	}
 
 	if ownerErr != nil || r.currentOwner == nil {
-		r.failedOwners[ownerID] = ownerErr
+		r.ownerErrors[ownerID] = ownerErr
 		return nil, hcl.Diagnostics{
 			{
 				Severity: hcl.DiagError,
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -168,6 +168,7 @@ func (api *API) handleParameterWebsocket(rw http.ResponseWriter, r *http.Request
 	// As the user types into the form, reprocess the state using their input,
 	// and respond with updates.
 	updates := stream.Chan()
+	ownerID := initial.OwnerID
 	for {
 		select {
 		case <-ctx.Done():
@@ -179,6 +180,14 @@ func (api *API) handleParameterWebsocket(rw http.ResponseWriter, r *http.Request
 				return
 			}
 
+			// Take a nil uuid to mean the previous owner ID.
+			// This just removes the need to constantly send who you are.
+			if update.OwnerID == uuid.Nil {
+				update.OwnerID = ownerID
+			}
+
+			ownerID = update.OwnerID
+
 			result, diagnostics := render.Render(ctx, update.OwnerID, update.Inputs)
 			response := codersdk.DynamicParametersResponse{
 				ID:          update.ID,
diff --git a/enterprise/coderd/parameters_test.go b/enterprise/coderd/parameters_test.go
@@ -31,7 +31,7 @@ func TestDynamicParametersOwnerGroups(t *testing.T) {
 			Options: &coderdtest.Options{IncludeProvisionerDaemon: true},
 		},
 	)
-	templateAdmin, templateAdminUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())
+	templateAdmin, templateAdminUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(owner.OrganizationID))
 	_, noGroupUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
 
 	// Create the group to be asserted
@@ -79,36 +79,34 @@ func TestDynamicParametersOwnerGroups(t *testing.T) {
 	require.NoError(t, err)
 	defer stream.Close(websocket.StatusGoingAway)
 
-	previews := stream.Chan()
+	previews, pop := coderdtest.SynchronousStream(stream)
 
 	// Should automatically send a form state with all defaulted/empty values
-	preview := testutil.RequireReceive(ctx, t, previews)
+	preview := pop()
 	require.Equal(t, -1, preview.ID)
 	require.Empty(t, preview.Diagnostics)
 	require.Equal(t, "group", preview.Parameters[0].Name)
 	require.True(t, preview.Parameters[0].Value.Valid)
 	require.Equal(t, database.EveryoneGroup, preview.Parameters[0].Value.Value)
 
 	// Send a new value, and see it reflected
-	err = stream.Send(codersdk.DynamicParametersRequest{
+	preview, err = previews(codersdk.DynamicParametersRequest{
 		ID:     1,
 		Inputs: map[string]string{"group": group.Name},
 	})
 	require.NoError(t, err)
-	preview = testutil.RequireReceive(ctx, t, previews)
 	require.Equal(t, 1, preview.ID)
 	require.Empty(t, preview.Diagnostics)
 	require.Equal(t, "group", preview.Parameters[0].Name)
 	require.True(t, preview.Parameters[0].Value.Valid)
 	require.Equal(t, group.Name, preview.Parameters[0].Value.Value)
 
 	// Back to default
-	err = stream.Send(codersdk.DynamicParametersRequest{
+	preview, err = previews(codersdk.DynamicParametersRequest{
 		ID:     3,
 		Inputs: map[string]string{},
 	})
 	require.NoError(t, err)
-	preview = testutil.RequireReceive(ctx, t, previews)
 	require.Equal(t, 3, preview.ID)
 	require.Empty(t, preview.Diagnostics)
 	require.Equal(t, "group", preview.Parameters[0].Name)
