Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf126931

Browse files
jaaydenhblink-so[bot]Emyrk
authored
chore: remove dynamic-parameters experiment (#18290)
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com>Co-authored-by: jaaydenh <1858163+jaaydenh@users.noreply.github.com>Co-authored-by: Steven Masley <stevenmasley@gmail.com>
1 parent70723d3 commitf126931

File tree

30 files changed

+144
-198
lines changed

30 files changed

+144
-198
lines changed

‎cli/testdata/coder_list_--output_json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"template_allow_user_cancel_workspace_jobs": false,
1616
"template_active_version_id": "============[version ID]============",
1717
"template_require_active_version": false,
18-
"template_use_classic_parameter_flow":false,
18+
"template_use_classic_parameter_flow":true,
1919
"latest_build": {
2020
"id": "========[workspace build ID]========",
2121
"created_at": "====[timestamp]=====",

‎coderd/apidoc/docs.go‎

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

‎coderd/apidoc/swagger.json‎

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

‎coderd/coderd.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,9 +1153,6 @@ func New(options *Options) *API {
11531153
})
11541154

11551155
r.Group(func(r chi.Router) {
1156-
r.Use(
1157-
httpmw.RequireExperiment(api.Experiments,codersdk.ExperimentDynamicParameters),
1158-
)
11591156
r.Route("/dynamic-parameters",func(r chi.Router) {
11601157
r.Post("/evaluate",api.templateVersionDynamicParametersEvaluate)
11611158
r.Get("/",api.templateVersionDynamicParametersWebsocket)

‎coderd/database/dbmem/dbmem.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9345,6 +9345,7 @@ func (q *FakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
93459345
AllowUserAutostart:true,
93469346
AllowUserAutostop:true,
93479347
MaxPortSharingLevel:arg.MaxPortSharingLevel,
9348+
UseClassicParameterFlow:true,
93489349
}
93499350
q.templates=append(q.templates,template)
93509351
returnnil

‎coderd/database/dump.sql‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTERTABLE templates ALTER COLUMN use_classic_parameter_flowSET DEFAULT false;
2+
3+
UPDATE templatesSET use_classic_parameter_flow= false
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- All templates should opt out of dynamic parameters by default.
2+
ALTERTABLE templates ALTER COLUMN use_classic_parameter_flowSET DEFAULT true;
3+
4+
UPDATE templatesSET use_classic_parameter_flow= true

‎coderd/parameters_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ import (
2929
funcTestDynamicParametersOwnerSSHPublicKey(t*testing.T) {
3030
t.Parallel()
3131

32-
cfg:=coderdtest.DeploymentValues(t)
33-
cfg.Experiments= []string{string(codersdk.ExperimentDynamicParameters)}
34-
ownerClient:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true,DeploymentValues:cfg})
32+
ownerClient:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
3533
owner:=coderdtest.CreateFirstUser(t,ownerClient)
3634
templateAdmin,_:=coderdtest.CreateAnotherUser(t,ownerClient,owner.OrganizationID,rbac.RoleTemplateAdmin())
3735

@@ -354,14 +352,11 @@ type dynamicParamsTest struct {
354352
}
355353

356354
funcsetupDynamicParamsTest(t*testing.T,argssetupDynamicParamsTestParams)dynamicParamsTest {
357-
cfg:=coderdtest.DeploymentValues(t)
358-
cfg.Experiments= []string{string(codersdk.ExperimentDynamicParameters)}
359355
ownerClient,_,api:=coderdtest.NewWithAPI(t,&coderdtest.Options{
360356
Database:args.db,
361357
Pubsub:args.ps,
362358
IncludeProvisionerDaemon:true,
363359
ProvisionerDaemonVersion:args.provisionerDaemonVersion,
364-
DeploymentValues:cfg,
365360
})
366361

367362
owner:=coderdtest.CreateFirstUser(t,ownerClient)
@@ -384,6 +379,12 @@ func setupDynamicParamsTest(t *testing.T, args setupDynamicParamsTestParams) dyn
384379
coderdtest.AwaitTemplateVersionJobCompleted(t,templateAdmin,version.ID)
385380
tpl:=coderdtest.CreateTemplate(t,templateAdmin,owner.OrganizationID,version.ID)
386381

382+
varerrerror
383+
tpl,err=templateAdmin.UpdateTemplateMeta(t.Context(),tpl.ID, codersdk.UpdateTemplateMeta{
384+
UseClassicParameterFlow:ptr.Ref(false),
385+
})
386+
require.NoError(t,err)
387+
387388
ctx:=testutil.Context(t,testutil.WaitShort)
388389
stream,err:=templateAdmin.TemplateVersionDynamicParameters(ctx,version.ID)
389390
ifargs.expectWebsocketError {

‎coderd/templates_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ func TestPatchTemplateMeta(t *testing.T) {
15481548
user:=coderdtest.CreateFirstUser(t,client)
15491549
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
15501550
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
1551-
require.False(t,template.UseClassicParameterFlow,"default isfalse")
1551+
require.True(t,template.UseClassicParameterFlow,"default istrue")
15521552

15531553
bTrue:=true
15541554
bFalse:=false

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp