- Notifications
You must be signed in to change notification settings - Fork1.1k
feat: persist prebuild definitions on template import#16951
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
88 commits Select commitHold shift + click to select a range
5ecc277 add prebuilds system user database changes and associated changes
SasSwartbc5f4f4 optionally prevent system users from counting to user count
dannykopping48c5372 appease the linter
dannykoppingb16d126 add unit test for system user behaviour
dannykopping2c25542 reverting RBAC changes; not relevant here
dannykopping8e491d8 removing unnecessary changes
dannykopping514fdbf exclude system user db tests from non-linux OSs
dannykopping390a1fd feat: add migrations and queries to support prebuilds
SasSwart07e9613 Merge remote-tracking branch 'origin/main' into prebuilds-db
SasSwarta07c2b2 feat: persist prebuild definitions on template import
SasSwart300e80f add prebuilds system user database changes and associated changes
SasSwartb788237 optionally prevent system users from counting to user count
dannykopping8122595 appease the linter
dannykoppingbfb7c28 add unit test for system user behaviour
dannykopping6639167 reverting RBAC changes; not relevant here
dannykopping769ae1d removing unnecessary changes
dannykoppinge7e9c27 exclude system user db tests from non-linux OSs
dannykopping3936047 Rename prebuild system user reference
SasSwart8bdcafb ensure that users.IsSystem is not nullable
SasSwart412d198 feat: add migrations and queries to support prebuilds
SasSwart51773ec Simplify workspace_latest_build view
dannykopping23773c2 Revert test change
dannykoppingbc3ff44 make gen
dannykoppingbaa3076 refactor: add comments to SQL queries
evgeniy-scherbinaed14fb3 test: added get-presets-backoff test
evgeniy-scherbina3cc74fb refactor: add comment to SQL query
evgeniy-scherbinafc32154 refactor: add comments + improve tests
evgeniy-scherbinad7b4ec4 fix: bug in SQL
evgeniy-scherbinae8b53f7 test: minor changes to the test
evgeniy-scherbina9df6554 refactor: remove job_status from SQL query
evgeniy-scherbinaccc309e refactor: embed preset_prebuilds table into presets table
evgeniy-scherbinaee1f16a refactor: rename sql table
evgeniy-scherbinad040ddd refactor: remove unnecessary JOIN
evgeniy-scherbina83a6722 refactor: remove unnecessary JOIN
evgeniy-scherbinacd70710 refactor: use INNER JOIN for consistency
evgeniy-scherbina0f3bda0 Merge remote-tracking branch 'origin/prebuilds-db' into jjs/insert-pr…
SasSwarta7c7cd2 make lint
SasSwart97cc4ff refactor: simplify GetPresetsBackoff SQL Query
evgeniy-scherbina4d59039 Revert "refactor: simplify GetPresetsBackoff SQL Query"
evgeniy-scherbina205d6af refactor: improve GetPresetsBackoff query
evgeniy-scherbinae489e1b Merge remote-tracking branch 'origin/main' into prebuilds-db
evgeniy-scherbina1b29686 Merge remote-tracking branch 'origin/main' into prebuilds-db
evgeniy-scherbina20470e4 fix: bump migration numbers
evgeniy-scherbina6fc1889 Merge remote-tracking branch 'origin/main' into jjs/insert-prebuilds
SasSwart7b9c8ce test: remove deprecated test
evgeniy-scherbinae189a0b fix: fix linter
evgeniy-scherbina692c0e5 fix: fix 000310_prebuilds.down migration
evgeniy-scherbinaf747db0 fix: fix fixture migration
evgeniy-scherbina3166a42 fix: fix get-presets-backoff test
evgeniy-scherbinaaa6b490 fix: fix linter
evgeniy-scherbinabc4e7d2 fix: fix linter
evgeniy-scherbinaf167b92 correctly select for the latest built with a preset in latest_prebuil…
SasSwart8fd34ab Merge remote-tracking branch 'origin/main' into prebuilds-db
SasSwart7a8ec49 Properly label and filter metrics for prebuilds
SasSwarta64d661 test: fix db tests
evgeniy-scherbina865998b Merge branch 'prebuilds-db' into jjs/insert-prebuilds
SasSwartc787cd2 test: added tests for workspaces with multiple agents
evgeniy-scherbinabd38603 refactor: avoid code duplication
evgeniy-scherbina097f9c3 clarify query clause
SasSwart4cfdd6f tidy up dbauthz_test.go
SasSwart4a34d52 refactor: remove * usage from prebuilds.sql queries
evgeniy-scherbina8d9cd45 refactor: remove * usage from prebuilds views
evgeniy-scherbinaf870d7e refactor: join wlb with pj
evgeniy-scherbina18ad931 refactor: Rename SQL query
evgeniy-scherbina4667171 Added comments for SQL query
evgeniy-scherbinaa26c094 refactor: fix down migration
evgeniy-scherbinabf4ab53 make lint
SasSwarta84b1bb Merge remote-tracking branch 'origin/main' into jjs/insert-prebuilds
SasSwart6ed4121 Merge remote-tracking branch 'origin/main' into prebuilds-db
SasSwarte8b1502 Merge branch 'prebuilds-db' into jjs/insert-prebuilds
SasSwart2312f41 renumber migrations
SasSwart4540a55 add tests for prebuilds in the provisionerdserver
SasSwart5c41ba9 Merge branch 'prebuilds-db' into jjs/insert-prebuilds
SasSwartd09b757 fix indent
SasSwart61e86f6 make more use of dbgen
SasSwart1419df0 update dbmemt
SasSwart6589221 Add tests
SasSwartb15b97a Merge origin/main
SasSwartdd656a7 Merge remote-tracking branch 'origin/main' into jjs/insert-prebuilds
SasSwart508b244 fix tests
SasSwarte1f585d remove duplicate migrations fixture
SasSwart7d4f1b9 clean up go.mod slightly
SasSwart43f82b9 update dependency on terraform-provider-coder
SasSwart5d8de71 simplify query
SasSwarta87933a Correct the prebuilds type
SasSwart798cfa1 fix prebuild decoding
SasSwartdc87f45 make fmt
SasSwart7c17fcd update our dependency on terraform-provider-coder
SasSwartFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
fix prebuild decoding
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit798cfa1619ac10816fac3b6c7bddd9b9b8b4b778
There are no files selected for viewing
9 changes: 7 additions & 2 deletionsgo.mod
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionsgo.sum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
12 changes: 11 additions & 1 deletionprovisioner/terraform/resources.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -884,11 +884,21 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s | ||
| ) | ||
| } | ||
| if len(preset.Prebuilds) != 1 { | ||
Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Will this not warn incorrectly when there are no prebuilds defined at all (which is perfectly valid)? Shouldn't this be | ||
| logger.Warn( | ||
| ctx, | ||
| "coder_workspace_preset must have exactly one prebuild block", | ||
| ) | ||
| } | ||
| var prebuildInstances int32 | ||
| if len(preset.Prebuilds) > 0 { | ||
| prebuildInstances = int32(math.Min(math.MaxInt32, float64(preset.Prebuilds[0].Instances))) | ||
| } | ||
| protoPreset := &proto.Preset{ | ||
| Name: preset.Name, | ||
| Parameters: presetParameters, | ||
| Prebuild: &proto.Prebuild{ | ||
| Instances:prebuildInstances, | ||
| }, | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.