Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit aa2a809

Browse files
committed
test: add unit test from coderd for new immutable param
1 parent 21e5dfa commit aa2a809

File tree

4 files changed

+97
-3
lines changed

4 files changed

+97
-3
lines changed

coderd/coderdtest/dynamicparameters.go

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ type DynamicParameterTemplateParams struct {
2222

2323
// StaticParams is used if the provisioner daemon version does not support dynamic parameters.
2424
StaticParams []*proto.RichParameter
25+
26+
// TemplateID is used to update an existing template instead of creating a new one.
27+
TemplateID uuid.UUID
2528
}
2629

2730
func DynamicParameterTemplate(t *testing.T, client *codersdk.Client, org uuid.UUID, args DynamicParameterTemplateParams) (codersdk.Template, codersdk.TemplateVersion) {
@@ -40,16 +43,30 @@ func DynamicParameterTemplate(t *testing.T, client *codersdk.Client, org uuid.UU
4043
},
4144
}}
4245

43-
version := CreateTemplateVersion(t, client, org, files)
46+
version := CreateTemplateVersion(t, client, org, files, func(request *codersdk.CreateTemplateVersionRequest) {
47+
if args.TemplateID != uuid.Nil {
48+
request.TemplateID = args.TemplateID
49+
}
50+
})
4451
AwaitTemplateVersionJobCompleted(t, client, version.ID)
45-
tpl := CreateTemplate(t, client, org, version.ID)
52+
53+
tplID := args.TemplateID
54+
if args.TemplateID == uuid.Nil {
55+
tpl := CreateTemplate(t, client, org, version.ID)
56+
tplID = tpl.ID
57+
}
4658

4759
var err error
48-
tpl, err = client.UpdateTemplateMeta(t.Context(), tpl.ID, codersdk.UpdateTemplateMeta{
60+
tpl, err := client.UpdateTemplateMeta(t.Context(), tplID, codersdk.UpdateTemplateMeta{
4961
UseClassicParameterFlow: ptr.Ref(false),
5062
})
5163
require.NoError(t, err)
5264

65+
err = client.UpdateActiveTemplateVersion(t.Context(), tpl.ID, codersdk.UpdateActiveTemplateVersion{
66+
ID: version.ID,
67+
})
68+
require.NoError(t, err)
69+
5370
return tpl, version
5471
}
5572

enterprise/coderd/dynamicparameters_test.go

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,57 @@ func TestDynamicParameterBuild(t *testing.T) {
302302
require.ErrorContains(t, err, "Number must be between 0 and 10")
303303
})
304304
})
305+
306+
t.Run("ImmutableValidation", func(t *testing.T) {
307+
t.Parallel()
308+
309+
// NewImmutable tests the case where a new immutable parameter is added to a template
310+
// after a workspace has been created with an older version of the template.
311+
// The test tries to delete the workspace, which should succeed.
312+
t.Run("NewImmutable", func(t *testing.T) {
313+
t.Parallel()
314+
315+
ctx := testutil.Context(t, testutil.WaitShort)
316+
// Start with a new template that has 0 parameters
317+
empty, _ := coderdtest.DynamicParameterTemplate(t, templateAdmin, orgID, coderdtest.DynamicParameterTemplateParams{
318+
MainTF: string(must(os.ReadFile("testdata/parameters/none/main.tf"))),
319+
})
320+
321+
// Create the workspace with 0 parameters
322+
wrk, err := templateAdmin.CreateUserWorkspace(ctx, codersdk.Me, codersdk.CreateWorkspaceRequest{
323+
TemplateID: empty.ID,
324+
Name: coderdtest.RandomUsername(t),
325+
RichParameterValues: []codersdk.WorkspaceBuildParameter{},
326+
})
327+
require.NoError(t, err)
328+
coderdtest.AwaitWorkspaceBuildJobCompleted(t, templateAdmin, wrk.LatestBuild.ID)
329+
330+
// Update the template with a new immutable parameter
331+
_, immutable := coderdtest.DynamicParameterTemplate(t, templateAdmin, orgID, coderdtest.DynamicParameterTemplateParams{
332+
MainTF: string(must(os.ReadFile("testdata/parameters/immutable/main.tf"))),
333+
TemplateID: empty.ID,
334+
})
335+
336+
bld, err := templateAdmin.CreateWorkspaceBuild(ctx, wrk.ID, codersdk.CreateWorkspaceBuildRequest{
337+
TemplateVersionID: immutable.ID, // Use the new template version with the immutable parameter
338+
Transition: codersdk.WorkspaceTransitionDelete,
339+
DryRun: false,
340+
})
341+
require.NoError(t, err)
342+
coderdtest.AwaitWorkspaceBuildJobCompleted(t, templateAdmin, bld.ID)
343+
344+
// Verify the immutable parameter is set on the workspace build
345+
params, err := templateAdmin.WorkspaceBuildParameters(ctx, bld.ID)
346+
require.NoError(t, err)
347+
require.Len(t, params, 1)
348+
require.Equal(t, "Hello World", params[0].Value)
349+
350+
// Verify the workspace is deleted
351+
deleted, err := templateAdmin.DeletedWorkspace(ctx, wrk.ID)
352+
require.NoError(t, err)
353+
require.Equal(t, wrk.ID, deleted.ID, "workspace should be deleted")
354+
})
355+
})
305356
}
306357

307358
// TestDynamicParameterTemplate uses a template with some dynamic elements, and
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
terraform {
2+
required_providers {
3+
coder = {
4+
source = "coder/coder"
5+
}
6+
}
7+
}
8+
9+
data "coder_workspace_owner" "me" {}
10+
11+
data "coder_parameter" "immutable" {
12+
name = "immutable"
13+
type = "string"
14+
mutable = false
15+
default = "Hello World"
16+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
terraform {
2+
required_providers {
3+
coder = {
4+
source = "coder/coder"
5+
}
6+
}
7+
}
8+
9+
data "coder_workspace_owner" "me" {}
10+

0 commit comments

Comments
 (0)