Skip to content

Commit 4005dbf

Browse files
EmyrkEmyrk
committed
make gen
1 parent e936d2c commit 4005dbf

File tree

11 files changed

+36
-8
lines changed

11 files changed

+36
-8
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/quartz"
3031
"github.com/coder/serpent"
3132

@@ -4160,7 +4161,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
41604161
defOrg, err := db.GetDefaultOrganization(context.Background())
41614162
require.NoError(t, err, "default org not found")
41624163

4163-
deploymentValues := &codersdk.DeploymentValues{}
4164+
deploymentValues := coderdtest.DeploymentValues(t)
41644165
var externalAuthConfigs []*externalauth.Config
41654166
tss := testTemplateScheduleStore()
41664167
uqhss := testUserQuietHoursScheduleStore()
@@ -4283,6 +4284,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
42834284
notifEnq,
42844285
&op,
42854286
provisionerdserver.NewMetrics(logger),
4287+
coderd.ReadExperiments(logger, deploymentValues.Experiments),
42864288
)
42874289
require.NoError(t, err)
42884290
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,10 @@ 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
}
75-
76-
// Handle requests, which will amount to terraform cli execs.
7774
return s.handleRequests()
7875
}
7976

0 commit comments

Comments
 (0)