merge after conflicts

Author: cx-dmitri-rivin

go.mod

@@ -41,7 +41,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
-	github.com/Checkmarx/containers-images-extractor v1.0.16
+	github.com/Checkmarx/containers-images-extractor v1.0.17
 	github.com/Checkmarx/containers-syft-packages-extractor v1.0.15 // indirect
 	github.com/CycloneDX/cyclonedx-go v0.9.2 // indirect
 	github.com/DataDog/zstd v1.5.6 // indirect

go.sum

@@ -63,8 +63,8 @@ github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Checkmarx/containers-images-extractor v1.0.16 h1:Uo69VEcPe1Puy47JeRn902xN+e+nFmmFAcHlbdQeqy8=
-github.com/Checkmarx/containers-images-extractor v1.0.16/go.mod h1:hRXOiq6Vw2QiIuxIqV+6+osMk0vvIpoMdTMLyz9OfE8=
+github.com/Checkmarx/containers-images-extractor v1.0.17 h1:lzisdh50nR5yzTjTkT9r9dlHHI7aC72XTGjTp35KqHM=
+github.com/Checkmarx/containers-images-extractor v1.0.17/go.mod h1:hRXOiq6Vw2QiIuxIqV+6+osMk0vvIpoMdTMLyz9OfE8=
 github.com/Checkmarx/containers-resolver v1.0.18 h1:c4Ra6dWtlFyq1N9oVWo0IwTzviM1DcuWQvDMjILUJDs=
 github.com/Checkmarx/containers-resolver v1.0.18/go.mod h1:UwT3Z+rf6RZv1voMt1xtEctWguhQrzHk1dhEb0Dl5fY=
 github.com/Checkmarx/containers-syft-packages-extractor v1.0.15 h1:yM7Plt86oL47Kijr1fwsrWwuACNTwWgxZSZ/lifXTlk=

internal/services/realtimeengine/containersrealtime/containers-realtime.go

@@ -105,7 +105,7 @@ func parseContainersFile(filePath string) ([]types.ImageModel, error) {
 		return nil, errors.Errorf("directory does not exist: %s", scanPath)
 	}
 
-	files, envVars, _, err := extractor.ExtractFiles(scanPath)
+	files, envVars, _, err := extractor.ExtractFiles(scanPath, false)
 	if err != nil {
 		return nil, errors.Wrap(err, "error extracting files")
 	}
@@ -199,11 +199,14 @@ func (c *ContainersRealtimeService) buildContainerImageResults(responseImages, i
 
 func mergeImagesToResults(listOfImages []wrappers.ContainerImageResponseItem, result ContainerImageResults, images *[]types.ImageModel, filePath string) ContainerImageResults {
 	for _, respImg := range listOfImages {
-		locations := getImageLocations(images, respImg.ImageName, respImg.ImageTag)
+		locations, specificFilePath := getImageLocations(images, respImg.ImageName, respImg.ImageTag)
+		if specificFilePath == "" {
+			specificFilePath = filePath
+		}
 		containerImage := ContainerImage{
 			ImageName:       respImg.ImageName,
 			ImageTag:        respImg.ImageTag,
-			FilePath:        filePath,
+			FilePath:        specificFilePath,
 			Locations:       locations,
 			Status:          respImg.Status,
 			Vulnerabilities: convertVulnerabilities(respImg.Vulnerabilities),
@@ -213,23 +216,27 @@ func mergeImagesToResults(listOfImages []wrappers.ContainerImageResponseItem, re
 	return result
 }
 
-func getImageLocations(images *[]types.ImageModel, imageName, imageTag string) []realtimeengine.Location {
+func getImageLocations(images *[]types.ImageModel, imageName, imageTag string) (location []realtimeengine.Location, filePath string) {
 	for i, img := range *images {
 		if img.Name == imageName+":"+imageTag || img.Name == imageName+"@"+imageTag {
 			location := convertLocations(&img.ImageLocations)
+			filePath := ""
+			if len(img.ImageLocations) > 0 {
+				filePath = img.ImageLocations[0].Path
+			}
 			*images = append((*images)[:i], (*images)[i+1:]...)
-			return location
+			return location, filePath
 		}
 	}
-	return []realtimeengine.Location{}
+	return []realtimeengine.Location{}, ""
 }
 
 // splitToImageAndTag splits the image string into name and tag components.
 func splitToImageAndTag(image string) (imageName, imageTag string) {
 	// Split the image string by the last colon to separate name and tag
 	lastColonIndex := strings.LastIndex(image, ":")
 
-	if lastColonIndex == len(image)-1 {
+	if lastColonIndex == len(image)-1 || lastColonIndex == -1 {
 		return image, "latest" // No tag specified, default to "latest"
 	}
 

test/integration/containers-realtime_test.go

@@ -38,7 +38,6 @@ func TestContainersRealtimeScan_PositiveDockerfile_Success(t *testing.T) {
 }
 
 func TestContainersRealtimeScan_EmptyDockerfile_SuccessWithEmptyResponse(t *testing.T) {
-	t.Skip("Skipping this test till the RT api for containers will deploy to DEU ENV")
 	configuration.LoadConfiguration()
 	args := []string{
 		"scan", "containers-realtime",