fixes

aslilac · aslilac · commit 35cb5ee2afa6 · 2025-05-06T18:06:47.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -345,7 +345,7 @@ var (
 					rbac.ResourceNotificationPreference.Type: {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
 					rbac.ResourceNotificationTemplate.Type:   {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
 					rbac.ResourceCryptoKey.Type:              {policy.ActionCreate, policy.ActionUpdate, policy.ActionDelete},
-					rbac.ResourceFile.Type:                   {policy.ActionCreate},
+					rbac.ResourceFile.Type:                   {policy.ActionCreate, policy.ActionRead},
 				}),
 				Org:  map[string][]rbac.Permission{},
 				User: []rbac.Permission{},
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1437,43 +1437,63 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 		// If there is a plan, or a module files archive we need to insert a
 		// template_version_terraform_values row.
 		if len(plan) > 0 || len(moduleFiles) > 0 {
-			// ...but the plan and the module files archive are both optional! So
-			// we need to fallback to a valid JSON object if the plan was omitted.
-			if len(plan) == 0 {
-				plan = []byte("{}")
-			}
-
-			// ...and we only want to insert a files row if an archive was provided.
-			var fileID uuid.NullUUID
-			if len(moduleFiles) > 0 {
-				hashBytes := sha256.Sum256(moduleFiles)
-				hash := hex.EncodeToString(hashBytes[:])
-				// nolint:gocritic // Requires system privileges
-				file, err := s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
-					ID:        uuid.New(),
-					Hash:      hash,
-					CreatedBy: uuid.Nil, // TODO
-					CreatedAt: dbtime.Now(),
-					Mimetype:  tarMimeType,
-					Data:      moduleFiles,
+			err := s.Database.InTx(func(tx database.Store) error {
+				// ...but the plan and the module files archive are both optional! So
+				// we need to fallback to a valid JSON object if the plan was omitted.
+				if len(plan) == 0 {
+					plan = []byte("{}")
+				}
+
+				// ...and we only want to insert a files row if an archive was provided.
+				var fileID uuid.NullUUID
+				if len(moduleFiles) > 0 {
+					hashBytes := sha256.Sum256(moduleFiles)
+					hash := hex.EncodeToString(hashBytes[:])
+
+					// nolint:gocritic // Requires reading "system" files
+					file, err := s.Database.GetFileByHashAndCreator(dbauthz.AsSystemRestricted(ctx), database.GetFileByHashAndCreatorParams{Hash: hash, CreatedBy: uuid.Nil})
+					if err == nil {
+						// This set of modules is already cached, which means we can reuse them
+						fileID = uuid.NullUUID{
+							Valid: true,
+							UUID:  file.ID,
+						}
+					} else if !xerrors.Is(err, sql.ErrNoRows) {
+						return xerrors.Errorf("check for cached modules: %w", err)
+					} else {
+						// nolint:gocritic // Requires creating a "system" file
+						file, err = s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
+							ID:        uuid.New(),
+							Hash:      hash,
+							CreatedBy: uuid.Nil,
+							CreatedAt: dbtime.Now(),
+							Mimetype:  tarMimeType,
+							Data:      moduleFiles,
+						})
+						if err != nil {
+							return xerrors.Errorf("insert template version terraform modules: %w", err)
+						}
+						fileID = uuid.NullUUID{
+							Valid: true,
+							UUID:  file.ID,
+						}
+					}
+				}
+
+				err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
+					JobID:             jobID,
+					UpdatedAt:         now,
+					CachedPlan:        plan,
+					CachedModuleFiles: fileID,
 				})
 				if err != nil {
-					return nil, xerrors.Errorf("insert template version terraform modules: %w", err)
-				}
-				fileID = uuid.NullUUID{
-					Valid: true,
-					UUID:  file.ID,
+					return xerrors.Errorf("insert template version terraform data: %w", err)
 				}
-			}
 
-			err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
-				JobID:             jobID,
-				UpdatedAt:         now,
-				CachedPlan:        plan,
-				CachedModuleFiles: fileID,
-			})
+				return nil
+			}, nil)
 			if err != nil {
-				return nil, xerrors.Errorf("insert template version terraform data: %w", err)
+				return nil, err
 			}
 		}
 
diff --git a/provisionerd/proto/version.go b/provisionerd/proto/version.go
@@ -14,7 +14,7 @@ import "github.com/coder/coder/v2/apiversion"
 //   - Add new field named `devcontainers` in the Agent.
 const (
 	CurrentMajor = 1
-	CurrentMinor = 4
+	CurrentMinor = 5
 )
 
 // CurrentVersion is the current provisionerd API version.

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import "github.com/coder/coder/v2/apiversion"`
`14`	`14`	// - Add new field named `devcontainers` in the Agent.
`15`	`15`	`const (`
`16`	`16`	`CurrentMajor = 1`
`17`		`- CurrentMinor = 4`
	`17`	`+ CurrentMinor = 5`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// CurrentVersion is the current provisionerd API version.`