chore: move group test to enterprise

coder · Emyrk · May 16, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
commit bbd08039887ce11deaaa9efb3d8b90667526f29d
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -248,6 +248,9 @@
 	}
 
 	return func(ctx context.Context, values map[string]string) (*preview.Output, hcl.Diagnostics) {
+		// Update the input values with the new values.
+		// The rest of the input is unchanged.
+		input.ParameterValues = values
 		return preview.Preview(ctx, input, templateFS)
 	}, closeFiles, true
 }
@@ -333,7 +336,7 @@
 		params = append(params, param)
 	}

 	return func(ctx context.Context, values map[string]string) (*preview.Output, hcl.Diagnostics) {
 		for i := range params {
 			param := &params[i]
 			paramValue, ok := values[param.Name]

diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go
@@ -25,77 +25,6 @@
 	"github.com/coder/websocket"
 )
 
-func TestDynamicParametersOwnerGroups(t *testing.T) {
-	t.Parallel()
-
-	cfg := coderdtest.DeploymentValues(t)
-	cfg.Experiments = []string{string(codersdk.ExperimentDynamicParameters)}
-	ownerClient := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true, DeploymentValues: cfg})
-	owner := coderdtest.CreateFirstUser(t, ownerClient)
-	templateAdmin, templateAdminUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())
-
-	dynamicParametersTerraformSource, err := os.ReadFile("testdata/parameters/groups/main.tf")
-	require.NoError(t, err)
-	dynamicParametersTerraformPlan, err := os.ReadFile("testdata/parameters/groups/plan.json")
-	require.NoError(t, err)
-
-	files := echo.WithExtraFiles(map[string][]byte{
-		"main.tf": dynamicParametersTerraformSource,
-	})
-	files.ProvisionPlan = []*proto.Response{{
-		Type: &proto.Response_Plan{
-			Plan: &proto.PlanComplete{
-				Plan: dynamicParametersTerraformPlan,
-			},
-		},
-	}}
-
-	version := coderdtest.CreateTemplateVersion(t, templateAdmin, owner.OrganizationID, files)
-	coderdtest.AwaitTemplateVersionJobCompleted(t, templateAdmin, version.ID)
-	_ = coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)
-
-	ctx := testutil.Context(t, testutil.WaitShort)
-	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, templateAdminUser.ID, version.ID)
-	require.NoError(t, err)
-	defer stream.Close(websocket.StatusGoingAway)
-
-	previews := stream.Chan()
-
-	// Should automatically send a form state with all defaulted/empty values
-	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, "Everyone", preview.Parameters[0].Value.Value.AsString())
-
-	// Send a new value, and see it reflected
-	err = stream.Send(codersdk.DynamicParametersRequest{
-		ID:     1,
-		Inputs: map[string]string{"group": "Bloob"},
-	})
-	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, "Bloob", preview.Parameters[0].Value.Value.AsString())
-
-	// Back to default
-	err = stream.Send(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)
-	require.True(t, preview.Parameters[0].Value.Valid())
-	require.Equal(t, "Everyone", preview.Parameters[0].Value.Value.AsString())
-}
-
 func TestDynamicParametersOwnerSSHPublicKey(t *testing.T) {
 	t.Parallel()
 
@@ -363,6 +292,6 @@
 	database.Store
 }

 func (d *dbRejectGitSSHKey) GetGitSSHKey(_ context.Context, _ uuid.UUID) (database.GitSSHKey, error) {
 	return database.GitSSHKey{}, xerrors.New("forcing a fake error")
 }
diff --git a/enterprise/coderd/parameters_test.go b/enterprise/coderd/parameters_test.go
@@ -0,0 +1,101 @@
+package coderd_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/v2/enterprise/coderd/license"
+	"github.com/coder/coder/v2/provisioner/echo"
+	"github.com/coder/coder/v2/provisionersdk/proto"
+	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/websocket"
+)
+
+func TestDynamicParametersOwnerGroups(t *testing.T) {
+	t.Parallel()
+
+	cfg := coderdtest.DeploymentValues(t)
+	cfg.Experiments = []string{string(codersdk.ExperimentDynamicParameters)}
+	ownerClient, owner := coderdenttest.New(t,
+		&coderdenttest.Options{
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureTemplateRBAC: 1,
+				},
+			},
+			Options: &coderdtest.Options{IncludeProvisionerDaemon: true, DeploymentValues: cfg},
+		},
+	)
+	templateAdmin, templateAdminUser := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())
+
+	// Create the group to be asserted
+	group := coderdtest.CreateGroup(t, ownerClient, owner.OrganizationID, "bloob", templateAdminUser)
+
+	dynamicParametersTerraformSource, err := os.ReadFile("testdata/parameters/groups/main.tf")
+	require.NoError(t, err)
+	dynamicParametersTerraformPlan, err := os.ReadFile("testdata/parameters/groups/plan.json")
+	require.NoError(t, err)
+
+	files := echo.WithExtraFiles(map[string][]byte{
+		"main.tf": dynamicParametersTerraformSource,
+	})
+	files.ProvisionPlan = []*proto.Response{{
+		Type: &proto.Response_Plan{
+			Plan: &proto.PlanComplete{
+				Plan: dynamicParametersTerraformPlan,
+			},
+		},
+	}}
+
+	version := coderdtest.CreateTemplateVersion(t, templateAdmin, owner.OrganizationID, files)
+	coderdtest.AwaitTemplateVersionJobCompleted(t, templateAdmin, version.ID)
+	_ = coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)
+
+	ctx := testutil.Context(t, testutil.WaitShort)
+	stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, templateAdminUser.ID, version.ID)
+	require.NoError(t, err)
+	defer stream.Close(websocket.StatusGoingAway)
+
+	previews := stream.Chan()
+
+	// Should automatically send a form state with all defaulted/empty values
+	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, database.EveryoneGroup, preview.Parameters[0].Value.Value.AsString())
+
+	// Send a new value, and see it reflected
+	err = stream.Send(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.AsString())
+
+	// Back to default
+	err = stream.Send(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)
+	require.True(t, preview.Parameters[0].Value.Valid())
+	require.Equal(t, database.EveryoneGroup, preview.Parameters[0].Value.Value.AsString())
+}
diff --git a/coderd/testdata/parameters/groups/main.tf → ...coderd/testdata/parameters/groups/main.tf b/coderd/testdata/parameters/groups/main.tf → ...coderd/testdata/parameters/groups/main.tf
@@ -12,7 +12,7 @@ data "coder_parameter" "group" {
   name    = "group"
   default = try(data.coder_workspace_owner.me.groups[0], "")
   dynamic "option" {
-    for_each = concat(data.coder_workspace_owner.me.groups, "bloob")
+    for_each = data.coder_workspace_owner.me.groups
     content {
       name  = option.value
       value = option.value

diff --git a/coderd/testdata/parameters/groups/plan.json → ...derd/testdata/parameters/groups/plan.json b/coderd/testdata/parameters/groups/plan.json → ...derd/testdata/parameters/groups/plan.json