select file by hash

Emyrk · Emyrk · commit fb8c28442872 · 2025-06-06T09:19:23.000-05:00
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -773,7 +773,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 	case database.ProvisionerStorageMethodFile:
 		file, err := s.Database.GetFileByID(ctx, job.FileID)
 		if err != nil {
-			return nil, failJob(fmt.Sprintf("get file by hash: %s", err))
+			return nil, failJob(fmt.Sprintf("get file by id: %s", err))
 		}
 		protoJob.TemplateSourceArchive = file.Data
 	default:
@@ -1399,6 +1399,7 @@ UploadFileStream:
 			return xerrors.Errorf("insert file: %w", err)
 		}
 	}
+
 	return nil
 }
 
@@ -1687,6 +1688,19 @@ func (s *server) completeTemplateImportJob(ctx context.Context, job database.Pro
 				}
 			}
 
+			if len(jobType.TemplateImport.ModuleFilesHash) > 0 {
+				hashString := hex.EncodeToString(jobType.TemplateImport.ModuleFilesHash)
+				file, err := db.GetFileByHashAndCreator(dbauthz.AsSystemRestricted(ctx), database.GetFileByHashAndCreatorParams{Hash: hashString, CreatedBy: uuid.Nil})
+				if err != nil {
+					return xerrors.Errorf("get file by hash, it should have been uploaded: %w", err)
+				}
+
+				fileID = uuid.NullUUID{
+					Valid: true,
+					UUID:  file.ID,
+				}
+			}
+
 			err = db.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
 				JobID:               jobID,
 				UpdatedAt:           now,
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -2,6 +2,7 @@ package provisionerd
 
 import (
 	"context"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -570,9 +571,11 @@ func (p *Server) CompleteJob(ctx context.Context, in *proto.CompletedJob) error
 		if messageSize > drpcsdk.MaxMessageSize &&
 			messageSize-len(ti.TemplateImport.ModuleFiles) < drpcsdk.MaxMessageSize {
 
+			moduleFilesHash := sha256.Sum256(ti.TemplateImport.ModuleFiles)
 			// Split the module files from the message if it exceeds the max size.
 			moduleFiles := ti.TemplateImport.ModuleFiles
 			ti.TemplateImport.ModuleFiles = nil // Clear the files in the final message
+			ti.TemplateImport.ModuleFilesHash = moduleFilesHash[:]
 			err := p.UploadModuleFiles(ctx, moduleFiles)
 			if err != nil {
 				return err

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`773`	`773`	`case database.ProvisionerStorageMethodFile:`
`774`	`774`	`file, err := s.Database.GetFileByID(ctx, job.FileID)`
`775`	`775`	`if err != nil {`
`776`		`- return nil, failJob(fmt.Sprintf("get file by hash: %s", err))`
	`776`	`+ return nil, failJob(fmt.Sprintf("get file by id: %s", err))`
`777`	`777`	`}`
`778`	`778`	`protoJob.TemplateSourceArchive = file.Data`
`779`	`779`	`default:`
`@@ -1399,6 +1399,7 @@ UploadFileStream:`
`1399`	`1399`	`return xerrors.Errorf("insert file: %w", err)`
`1400`	`1400`	`}`
`1401`	`1401`	`}`
	`1402`	`+`
`1402`	`1403`	`return nil`
`1403`	`1404`	`}`
`1404`	`1405`
`@@ -1687,6 +1688,19 @@ func (s *server) completeTemplateImportJob(ctx context.Context, job database.Pro`
`1687`	`1688`	`}`
`1688`	`1689`	`}`
`1689`	`1690`
	`1691`	`+ if len(jobType.TemplateImport.ModuleFilesHash) > 0 {`
	`1692`	`+ hashString := hex.EncodeToString(jobType.TemplateImport.ModuleFilesHash)`
	`1693`	`+ file, err := db.GetFileByHashAndCreator(dbauthz.AsSystemRestricted(ctx), database.GetFileByHashAndCreatorParams{Hash: hashString, CreatedBy: uuid.Nil})`
	`1694`	`+ if err != nil {`
	`1695`	`+ return xerrors.Errorf("get file by hash, it should have been uploaded: %w", err)`
	`1696`	`+ }`
	`1697`	`+`
	`1698`	`+ fileID = uuid.NullUUID{`
	`1699`	`+ Valid: true,`
	`1700`	`+ UUID: file.ID,`
	`1701`	`+ }`
	`1702`	`+ }`
	`1703`	`+`
`1690`	`1704`	`err = db.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{`
`1691`	`1705`	`JobID: jobID,`
`1692`	`1706`	`UpdatedAt: now,`