jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-30 05:59:39 +02:00
Code Issues Releases Activity

fix(checkmarxExecuteScan): whitespace in filePatterns; log output; (#1784)

Browse Source 
* removed whitespaces in filePatterns and add zip file count log

* safer string-replace for whitespaces

Co-authored-by: Sven Merk <33895725+nevskrem@users.noreply.github.com>
This commit is contained in:
lndrschlz 2020-07-20 16:50:48 +02:00 committed by GitHub
parent 42f91f6ff1
commit 94dba13fef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/checkmarxExecuteScan.go
View File

@ -93,7 +93,7 @@ func loadExistingProject(sys checkmarx.System, initialProjectName, pullRequestNa
func zipWorkspaceFiles(workspace, filterPattern string) *os.File {
zipFileName := filepath.Join(workspace, "workspace.zip")
patterns := strings.Split(filterPattern, ",")
patterns := strings.Split(strings.ReplaceAll(strings.ReplaceAll(filterPattern, ", ", ","), " ,", ","), ",")
sort.Strings(patterns)
zipFile, err := os.Create(zipFileName)
if err != nil {
@ -109,7 +109,6 @@ func uploadAndScan(config checkmarxExecuteScanOptions, sys checkmarx.System, pro
sourceCodeUploaded := sys.UploadProjectSourceCode(project.ID, zipFile.Name())
if sourceCodeUploaded {
log.Entry().Debugf("Source code uploaded for project %v", project.Name)
zipFile.Close()
err := os.Remove(zipFile.Name())
if err != nil {
log.Entry().WithError(err).Warnf("Failed to delete zipped source code for project %v", project.Name)
@ -516,6 +515,7 @@ func zipFolder(source string, zipFile io.Writer, patterns []string) error {
baseDir = filepath.Base(source)
}
fileCount := 0
filepath.Walk(source, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
@ -555,17 +555,17 @@ func zipFolder(source string, zipFile io.Writer, patterns []string) error {
}
defer file.Close()
_, err = io.Copy(writer, file)
fileCount++
return err
})
log.Entry().Infof("Zipped %d files", fileCount)
return err
}
func filterFileGlob(patterns []string, path string, info os.FileInfo) bool {
for index := 0; index < len(patterns); index++ {
pattern := patterns[index]
for _, pattern := range patterns {
negative := false
if strings.Index(pattern, "!") == 0 {
if strings.HasPrefix(pattern, "!") {
pattern = strings.TrimLeft(pattern, "!")
negative = true
}