Skip to content
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

test branch #983

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

test branch #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9c8ceb0
test branch
Korjen97 Dec 24, 2024
29d183f
Merge branch 'main' into Korjen97-patch-3
AlvoBen Jan 23, 2025
ca8146e
Update ci.yml
AlvoBen Jan 23, 2025
8bcd5e0
Update scan.go
AlvoBen Jan 23, 2025
fb4f063
Update scan.go
AlvoBen Jan 23, 2025
8fc8e6a
Update ci.yml
AlvoBen Jan 23, 2025
2452fa6
Update ci.yml
AlvoBen Jan 23, 2025
914f4ef
Update ci.yml
AlvoBen Jan 23, 2025
79d279c
Update ci.yml
AlvoBen Jan 23, 2025
29161db
fix
BenAlvo1 Jan 23, 2025
51b3634
fix
BenAlvo1 Jan 23, 2025
27da0fb
fix
BenAlvo1 Jan 23, 2025
7197057
fix
BenAlvo1 Jan 23, 2025
08a0ad4
fix
BenAlvo1 Jan 23, 2025
d7b1fc1
fix1
BenAlvo1 Jan 23, 2025
cd006eb
check docker rootfull
BenAlvo1 Jan 26, 2025
03d597b
check docker rootfull
BenAlvo1 Jan 26, 2025
52a8ec3
check
BenAlvo1 Jan 26, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- run: go version
- name: go test with coverage
run: |
docker info
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal of grep "rootless" may cause the output to be more verbose than necessary. Consider keeping the grep command if the intention is to check for a specific feature or configuration of Docker.

sudo chmod +x ./internal/commands/.scripts/up.sh
./internal/commands/.scripts/up.sh
- name: Check if total coverage is greater then 79.9
Expand Down Expand Up @@ -175,7 +176,7 @@ jobs:
env:
TRIVY_SKIP_DB_UPDATE: true
TRIVY_SKIP_JAVA_DB_UPDATE: true

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like there is an unnecessary change from a tab to a space on this line. Please revert it if it does not serve a specific purpose.

- name: Inspect action report
if: always()
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

</div>

<!-- PROJECT LOGO -->
<!-- PROJECT LOGO -->
<br />
<p align="center">
<a href="">
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/checkmarx/ast-cli

go 1.23.3
go 1.23.5
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The go version is updated from 1.23.3 to 1.23.5. Please ensure that this minor version bump does not introduce any compatibility issues with the project dependencies and that all tests pass with the new version.


require (
github.com/Checkmarx/containers-resolver v1.0.4
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const (
containerVolumeFlag = "-v"
containerNameFlag = "--name"
containerRemove = "--rm"
containerImage = "checkmarx/kics:latest"
containerImage = "checkmarx/kics:v2.1.3"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The container image tag has been changed to include a v prefix. Ensure that the tag v2.1.3 exists in the container registry and is the correct version intended for use. If this is a new tagging convention, update any documentation or scripts that reference the old tag format to prevent confusion.

containerScan = "scan"
containerScanPathFlag = "-p"
containerScanPath = "/path"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/util/remediation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
filesContainerVolume = ":/files"
resultsContainerLocation = "/kics/"
containerRemove = "--rm"
containerImage = "checkmarx/kics:latest"
containerImage = "checkmarx/kics:v2.1.3"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not recommended to hardcode the version of the container image (checkmarx/kics:v2.1.3). Instead, consider using a configuration file or an environment variable to make it easier to update the version in the future without changing the code.

containerNameFlag = "--name"
remediateCommand = "remediate"
resultsFlag = "--results"
Expand Down
Loading