Skip to content

Commit a9f1a6b

Browse files
sreyasreya
authored
fix: revert fix: persist terraform modules during template import (#17665) (#17734)
This reverts commit ae3d90b.
1 parent ae3d90b commit a9f1a6b

File tree

27 files changed

+229
-587
lines changed

27 files changed

+229
-587
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ site/stats/
5050
*.tfplan
5151
*.lock.hcl
5252
.terraform/
53-
!provisioner/terraform/testdata/modules-source-caching/.terraform/
5453

5554
**/.coderv2/*
5655
**/__debug_bin

‎cli/testdata/coder_provisioner_list_--output_json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"last_seen_at": "====[timestamp]=====",
88
"name": "test",
99
"version": "v0.0.0-devel",
10-
"api_version": "1.5",
10+
"api_version": "1.4",
1111
"provisioners": [
1212
"echo"
1313
],

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ import (
1212
"time"
1313

1414
"github.com/google/uuid"
15-
"github.com/open-policy-agent/opa/topdown"
1615
"golang.org/x/xerrors"
1716

17+
"github.com/open-policy-agent/opa/topdown"
18+
1819
"cdr.dev/slog"
1920

21+
"github.com/coder/coder/v2/coderd/prebuilds"
22+
"github.com/coder/coder/v2/coderd/rbac/policy"
23+
"github.com/coder/coder/v2/coderd/rbac/rolestore"
24+
2025
"github.com/coder/coder/v2/coderd/database"
2126
"github.com/coder/coder/v2/coderd/database/dbtime"
2227
"github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints"
2328
"github.com/coder/coder/v2/coderd/httpmw/loggermw"
24-
"github.com/coder/coder/v2/coderd/prebuilds"
2529
"github.com/coder/coder/v2/coderd/rbac"
26-
"github.com/coder/coder/v2/coderd/rbac/policy"
27-
"github.com/coder/coder/v2/coderd/rbac/rolestore"
2830
"github.com/coder/coder/v2/coderd/util/slice"
2931
"github.com/coder/coder/v2/provisionersdk"
3032
)
@@ -345,7 +347,6 @@ var (
345347
rbac.ResourceNotificationPreference.Type: {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
346348
rbac.ResourceNotificationTemplate.Type: {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
347349
rbac.ResourceCryptoKey.Type: {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
348-
rbac.ResourceFile.Type: {policy.ActionCreate, policy.ActionRead},
349350
}),
350351
Org: map[string][]rbac.Permission{},
351352
User: []rbac.Permission{},

‎coderd/database/dbgen/dbgen.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -999,10 +999,9 @@ func TemplateVersionTerraformValues(t testing.TB, db database.Store, orig databa
999999
t.Helper()
10001000

10011001
params := database.InsertTemplateVersionTerraformValuesByJobIDParams{
1002-
JobID: takeFirst(orig.JobID, uuid.New()),
1003-
CachedPlan: takeFirstSlice(orig.CachedPlan, []byte("{}")),
1004-
CachedModuleFiles: orig.CachedModuleFiles,
1005-
UpdatedAt: takeFirst(orig.UpdatedAt, dbtime.Now()),
1002+
JobID: takeFirst(orig.JobID, uuid.New()),
1003+
CachedPlan: takeFirstSlice(orig.CachedPlan, []byte("{}")),
1004+
UpdatedAt: takeFirst(orig.UpdatedAt, dbtime.Now()),
10061005
}
10071006

10081007
err := db.InsertTemplateVersionTerraformValuesByJobID(genCtx, params)

‎coderd/database/dbmem/dbmem.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9315,7 +9315,6 @@ func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Cont
93159315
row := database.TemplateVersionTerraformValue{
93169316
TemplateVersionID: templateVersion.ID,
93179317
CachedPlan: arg.CachedPlan,
9318-
CachedModuleFiles: arg.CachedModuleFiles,
93199318
UpdatedAt: arg.UpdatedAt,
93209319
}
93219320
q.templateVersionTerraformValues = append(q.templateVersionTerraformValues, row)

‎coderd/database/dump.sql

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

‎coderd/database/foreign_key_constraint.go

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

‎coderd/database/migrations/000320_terraform_cached_modules.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/database/migrations/000320_terraform_cached_modules.up.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/database/models.go

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

0 commit comments

Comments
 (0)