mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: remove per request dynamic parameters opt in and rely on template (#18505)
When in experimental this was used as an escape hatch. Removed to be consistent with the template author's intentions Backwards compatible, removing an experimental api field that is no longer used.
This commit is contained in:
Generated
-7
@@ -12043,10 +12043,6 @@ const docTemplate = `{
|
||||
"dry_run": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"enable_dynamic_parameters": {
|
||||
"description": "EnableDynamicParameters skips some of the static parameter checking.\nIt will default to whatever the template has marked as the default experience.\nRequires the \"dynamic-experiment\" to be used.",
|
||||
"type": "boolean"
|
||||
},
|
||||
"log_level": {
|
||||
"description": "Log level changes the default logging verbosity of a provider (\"info\" if empty).",
|
||||
"enum": [
|
||||
@@ -12128,9 +12124,6 @@ const docTemplate = `{
|
||||
"autostart_schedule": {
|
||||
"type": "string"
|
||||
},
|
||||
"enable_dynamic_parameters": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
Generated
-7
@@ -10753,10 +10753,6 @@
|
||||
"dry_run": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"enable_dynamic_parameters": {
|
||||
"description": "EnableDynamicParameters skips some of the static parameter checking.\nIt will default to whatever the template has marked as the default experience.\nRequires the \"dynamic-experiment\" to be used.",
|
||||
"type": "boolean"
|
||||
},
|
||||
"log_level": {
|
||||
"description": "Log level changes the default logging verbosity of a provider (\"info\" if empty).",
|
||||
"enum": ["debug"],
|
||||
@@ -10828,9 +10824,6 @@
|
||||
"autostart_schedule": {
|
||||
"type": "string"
|
||||
},
|
||||
"enable_dynamic_parameters": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
@@ -15,7 +15,6 @@ import (
|
||||
"github.com/coder/coder/v2/coderd/database/dbtestutil"
|
||||
"github.com/coder/coder/v2/coderd/database/pubsub"
|
||||
"github.com/coder/coder/v2/coderd/rbac"
|
||||
"github.com/coder/coder/v2/coderd/util/ptr"
|
||||
"github.com/coder/coder/v2/codersdk"
|
||||
"github.com/coder/coder/v2/codersdk/wsjson"
|
||||
"github.com/coder/coder/v2/provisioner/echo"
|
||||
@@ -260,7 +259,6 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
|
||||
Value: "eu",
|
||||
},
|
||||
}
|
||||
request.EnableDynamicParameters = true
|
||||
})
|
||||
coderdtest.AwaitWorkspaceBuildJobCompleted(t, setup.client, wrk.LatestBuild.ID)
|
||||
|
||||
@@ -285,7 +283,6 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
|
||||
RichParameterValues: []codersdk.WorkspaceBuildParameter{
|
||||
{Name: "region", Value: regionVal},
|
||||
},
|
||||
EnableDynamicParameters: ptr.Ref(true),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
coderdtest.AwaitWorkspaceBuildJobCompleted(t, setup.client, bld.ID)
|
||||
|
||||
@@ -385,10 +385,6 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
|
||||
builder = builder.State(createBuild.ProvisionerState)
|
||||
}
|
||||
|
||||
if createBuild.EnableDynamicParameters != nil {
|
||||
builder = builder.DynamicParameters(*createBuild.EnableDynamicParameters)
|
||||
}
|
||||
|
||||
workspaceBuild, provisionerJob, provisionerDaemons, err = builder.Build(
|
||||
ctx,
|
||||
tx,
|
||||
|
||||
@@ -717,10 +717,6 @@ func createWorkspace(
|
||||
builder = builder.MarkPrebuiltWorkspaceClaim()
|
||||
}
|
||||
|
||||
if req.EnableDynamicParameters {
|
||||
builder = builder.DynamicParameters(req.EnableDynamicParameters)
|
||||
}
|
||||
|
||||
workspaceBuild, provisionerJob, provisionerDaemons, err = builder.Build(
|
||||
ctx,
|
||||
db,
|
||||
|
||||
@@ -57,12 +57,10 @@ type Builder struct {
|
||||
deploymentValues *codersdk.DeploymentValues
|
||||
experiments codersdk.Experiments
|
||||
|
||||
richParameterValues []codersdk.WorkspaceBuildParameter
|
||||
// dynamicParametersEnabled is non-nil if set externally
|
||||
dynamicParametersEnabled *bool
|
||||
initiator uuid.UUID
|
||||
reason database.BuildReason
|
||||
templateVersionPresetID uuid.UUID
|
||||
richParameterValues []codersdk.WorkspaceBuildParameter
|
||||
initiator uuid.UUID
|
||||
reason database.BuildReason
|
||||
templateVersionPresetID uuid.UUID
|
||||
|
||||
// used during build, makes function arguments less verbose
|
||||
ctx context.Context
|
||||
@@ -204,12 +202,6 @@ func (b Builder) MarkPrebuiltWorkspaceClaim() Builder {
|
||||
return b
|
||||
}
|
||||
|
||||
func (b Builder) DynamicParameters(using bool) Builder {
|
||||
// nolint: revive
|
||||
b.dynamicParametersEnabled = ptr.Ref(using)
|
||||
return b
|
||||
}
|
||||
|
||||
// SetLastWorkspaceBuildInTx prepopulates the Builder's cache with the last workspace build. This allows us
|
||||
// to avoid a repeated database query when the Builder's caller also needs the workspace build, e.g. auto-start &
|
||||
// auto-stop.
|
||||
@@ -1211,10 +1203,6 @@ func (b *Builder) checkRunningBuild() error {
|
||||
}
|
||||
|
||||
func (b *Builder) usingDynamicParameters() bool {
|
||||
if b.dynamicParametersEnabled != nil {
|
||||
return *b.dynamicParametersEnabled
|
||||
}
|
||||
|
||||
tpl, err := b.getTemplate()
|
||||
if err != nil {
|
||||
return false // Let another part of the code get this error
|
||||
|
||||
Reference in New Issue
Block a user