Fix Interfaces

cx-alex-cohen · cx-alex-cohen · commit 72b70723ebe8 · 2024-12-09T17:38:17.000-05:00
diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/Checkmarx/containers-resolver
 go 1.23.3
 
 require (
-	github.com/Checkmarx/containers-images-extractor v1.0.2
-	github.com/Checkmarx/containers-syft-packages-extractor v1.0.2
+	github.com/Checkmarx/containers-images-extractor v1.0.3
+	github.com/Checkmarx/containers-syft-packages-extractor v1.0.3
 	github.com/Checkmarx/containers-types v1.0.0
 	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.10.0
diff --git a/go.sum b/go.sum
@@ -62,10 +62,10 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.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.2 h1:YeIYO3IONUxRh10dmOV1fR+ghC6YHKspNOXk6Z8AEYg=
-github.com/Checkmarx/containers-images-extractor v1.0.2/go.mod h1:cHtEnS5wlG7bTImOkhTjyZQ9mRurNLWPbnVqmQl94dk=
-github.com/Checkmarx/containers-syft-packages-extractor v1.0.2 h1:hglNeaNINX7HlOsB4DBFpb4RznG2uttKU5p0Qlohu+g=
-github.com/Checkmarx/containers-syft-packages-extractor v1.0.2/go.mod h1:g3HBc0hg/aIxlznuqDm6VmTDGmUMg2DDQMl8r60thI0=
+github.com/Checkmarx/containers-images-extractor v1.0.3 h1:v/F9PxR0YxVHY5I3mizgpBhARQXKFVwDsNz/d8AKQow=
+github.com/Checkmarx/containers-images-extractor v1.0.3/go.mod h1:cHtEnS5wlG7bTImOkhTjyZQ9mRurNLWPbnVqmQl94dk=
+github.com/Checkmarx/containers-syft-packages-extractor v1.0.3 h1:3WvSfMZK2SKSxDNPTnRKphSBKSh6J97iylb5zWg/NFE=
+github.com/Checkmarx/containers-syft-packages-extractor v1.0.3/go.mod h1:Rrbai9XG1p3cgI1M8Jj8cdueR2m2eowyYoJsN4xQmZY=
 github.com/Checkmarx/containers-types v1.0.0 h1:H3bAbFnb4GqrAuYww63Ts1S3XmiLt+m8aqLuL/D9pz8=
 github.com/Checkmarx/containers-types v1.0.0/go.mod h1:yp956K0amnEYogUnVOjuVTe1euNr/0qkgB+NhaqW4M8=
 github.com/CycloneDX/cyclonedx-go v0.9.1 h1:yffaWOZsv77oTJa/SdVZYdgAgFioCeycBUKkqS2qzQM=
diff --git a/pkg/containerResolver/containerScanner.go b/pkg/containerResolver/containerScanner.go
@@ -8,21 +8,18 @@ import (
 )
 
 type ContainersResolver struct {
-	imagesExtractor.ImagesExtractorInterface
-	syftPackagesExtractor.SyftPackagesExtractorInterface
+	imagesExtractor.ImagesExtractor
+	syftPackagesExtractor.SyftPackagesExtractor
 }
 
 func NewContainerResolver() ContainersResolver {
-	ImagesExtractor := new(imagesExtractor.ImagesExtractor)
-	SyftPackagesExtractor := new(syftPackagesExtractor.SyftPackagesExtractor)
-
 	return ContainersResolver{
-		ImagesExtractorInterface:       ImagesExtractor,
-		SyftPackagesExtractorInterface: SyftPackagesExtractor,
+		ImagesExtractor:       imagesExtractor.NewImagesExtractor(),
+		SyftPackagesExtractor: syftPackagesExtractor.NewSyftPackagesExtractor(),
 	}
 }
 
-func (cr ContainersResolver) Resolve(scanPath string, resolutionFolderPath string, images []string, isDebug bool) error {
+func (cr *ContainersResolver) Resolve(scanPath string, resolutionFolderPath string, images []string, isDebug bool) error {
 
 	log.Debug().Msgf("Resolve func parameters: scanPath=%s, resolutionFolderPath=%s, images=%s, isDebug=%t", scanPath, resolutionFolderPath, images, isDebug)
 
diff --git a/pkg/containerResolver/containerScanner_test.go b/pkg/containerResolver/containerScanner_test.go
@@ -60,8 +60,8 @@ func TestResolve(t *testing.T) {
 	createTestFolder("../../test_files/resolution")
 
 	resolver := containersResolver.ContainersResolver{
-		ImagesExtractorInterface:       mockImagesExtractor,
-		SyftPackagesExtractorInterface: mockSyftPackagesExtractor,
+		ImagesExtractor:       mockImagesExtractor,
+		SyftPackagesExtractor: mockSyftPackagesExtractor,
 	}
 
 	sampleFileImages := types.FileImages{

Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,18 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type ContainersResolver struct {`
`11`		`- imagesExtractor.ImagesExtractorInterface`
`12`		`- syftPackagesExtractor.SyftPackagesExtractorInterface`
	`11`	`+ imagesExtractor.ImagesExtractor`
	`12`	`+ syftPackagesExtractor.SyftPackagesExtractor`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`func NewContainerResolver() ContainersResolver {`
`16`		`- ImagesExtractor := new(imagesExtractor.ImagesExtractor)`
`17`		`- SyftPackagesExtractor := new(syftPackagesExtractor.SyftPackagesExtractor)`
`18`		`-`
`19`	`16`	`return ContainersResolver{`
`20`		`- ImagesExtractorInterface: ImagesExtractor,`
`21`		`- SyftPackagesExtractorInterface: SyftPackagesExtractor,`
	`17`	`+ ImagesExtractor: imagesExtractor.NewImagesExtractor(),`
	`18`	`+ SyftPackagesExtractor: syftPackagesExtractor.NewSyftPackagesExtractor(),`
`22`	`19`	`}`
`23`	`20`	`}`
`24`	`21`
`25`		`-func (cr ContainersResolver) Resolve(scanPath string, resolutionFolderPath string, images []string, isDebug bool) error {`
	`22`	`+func (cr *ContainersResolver) Resolve(scanPath string, resolutionFolderPath string, images []string, isDebug bool) error {`
`26`	`23`
`27`	`24`	`log.Debug().Msgf("Resolve func parameters: scanPath=%s, resolutionFolderPath=%s, images=%s, isDebug=%t", scanPath, resolutionFolderPath, images, isDebug)`
`28`	`25`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ func TestResolve(t *testing.T) {`
`60`	`60`	`createTestFolder("../../test_files/resolution")`
`61`	`61`
`62`	`62`	`resolver := containersResolver.ContainersResolver{`
`63`		`- ImagesExtractorInterface: mockImagesExtractor,`
`64`		`- SyftPackagesExtractorInterface: mockSyftPackagesExtractor,`
	`63`	`+ ImagesExtractor: mockImagesExtractor,`
	`64`	`+ SyftPackagesExtractor: mockSyftPackagesExtractor,`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`sampleFileImages := types.FileImages{`