Skip to content

Commit b18354b

Browse files
ishwar170695glours
authored andcommitted
refactor: thread context through publish sensitive data check
Signed-off-by: Ishwar <ishwarcm@iitbhilai.ac.in>
1 parent 72bf113 commit b18354b

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

pkg/compose/publish.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (s *composeService) publish(ctx context.Context, project *types.Project, re
5454
if err != nil {
5555
return err
5656
}
57-
accept, err := s.preChecks(project, options)
57+
accept, err := s.preChecks(ctx, project, options)
5858
if err != nil {
5959
return err
6060
}
@@ -298,7 +298,7 @@ func (s *composeService) generateImageDigestsOverride(ctx context.Context, proje
298298
return override.MarshalYAML()
299299
}
300300

301-
func (s *composeService) preChecks(project *types.Project, options api.PublishOptions) (bool, error) {
301+
func (s *composeService) preChecks(ctx context.Context, project *types.Project, options api.PublishOptions) (bool, error) {
302302
if ok, err := s.checkOnlyBuildSection(project); !ok || err != nil {
303303
return false, err
304304
}
@@ -321,7 +321,7 @@ func (s *composeService) preChecks(project *types.Project, options api.PublishOp
321321
return false, err
322322
}
323323
}
324-
detectedSecrets, err := s.checkForSensitiveData(project)
324+
detectedSecrets, err := s.checkForSensitiveData(ctx, project)
325325
if err != nil {
326326
return false, err
327327
}
@@ -419,12 +419,12 @@ func (s *composeService) checkForBindMount(project *types.Project) map[string][]
419419
return allFindings
420420
}
421421

422-
func (s *composeService) checkForSensitiveData(project *types.Project) ([]secrets.DetectedSecret, error) {
422+
func (s *composeService) checkForSensitiveData(ctx context.Context, project *types.Project) ([]secrets.DetectedSecret, error) {
423423
var allFindings []secrets.DetectedSecret
424424
scan := scanner.NewDefaultScanner()
425425
// Check all compose files
426426
for _, file := range project.ComposeFiles {
427-
in, err := composeFileAsByteReader(file, project)
427+
in, err := composeFileAsByteReader(ctx, file, project)
428428
if err != nil {
429429
return nil, err
430430
}
@@ -471,12 +471,12 @@ func (s *composeService) checkForSensitiveData(project *types.Project) ([]secret
471471
return allFindings, nil
472472
}
473473

474-
func composeFileAsByteReader(filePath string, project *types.Project) (io.Reader, error) {
474+
func composeFileAsByteReader(ctx context.Context, filePath string, project *types.Project) (io.Reader, error) {
475475
composeFile, err := os.ReadFile(filePath)
476476
if err != nil {
477477
return nil, fmt.Errorf("failed to open compose file %s: %w", filePath, err)
478478
}
479-
base, err := loader.LoadWithContext(context.TODO(), types.ConfigDetails{
479+
base, err := loader.LoadWithContext(ctx, types.ConfigDetails{
480480
WorkingDir: project.WorkingDir,
481481
Environment: project.Environment,
482482
ConfigFiles: []types.ConfigFile{

0 commit comments

Comments
 (0)