Use a new containers-resolver (AST-74985)

Checkmarx · Dec 9, 2024 · e650ca0 · e650ca0
1 parent 790eb4f
commit e650ca0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -3,9 +3,7 @@ module github.com/checkmarx/ast-cli
 go 1.23.3
 
 require (
-	github.com/Checkmarx/containers-images-extractor v1.0.2
-	github.com/Checkmarx/containers-resolver v1.0.2
-	github.com/Checkmarx/containers-syft-packages-extractor v1.0.2
+	github.com/Checkmarx/containers-resolver v1.0.3
 	github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63
 	github.com/Checkmarx/gen-ai-wrapper v1.0.2
 	github.com/MakeNowJust/heredoc v1.0.0
@@ -39,6 +37,8 @@ require (
 	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20240914100643-eb91380d8434 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/Checkmarx/containers-images-extractor v1.0.2 // indirect
+	github.com/Checkmarx/containers-syft-packages-extractor v1.0.2 // indirect
 	github.com/Checkmarx/containers-types v1.0.0 // indirect
 	github.com/CycloneDX/cyclonedx-go v0.9.1 // indirect
 	github.com/DataDog/zstd v1.5.6 // indirect

diff --git a/go.sum b/go.sum
@@ -62,12 +62,6 @@ 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-resolver v1.0.2 h1:U4rmjnCh9s05K2xu5OoGUBrKMXqAboqDNDxp1NCFT/Y=
-github.com/Checkmarx/containers-resolver v1.0.2/go.mod h1:DHBdNIo7CwO/GFdCzo387ojO/BBaxgwX5/hprGeK5ss=
-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-types v1.0.0 h1:H3bAbFnb4GqrAuYww63Ts1S3XmiLt+m8aqLuL/D9pz8=
 github.com/Checkmarx/containers-types v1.0.0/go.mod h1:yp956K0amnEYogUnVOjuVTe1euNr/0qkgB+NhaqW4M8=
 github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63 h1:SCuTcE+CFvgjbIxUNL8rsdB2sAhfuNx85HvxImKta3g=

diff --git a/internal/wrappers/container-resolver.go b/internal/wrappers/container-resolver.go
@@ -7,7 +7,7 @@ type ContainerResolverWrapper interface {
 }
 
 type ContainerResolverImpl struct {
-	containersResolver.ContainersResolver
+	resolver containersResolver.ContainersResolver
 }
 
 func NewContainerResolverWrapper() ContainerResolverWrapper {
@@ -17,5 +17,5 @@ func NewContainerResolverWrapper() ContainerResolverWrapper {
 }
 
 func (c *ContainerResolverImpl) Resolve(scanPath, resolutionFilePath string, images []string, isDebug bool) error {
-	return c.Resolve(scanPath, resolutionFilePath, images, isDebug)
+	return c.resolver.Resolve(scanPath, resolutionFilePath, images, isDebug)
 }