Skip to content

Commit 9439fa1

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: use not null for prebuild_status
1 parent 8a33ac8 commit 9439fa1

File tree

6 files changed

+36
-42
lines changed

6 files changed

+36
-42
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9049,10 +9049,7 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
90499049
Int32: 0,
90509050
Valid: true,
90519051
},
9052-
PrebuildStatus: database.NullPrebuildStatus{
9053-
PrebuildStatus: database.PrebuildStatusNormal,
9054-
Valid: true,
9055-
},
9052+
PrebuildStatus: database.PrebuildStatusNormal,
90569053
}
90579054
q.presets = append(q.presets, preset)
90589055
return preset, nil

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000329_add_status_to_template_presets.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ CREATE TYPE prebuild_status AS ENUM (
44
'validation_failed' -- Prebuilds failed due to a non-retryable validation error (e.g. template misconfiguration); won't be retried.
55
);
66

7-
ALTER TABLE template_version_presets ADD COLUMN prebuild_status prebuild_status DEFAULT 'normal';
7+
ALTER TABLE template_version_presets ADD COLUMN prebuild_status prebuild_status NOT NULL DEFAULT 'normal'::prebuild_status;

‎coderd/database/models.go

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

‎coderd/database/queries.sql.go

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

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
362362
)
363363

364364
// If the preset was previously hard-limited, log it and exit early.
365-
if ps.Preset.PrebuildStatus.PrebuildStatus == database.PrebuildStatusHardLimited {
365+
if ps.Preset.PrebuildStatus == database.PrebuildStatusHardLimited {
366366
logger.Warn(ctx, "skipping hard limited preset", slog.F("preset_id", ps.Preset.ID), slog.F("name", ps.Preset.Name))
367367
return nil
368368
}
@@ -374,10 +374,7 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
374374
logger.Warn(ctx, "skipping hard limited preset", slog.F("preset_id", ps.Preset.ID), slog.F("name", ps.Preset.Name))
375375

376376
err := c.store.UpdatePrebuildStatus(ctx, database.UpdatePrebuildStatusParams{
377-
Status: database.NullPrebuildStatus{
378-
PrebuildStatus: database.PrebuildStatusHardLimited,
379-
Valid: true,
380-
},
377+
Status: database.PrebuildStatusHardLimited,
381378
PresetID: ps.Preset.ID,
382379
})
383380
if err != nil {

0 commit comments

Comments
 (0)