Skip to content

Commit 86c520b

Browse files
committed
make gen
1 parent abf5b46 commit 86c520b

File tree

11 files changed

+35
-6
lines changed

11 files changed

+35
-6
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
@@ -120,6 +120,7 @@ type server struct {
120120
NotificationsEnqueuer notifications.Enqueuer
121121
PrebuildsOrchestrator *atomic.Pointer[prebuilds.ReconciliationOrchestrator]
122122
UsageInserter *atomic.Pointer[usage.Inserter]
123+
Experiments codersdk.Experiments
123124

124125
OIDCConfig promoauth.OAuth2Config
125126

@@ -181,6 +182,7 @@ func NewServer(
181182
enqueuer notifications.Enqueuer,
182183
prebuildsOrchestrator *atomic.Pointer[prebuilds.ReconciliationOrchestrator],
183184
metrics *Metrics,
185+
experiments codersdk.Experiments,
184186
) (proto.DRPCProvisionerDaemonServer, error) {
185187
// Fail-fast if pointers are nil
186188
if lifecycleCtx == nil {
@@ -252,6 +254,7 @@ func NewServer(
252254
PrebuildsOrchestrator: prebuildsOrchestrator,
253255
UsageInserter: usageInserter,
254256
metrics: metrics,
257+
Experiments: experiments,
255258
}
256259

257260
if s.heartbeatFn == nil {

coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 2 additions & 0 deletions
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/quartz"
3031
"github.com/coder/serpent"
3132

@@ -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, ov.deploymentValues.Experiments),
42884290
)
42894291
require.NoError(t, err)
42904292
return srv, db, ps, daemon

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) {

provisionersdk/session.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@ func (p *protoServer) Session(stream proto.DRPCProvisioner_SessionStream) error
6767
s.logLevel = proto.LogLevel_value[strings.ToUpper(s.Config.ProvisionerLogLevel)]
6868
}
6969

70-
// Extract the template source archive into the work directory.
7170
err = s.Files.ExtractArchive(s.Context(), s.Logger, afero.NewOsFs(), s.Config)
7271
if err != nil {
7372
return xerrors.Errorf("extract archive: %w", err)
7473
}
7574

76-
// Handle requests, which will amount to terraform cli execs.
7775
return s.handleRequests()
7876
}
7977

0 commit comments

Comments
 (0)