Skip to content

Commit 693b415

Browse files
spikecurtispull[bot]
authored andcommitted
fix: fix null pointer on external provisioner daemons with daily_cost (#9401)
* fix: fix null pointer on external provisioner daemons with daily_cost Signed-off-by: Spike Curtis <spike@coder.com> * Add logging for debounce and job acquire Signed-off-by: Spike Curtis <spike@coder.com> * Return error instead of panic Signed-off-by: Spike Curtis <spike@coder.com> * remove debounce on external provisioners to fix test flakes Signed-off-by: Spike Curtis <spike@coder.com> --------- Signed-off-by: Spike Curtis <spike@coder.com>
1 parent b373e83 commit 693b415

File tree

6 files changed

+664
-350
lines changed

6 files changed

+664
-350
lines changed

coderd/coderd.go

+25-20
Original file line numberDiff line numberDiff line change
@@ -1098,26 +1098,31 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
10981098
}
10991099

11001100
mux := drpcmux.New()
1101-
1102-
err = proto.DRPCRegisterProvisionerDaemon(mux, &provisionerdserver.Server{
1103-
AccessURL: api.AccessURL,
1104-
ID: daemon.ID,
1105-
OIDCConfig: api.OIDCConfig,
1106-
Database: api.Database,
1107-
Pubsub: api.Pubsub,
1108-
Provisioners: daemon.Provisioners,
1109-
GitAuthConfigs: api.GitAuthConfigs,
1110-
Telemetry: api.Telemetry,
1111-
Tracer: tracer,
1112-
Tags: tags,
1113-
QuotaCommitter: &api.QuotaCommitter,
1114-
Auditor: &api.Auditor,
1115-
TemplateScheduleStore: api.TemplateScheduleStore,
1116-
UserQuietHoursScheduleStore: api.UserQuietHoursScheduleStore,
1117-
AcquireJobDebounce: debounce,
1118-
Logger: api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
1119-
DeploymentValues: api.DeploymentValues,
1120-
})
1101+
srv, err := provisionerdserver.NewServer(
1102+
api.AccessURL,
1103+
daemon.ID,
1104+
api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
1105+
daemon.Provisioners,
1106+
tags,
1107+
api.Database,
1108+
api.Pubsub,
1109+
api.Telemetry,
1110+
tracer,
1111+
&api.QuotaCommitter,
1112+
&api.Auditor,
1113+
api.TemplateScheduleStore,
1114+
api.UserQuietHoursScheduleStore,
1115+
api.DeploymentValues,
1116+
debounce,
1117+
provisionerdserver.Options{
1118+
OIDCConfig: api.OIDCConfig,
1119+
GitAuthConfigs: api.GitAuthConfigs,
1120+
},
1121+
)
1122+
if err != nil {
1123+
return nil, err
1124+
}
1125+
err = proto.DRPCRegisterProvisionerDaemon(mux, srv)
11211126
if err != nil {
11221127
return nil, err
11231128
}

0 commit comments

Comments
 (0)