Skip to content

Containers - checkmarx folder deleted (AST-106461) #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cx-dmitri-rivin wants to merge 1 commit into from
Closed

Containers - checkmarx folder deleted (AST-106461) #1304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions internal/commands/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,8 @@ func getUploadURLFromSource(cmd *cobra.Command, uploadsWrapper wrappers.UploadsW
if unzip {
_ = cleanTempUnzipDirectory(directoryPath)
}
// Clean up .checkmarx directory on container scan error
_ = cleanCheckmarxContainersDirectory(directoryPath)
return "", "", containerResolverError
}
}
Expand All @@ -1950,12 +1952,26 @@ func getUploadURLFromSource(cmd *cobra.Command, uploadsWrapper wrappers.UploadsW
logger.PrintIfVerbose("Single container scan triggered: compressing only the container resolution file")
containerResolutionFilePath := filepath.Join(directoryPath, ".checkmarx", "containers", containerResolutionFileName)
zipFilePath, dirPathErr = util.CompressFile(containerResolutionFilePath, containerResolutionFileName, directoryCreationPrefix)

// Clean up .checkmarx directory after successful container scan compression
if dirPathErr == nil {
_ = cleanCheckmarxContainersDirectory(directoryPath)
}
} else {
if !isSbom {
zipFilePath, dirPathErr = compressFolder(directoryPath, sourceDirFilter, userIncludeFilter, scaResolver)
}

// Clean up .checkmarx directory after successful mixed scan (including containers) compression
if dirPathErr == nil && containerScanTriggered && containerResolveLocally {
_ = cleanCheckmarxContainersDirectory(directoryPath)
}
}
if dirPathErr != nil {
// Clean up .checkmarx directory on compression error if container scan was involved
if containerScanTriggered && containerResolveLocally {
_ = cleanCheckmarxContainersDirectory(directoryPath)
}
return "", "", dirPathErr
}

Expand All @@ -1975,6 +1991,24 @@ func getUploadURLFromSource(cmd *cobra.Command, uploadsWrapper wrappers.UploadsW
return preSignedURL, zipFilePath, nil
}

// cleanCheckmarxContainersDirectory removes the .checkmarx/containers directory after container scan completion
func cleanCheckmarxContainersDirectory(directoryPath string) error {
checkmarxPath := filepath.Join(directoryPath, ".checkmarx")
if _, err := os.Stat(checkmarxPath); os.IsNotExist(err) {
logger.PrintIfVerbose("No .checkmarx directory found to clean up")
return nil
}

logger.PrintIfVerbose("Cleaning up .checkmarx directory after container scan")
err := os.RemoveAll(checkmarxPath)
if err != nil {
logger.PrintIfVerbose(fmt.Sprintf("Warning: Failed to clean up .checkmarx directory: %s", err.Error()))
return errors.Wrapf(err, "Failed to clean up .checkmarx directory")
}
logger.PrintIfVerbose("Successfully cleaned up .checkmarx directory")
return nil
}

func runContainerResolver(cmd *cobra.Command, directoryPath, containerImageFlag string, containerResolveLocally bool) error {
debug, _ := cmd.Flags().GetBool(commonParams.DebugFlag)
var containerImagesList []string
Expand Down
Loading