Skip to content

Commit 140e422

Browse files
authored
Merge pull request #1071 from Checkmarx/other/increase-sca
Increase SCA export timeout (AST-88378)
2 parents 2082432 + 52330f6 commit 140e422

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/MakeNowJust/heredoc v1.0.0
1111
github.com/bouk/monkey v1.0.0
1212
github.com/gofrs/flock v0.12.1
13-
github.com/golang-jwt/jwt/v5 v5.2.1
13+
github.com/golang-jwt/jwt/v5 v5.2.2
1414
github.com/gomarkdown/markdown v0.0.0-20241102151059-6bc1ffdc6e8c
1515
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1616
github.com/google/uuid v1.6.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeH
418418
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
419419
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
420420
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
421-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
422-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
421+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
422+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
423423
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
424424
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
425425
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

internal/services/export.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const (
1717
delayValueForReport = 3
1818
pendingStatus = "Pending"
1919
completedStatus = "Completed"
20-
pollingTimeout = 5 // minutes
20+
pollingTimeout = 15 // minutes
2121
)
2222

2323
func GetExportPackage(exportWrapper wrappers.ExportWrapper, scanID string, scaHideDevAndTestDep bool) (*wrappers.ScaPackageCollectionExport, error) {
@@ -112,6 +112,9 @@ func pollForCompletion(exportWrapper wrappers.ExportWrapper, exportID string) (*
112112
logger.PrintIfVerbose("Polling for export report generation completion")
113113

114114
for pollingResp.ExportStatus == exportingStatus || pollingResp.ExportStatus == pendingStatus {
115+
116+
logger.Printf("SCA Export Status is: %s", pollingResp.ExportStatus)
117+
115118
select {
116119
case <-timeout:
117120
return nil, errors.Errorf("export generating failed - Timed out after 5 minutes")

0 commit comments

Comments
 (0)