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

Skip to content

Commit 21e5dfa

Browse files
committed
feat: allow new immutable parameters for existing workspaces
1 parent 288ec77 commit 21e5dfa

File tree

4 files changed

+140
-2
lines changed

4 files changed

+140
-2
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
//go:generate mockgen -destination ./rendermock.go -package rendermock github.com/coder/coder/v2/coderd/dynamicparameters Renderer
2+
package rendermock

coderd/dynamicparameters/rendermock/rendermock.go

Lines changed: 71 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/dynamicparameters/resolver.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,15 @@ func ResolveParameters(
169169
parameterNames[parameter.Name] = struct{}{}
170170

171171
if !firstBuild && !parameter.Mutable {
172+
originalValue, ok := originalValues[parameter.Name]
172173
// Immutable parameters should not be changed after the first build.
173-
// They can match the original value though!
174-
if parameter.Value.AsString() != originalValues[parameter.Name].Value {
174+
// If the value matches the original value, that is fine.
175+
//
176+
// If the original value is not set, that means this is a new parameter. New
177+
// immutable parameters are allowed. This is an opinionated choice to prevent
178+
// workspaces failing to update or delete. Ideally we would block this, as
179+
// immutable parameters should only be able to be set at creation time.
180+
if ok && parameter.Value.AsString() != originalValue.Value {
175181
var src *hcl.Range
176182
if parameter.Source != nil {
177183
src = &parameter.Source.HCLBlock().TypeRange
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package dynamicparameters_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/google/uuid"
7+
"github.com/stretchr/testify/require"
8+
"go.uber.org/mock/gomock"
9+
10+
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/coderd/dynamicparameters"
12+
"github.com/coder/coder/v2/coderd/dynamicparameters/rendermock"
13+
"github.com/coder/coder/v2/codersdk"
14+
"github.com/coder/coder/v2/testutil"
15+
"github.com/coder/preview"
16+
previewtypes "github.com/coder/preview/types"
17+
"github.com/coder/terraform-provider-coder/v2/provider"
18+
)
19+
20+
func TestResolveParameters(t *testing.T) {
21+
t.Parallel()
22+
23+
t.Run("NewImmutable", func(t *testing.T) {
24+
t.Parallel()
25+
26+
ctrl := gomock.NewController(t)
27+
render := rendermock.NewMockRenderer(ctrl)
28+
29+
// A single immutable parameter with no previous value.
30+
render.EXPECT().
31+
Render(gomock.Any(), gomock.Any(), gomock.Any()).
32+
AnyTimes().
33+
Return(&preview.Output{
34+
Parameters: []previewtypes.Parameter{
35+
{
36+
ParameterData: previewtypes.ParameterData{
37+
Name: "immutable",
38+
Type: previewtypes.ParameterTypeString,
39+
FormType: provider.ParameterFormTypeInput,
40+
Mutable: false,
41+
DefaultValue: previewtypes.StringLiteral("foo"),
42+
Required: true,
43+
},
44+
Value: previewtypes.StringLiteral("foo"),
45+
Diagnostics: nil,
46+
},
47+
},
48+
}, nil)
49+
50+
ctx := testutil.Context(t, testutil.WaitShort)
51+
values, err := dynamicparameters.ResolveParameters(ctx, uuid.New(), render, false,
52+
[]database.WorkspaceBuildParameter{}, // No previous values
53+
[]codersdk.WorkspaceBuildParameter{}, // No new build values
54+
[]database.TemplateVersionPresetParameter{}, // No preset values
55+
)
56+
require.NoError(t, err)
57+
require.Equal(t, map[string]string{"immutable": "foo"}, values)
58+
})
59+
}

0 commit comments

Comments
 (0)