Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfb8c284

Browse files
committed
select file by hash
1 parent931ac95 commitfb8c284

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
773773
casedatabase.ProvisionerStorageMethodFile:
774774
file,err:=s.Database.GetFileByID(ctx,job.FileID)
775775
iferr!=nil {
776-
returnnil,failJob(fmt.Sprintf("get file byhash: %s",err))
776+
returnnil,failJob(fmt.Sprintf("get file byid: %s",err))
777777
}
778778
protoJob.TemplateSourceArchive=file.Data
779779
default:
@@ -1399,6 +1399,7 @@ UploadFileStream:
13991399
returnxerrors.Errorf("insert file: %w",err)
14001400
}
14011401
}
1402+
14021403
returnnil
14031404
}
14041405

@@ -1687,6 +1688,19 @@ func (s *server) completeTemplateImportJob(ctx context.Context, job database.Pro
16871688
}
16881689
}
16891690

1691+
iflen(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+
iferr!=nil {
1695+
returnxerrors.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+
16901704
err=db.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
16911705
JobID:jobID,
16921706
UpdatedAt:now,

‎provisionerd/provisionerd.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package provisionerd
22

33
import (
44
"context"
5+
"crypto/sha256"
56
"errors"
67
"fmt"
78
"io"
@@ -570,9 +571,11 @@ func (p *Server) CompleteJob(ctx context.Context, in *proto.CompletedJob) error
570571
ifmessageSize>drpcsdk.MaxMessageSize&&
571572
messageSize-len(ti.TemplateImport.ModuleFiles)<drpcsdk.MaxMessageSize {
572573

574+
moduleFilesHash:=sha256.Sum256(ti.TemplateImport.ModuleFiles)
573575
// Split the module files from the message if it exceeds the max size.
574576
moduleFiles:=ti.TemplateImport.ModuleFiles
575577
ti.TemplateImport.ModuleFiles=nil// Clear the files in the final message
578+
ti.TemplateImport.ModuleFilesHash=moduleFilesHash[:]
576579
err:=p.UploadModuleFiles(ctx,moduleFiles)
577580
iferr!=nil {
578581
returnerr

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp