Skip to content

Commit a6914e7

Browse files
EmyrkEmyrk
committed
make gen
1 parent a5a2948 commit a6914e7

File tree

12 files changed

+38
-10
lines changed

12 files changed

+38
-10
lines changed

‎coderd/apidoc/docs.go‎

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

‎coderd/apidoc/swagger.json‎

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

‎coderd/coderd.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,6 +1999,7 @@ func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, n
19991999
api.NotificationsEnqueuer,
20002000
&api.PrebuildsReconciler,
20012001
api.ProvisionerdServerMetrics,
2002+
api.Experiments,
20022003
)
20032004
if err != nil {
20042005
return nil, err

‎coderd/provisionerdserver/provisionerdserver.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ type server struct {
121121
NotificationsEnqueuer notifications.Enqueuer
122122
PrebuildsOrchestrator *atomic.Pointer[prebuilds.ReconciliationOrchestrator]
123123
UsageInserter *atomic.Pointer[usage.Inserter]
124+
Experiments codersdk.Experiments
124125

125126
OIDCConfig promoauth.OAuth2Config
126127

@@ -182,6 +183,7 @@ func NewServer(
182183
enqueuer notifications.Enqueuer,
183184
prebuildsOrchestrator *atomic.Pointer[prebuilds.ReconciliationOrchestrator],
184185
metrics *Metrics,
186+
experiments codersdk.Experiments,
185187
) (proto.DRPCProvisionerDaemonServer, error) {
186188
// Fail-fast if pointers are nil
187189
if lifecycleCtx == nil {
@@ -253,6 +255,7 @@ func NewServer(
253255
PrebuildsOrchestrator: prebuildsOrchestrator,
254256
UsageInserter: usageInserter,
255257
metrics: metrics,
258+
Experiments: experiments,
256259
}
257260

258261
if s.heartbeatFn == nil {

‎coderd/provisionerdserver/provisionerdserver_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"storj.io/drpc"
2727

2828
"cdr.dev/slog/sloggers/slogtest"
29+
"github.com/coder/coder/v2/coderd"
2930
"github.com/coder/coder/v2/coderd/util/ptr"
3031
"github.com/coder/quartz"
3132
"github.com/coder/serpent"
@@ -4162,7 +4163,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
41624163
defOrg, err := db.GetDefaultOrganization(context.Background())
41634164
require.NoError(t, err, "default org not found")
41644165

4165-
deploymentValues := &codersdk.DeploymentValues{}
4166+
deploymentValues := coderdtest.DeploymentValues(t)
41664167
var externalAuthConfigs []*externalauth.Config
41674168
tss := testTemplateScheduleStore()
41684169
uqhss := testUserQuietHoursScheduleStore()
@@ -4285,6 +4286,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
42854286
notifEnq,
42864287
&op,
42874288
provisionerdserver.NewMetrics(logger),
4289+
coderd.ReadExperiments(logger, deploymentValues.Experiments),
42884290
)
42894291
require.NoError(t, err)
42904292
return srv, db, ps, daemon

‎codersdk/deployment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ const (
36473647
ExperimentMCPServerHTTP Experiment = "mcp-server-http" // Enables the MCP HTTP server functionality.
36483648
ExperimentWorkspaceSharing Experiment = "workspace-sharing" // Enables updating workspace ACLs for sharing with users and groups.
36493649
// ExperimentTerraformWorkspace is named after the "Terraform Workspaces" feature, not to be confused with Coder Workspaces.
3650-
ExperimentTerraformWorkspace Experiment = "terraform-workspaces" // Enables reuse of existing terraform directory for builds
3650+
ExperimentTerraformWorkspace Experiment = "terraform-directory-reuse" // Enables reuse of existing terraform directory for builds
36513651
)
36523652

36533653
func (e Experiment) DisplayName() string {
@@ -3669,7 +3669,7 @@ func (e Experiment) DisplayName() string {
36693669
case ExperimentWorkspaceSharing:
36703670
return "Workspace Sharing"
36713671
case ExperimentTerraformWorkspace:
3672-
return "Terraform Workspace Caching"
3672+
return "Terraform Directory Reuse"
36733673
default:
36743674
// Split on hyphen and convert to title case
36753675
// e.g. "web-push" -> "Web Push", "mcp-server-http" -> "Mcp Server Http"

‎docs/reference/api/schemas.md‎

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

‎docs/reference/cli/provisioner_start.md‎

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

‎enterprise/cli/testdata/coder_provisioner_start_--help.golden‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ USAGE:
66
Run a provisioner daemon
77

88
OPTIONS:
9+
--experiments string-array, $CODER_EXPERIMENTS
10+
Enable one or more experiments. These are not ready for production.
11+
Separate multiple experiments with commas, or enter '*' to opt-in to
12+
all available experiments.
13+
914
-O, --org string, $CODER_ORGANIZATION
1015
Select which organization (uuid or name) to use.
1116

‎enterprise/coderd/provisionerdaemons.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
362362
api.NotificationsEnqueuer,
363363
&api.AGPL.PrebuildsReconciler,
364364
api.ProvisionerdServerMetrics,
365+
api.AGPL.Experiments,
365366
)
366367
if err != nil {
367368
if !xerrors.Is(err, context.Canceled) {

0 commit comments

Comments
 (0)