mirror of
https://github.com/coder/coder.git
synced 2025-07-03 16:13:58 +00:00
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>
This commit is contained in:
@ -1098,26 +1098,31 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
|
||||
}
|
||||
|
||||
mux := drpcmux.New()
|
||||
|
||||
err = proto.DRPCRegisterProvisionerDaemon(mux, &provisionerdserver.Server{
|
||||
AccessURL: api.AccessURL,
|
||||
ID: daemon.ID,
|
||||
OIDCConfig: api.OIDCConfig,
|
||||
Database: api.Database,
|
||||
Pubsub: api.Pubsub,
|
||||
Provisioners: daemon.Provisioners,
|
||||
GitAuthConfigs: api.GitAuthConfigs,
|
||||
Telemetry: api.Telemetry,
|
||||
Tracer: tracer,
|
||||
Tags: tags,
|
||||
QuotaCommitter: &api.QuotaCommitter,
|
||||
Auditor: &api.Auditor,
|
||||
TemplateScheduleStore: api.TemplateScheduleStore,
|
||||
UserQuietHoursScheduleStore: api.UserQuietHoursScheduleStore,
|
||||
AcquireJobDebounce: debounce,
|
||||
Logger: api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
|
||||
DeploymentValues: api.DeploymentValues,
|
||||
})
|
||||
srv, err := provisionerdserver.NewServer(
|
||||
api.AccessURL,
|
||||
daemon.ID,
|
||||
api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
|
||||
daemon.Provisioners,
|
||||
tags,
|
||||
api.Database,
|
||||
api.Pubsub,
|
||||
api.Telemetry,
|
||||
tracer,
|
||||
&api.QuotaCommitter,
|
||||
&api.Auditor,
|
||||
api.TemplateScheduleStore,
|
||||
api.UserQuietHoursScheduleStore,
|
||||
api.DeploymentValues,
|
||||
debounce,
|
||||
provisionerdserver.Options{
|
||||
OIDCConfig: api.OIDCConfig,
|
||||
GitAuthConfigs: api.GitAuthConfigs,
|
||||
},
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
err = proto.DRPCRegisterProvisionerDaemon(mux, srv)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user