Skip to content

Commit bd8fd1a

Browse files
committed
fix docker secret validation
1 parent 047b1ec commit bd8fd1a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

commands/scan/scan.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func (scanCmd *ScanCommand) RunAndRecordResults(cmdType utils.CommandType, recor
269269
}
270270

271271
func (scanCmd *ScanCommand) RunScan(cmdType utils.CommandType) (cmdResults *results.SecurityCommandResults) {
272-
xrayManager, cmdResults := initScanCmdResults(cmdType, scanCmd.serverDetails, scanCmd.analyticsMetricsService, scanCmd.bypassArchiveLimits)
272+
xrayManager, cmdResults := initScanCmdResults(cmdType, scanCmd.serverDetails, scanCmd.analyticsMetricsService, scanCmd.bypassArchiveLimits, scanCmd.validateSecrets)
273273
if cmdResults.GeneralError != nil {
274274
return
275275
}
@@ -309,7 +309,7 @@ func (scanCmd *ScanCommand) RunScan(cmdType utils.CommandType) (cmdResults *resu
309309
return
310310
}
311311

312-
func initScanCmdResults(cmdType utils.CommandType, serverDetails *config.ServerDetails, analyticsMetricsService *xsc.AnalyticsMetricsService, bypassArchiveLimits bool) (xrayManager *xrayClient.XrayServicesManager, cmdResults *results.SecurityCommandResults) {
312+
func initScanCmdResults(cmdType utils.CommandType, serverDetails *config.ServerDetails, analyticsMetricsService *xsc.AnalyticsMetricsService, bypassArchiveLimits, validateSecrets bool) (xrayManager *xrayClient.XrayServicesManager, cmdResults *results.SecurityCommandResults) {
313313
cmdResults = results.NewCommandResults(cmdType)
314314
xrayManager, xrayVersion, err := xray.CreateXrayServiceManagerAndGetVersion(serverDetails)
315315
if err != nil {
@@ -331,6 +331,9 @@ func initScanCmdResults(cmdType utils.CommandType, serverDetails *config.ServerD
331331
return xrayManager, cmdResults.AddGeneralError(err)
332332
} else {
333333
cmdResults.SetEntitledForJas(entitledForJas)
334+
if entitledForJas {
335+
cmdResults.SetSecretValidation(jas.CheckForSecretValidation(xrayManager, xrayVersion, validateSecrets))
336+
}
334337
}
335338
if analyticsMetricsService != nil {
336339
cmdResults.SetMultiScanId(analyticsMetricsService.GetMsi())

0 commit comments

Comments
 (0)