Skip to content

chore: persist template import terraform plan in postgres #17012

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Mar 24, 2025
Merged

chore: persist template import terraform plan in postgres #17012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c652969
vaguely like this
aslilac Mar 19, 2025
6c250a3
this all makes the diff so weird
aslilac Mar 20, 2025
e21a475
wth
aslilac Mar 20, 2025
e4dd84f
this works!
aslilac Mar 20, 2025
d46076b
yes
aslilac Mar 20, 2025
f86d7fe
:)
aslilac Mar 20, 2025
5b97bcd
oh boy
aslilac Mar 20, 2025
9418711
Merge branch 'main' into lilac/import-graph
aslilac Mar 20, 2025
746ae46
here go
aslilac Mar 20, 2025
11d20d5
>:(
aslilac Mar 20, 2025
1a4f3b2
nice
aslilac Mar 20, 2025
a46470e
and do the insert again
aslilac Mar 20, 2025
1cdb247
🧹
aslilac Mar 20, 2025
9d3d7a0
fix dbauthz test
aslilac Mar 20, 2025
13ad6c8
fix e2e echoing
aslilac Mar 20, 2025
a05c8fe
add db fixtures
aslilac Mar 20, 2025
295bceb
hi steven
aslilac Mar 21, 2025
6a92c6e
yeah that's probably fine actually
aslilac Mar 21, 2025
6d46c7e
🧹
aslilac Mar 21, 2025
c237a97
Merge branch 'main' into lilac/import-graph
aslilac Mar 21, 2025
ae5330a
fix migration numbers
aslilac Mar 21, 2025
70fce96
oh boy
aslilac Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🧹
  • Loading branch information
@aslilac
aslilac committed Mar 20, 2025
commit 1cdb247b19217a1e4bee2351a5432a383cd35075
2 changes: 1 addition & 1 deletion coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8820,7 +8820,7 @@ func (q *FakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
return param, nil
}

func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(ctx context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Context, arg database.InsertTemplateVersionTerraformValuesByJobIDParams) error {
err := validateDatabaseType(arg)
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions provisioner/terraform/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,12 @@ func (e *executor) planResources(ctx, killCtx context.Context, planfilePath stri
return nil, nil, err
}

planJson, err := json.Marshal(plan)
planJSON, err := json.Marshal(plan)
if err != nil {
return nil, nil, err
}

return state, planJson, nil
return state, planJSON, nil
}

// showPlan must only be called while the lock is held.
Expand Down
Loading