Skip to content

Commit 49ea749

Browse files
cx-anurag-dalkecx-anurag-dalke
authored
Merge branch 'main' into feat/enqueue-retry-policy
2 parents 56bf28a + 7b8caf9 commit 49ea749

File tree

24 files changed

+1540
-159
lines changed

24 files changed

+1540
-159
lines changed

‎.github/workflows/ci-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ jobs:
8080
AZURE_PROJECT: ${{ secrets.AZURE_PROJECT }}
8181
AZURE_REPOS: ${{ secrets.AZURE_REPOS }}
8282
AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
83-
AZURE_NEW_ORG: "azureAccountTests"
84-
AZURE_PROJECT_NAME: "testsProject"
83+
AZURE_NEW_ORG: ${{ secrets.AZURE_NEW_ORG }}
84+
AZURE_PROJECT_NAME: ${{ secrets.AZURE_PROJECT_NAME }}
8585
AZURE_PR_NUMBER: 1
8686
AZURE_NEW_TOKEN: ${{ secrets.AZURE_NEW_TOKEN }}
8787
BITBUCKET_WORKSPACE: ${{ secrets.BITBUCKET_WORKSPACE }}

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
echo "arch=$(uname -m)" >> $GITHUB_OUTPUT
7373
- name: Setup Docker on macOS
7474
if: inputs.dev == false
75-
uses: douglascamata/setup-docker-macos-action@v1.0.1
75+
uses: douglascamata/setup-docker-macos-action@5643cfd7e434881308f89f2f3ae8852da11df909
7676
- name: Test docker
7777
if: inputs.dev == false
7878
run: |
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Install Cosign
8989
if: inputs.dev == false
90-
uses: sigstore/[email protected]
90+
uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 #v3.2.0
9191

9292
- name: Configure AWS Credentials
9393
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 #v2

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<h3 align="center">Checkmarx One CLI</h3>
2323

2424
<p align="center">
25-
Checkmarx CLI is a standalone Checkmarx tool.
25+
Checkmarx CLI is a standalone Checkmarx tool.
2626
<br />
2727
<a href="https://checkmarx.com/resource/documents/en/34965-68620-checkmarx-one-cli-tool.html"><strong>Explore the docs »</strong></a>
2828
<br />

‎go.mod‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/checkmarx/ast-cli
22

3-
go 1.24.6
3+
go 1.24.11
44

55
require (
6-
github.com/Checkmarx/containers-resolver v1.0.24
6+
github.com/Checkmarx/containers-resolver v1.0.28
77
github.com/Checkmarx/containers-types v1.0.9
88
github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63
99
github.com/Checkmarx/gen-ai-wrapper v1.0.3
@@ -22,34 +22,39 @@ require (
2222
github.com/jsumners/go-getport v1.0.0
2323
github.com/mssola/user_agent v0.6.0
2424
github.com/pkg/errors v0.9.1
25-
github.com/spf13/cobra v1.9.1
25+
github.com/spf13/cobra v1.10.1
2626
github.com/spf13/viper v1.20.1
27-
github.com/stretchr/testify v1.10.0
27+
github.com/stretchr/testify v1.11.1
2828
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
2929
github.com/xeipuuv/gojsonschema v1.2.0
30-
golang.org/x/crypto v0.40.0
31-
golang.org/x/sync v0.16.0
32-
golang.org/x/text v0.27.0
30+
golang.org/x/crypto v0.45.0
31+
golang.org/x/sync v0.18.0
32+
golang.org/x/text v0.31.0
3333
google.golang.org/grpc v1.72.2
3434
google.golang.org/protobuf v1.36.6
3535
gopkg.in/yaml.v3 v3.0.1
3636
gotest.tools v2.2.0+incompatible
3737
)
3838

39+
require (
40+
cyphar.com/go-pathrs v0.2.1 // indirect
41+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
42+
)
43+
3944
require (
4045
dario.cat/mergo v1.0.1 // indirect
4146
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
4247
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20240914100643-eb91380d8434 // indirect
4348
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4449
github.com/BobuSumisu/aho-corasick v1.0.3 // indirect
4550
github.com/BurntSushi/toml v1.5.0 // indirect
46-
github.com/Checkmarx/containers-images-extractor v1.0.18
47-
github.com/Checkmarx/containers-syft-packages-extractor v1.0.20 // indirect
51+
github.com/Checkmarx/containers-images-extractor v1.0.21
52+
github.com/Checkmarx/containers-syft-packages-extractor v1.0.23 // indirect
4853
github.com/CycloneDX/cyclonedx-go v0.9.2 // indirect
4954
github.com/DataDog/zstd v1.5.6 // indirect
5055
github.com/Masterminds/goutils v1.1.1 // indirect
5156
github.com/Masterminds/semver v1.5.0 // indirect
52-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
57+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
5358
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5459
github.com/Masterminds/squirrel v1.5.4 // indirect
5560
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -89,7 +94,7 @@ require (
8994
github.com/charmbracelet/x/term v0.2.1 // indirect
9095
github.com/cloudflare/circl v1.6.1 // indirect
9196
github.com/containerd/cgroups/v3 v3.0.5 // indirect
92-
github.com/containerd/containerd v1.7.28 // indirect
97+
github.com/containerd/containerd v1.7.29 // indirect
9398
github.com/containerd/containerd/api v1.9.0 // indirect
9499
github.com/containerd/continuity v0.4.5 // indirect
95100
github.com/containerd/errdefs v1.0.0 // indirect
@@ -100,7 +105,7 @@ require (
100105
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
101106
github.com/containerd/ttrpc v1.2.7 // indirect
102107
github.com/containerd/typeurl/v2 v2.2.3 // indirect
103-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
108+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
104109
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
105110
github.com/deitch/magic v0.0.0-20240306090643-c67ab88f10cb // indirect
106111
github.com/distribution/reference v0.6.0 // indirect
@@ -124,8 +129,8 @@ require (
124129
github.com/fatih/semgroup v1.2.0 // indirect
125130
github.com/felixge/fgprof v0.9.5 // indirect
126131
github.com/felixge/httpsnoop v1.0.4 // indirect
127-
github.com/fsnotify/fsnotify v1.8.0 // indirect
128-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
132+
github.com/fsnotify/fsnotify v1.9.0 // indirect
133+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
129134
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
130135
github.com/github/go-spdx/v2 v2.3.2 // indirect
131136
github.com/gitleaks/go-gitdiff v0.9.1 // indirect
@@ -147,12 +152,11 @@ require (
147152
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
148153
github.com/golang/snappy v1.0.0 // indirect
149154
github.com/google/btree v1.1.3 // indirect
150-
github.com/google/gnostic-models v0.6.9 // indirect
155+
github.com/google/gnostic-models v0.7.0 // indirect
151156
github.com/google/go-cmp v0.7.0 // indirect
152157
github.com/google/go-containerregistry v0.20.3 // indirect
153158
github.com/google/licensecheck v0.3.1 // indirect
154159
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
155-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
156160
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
157161
github.com/gosuri/uitable v0.0.4 // indirect
158162
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -206,7 +210,7 @@ require (
206210
github.com/moby/sys/userns v0.1.0 // indirect
207211
github.com/moby/term v0.5.2 // indirect
208212
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
209-
github.com/modern-go/reflect2 v1.0.2 // indirect
213+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
210214
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
211215
github.com/muesli/termenv v0.16.0 // indirect
212216
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -217,7 +221,7 @@ require (
217221
github.com/opencontainers/go-digest v1.0.0 // indirect
218222
github.com/opencontainers/image-spec v1.1.1 // indirect
219223
github.com/opencontainers/runtime-spec v1.2.1 // indirect
220-
github.com/opencontainers/selinux v1.12.0 // indirect
224+
github.com/opencontainers/selinux v1.13.0 // indirect
221225
github.com/pborman/indent v1.2.1 // indirect
222226
github.com/pelletier/go-toml v1.9.5 // indirect
223227
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -250,7 +254,7 @@ require (
250254
github.com/spdx/tools-golang v0.5.5 // indirect
251255
github.com/spf13/afero v1.14.0 // indirect
252256
github.com/spf13/cast v1.7.1 // indirect
253-
github.com/spf13/pflag v1.0.7 // indirect
257+
github.com/spf13/pflag v1.0.10 // indirect
254258
github.com/subosito/gotenv v1.6.0 // indirect
255259
github.com/sylabs/sif/v2 v2.21.1 // indirect
256260
github.com/sylabs/squashfs v1.0.6 // indirect
@@ -280,45 +284,46 @@ require (
280284
go.uber.org/mock v0.5.2 // indirect
281285
go.uber.org/multierr v1.11.0 // indirect
282286
go.yaml.in/yaml/v2 v2.4.2 // indirect
283-
go.yaml.in/yaml/v3 v3.0.3 // indirect
287+
go.yaml.in/yaml/v3 v3.0.4 // indirect
284288
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
285-
golang.org/x/mod v0.26.0 // indirect
286-
golang.org/x/net v0.42.0 // indirect
289+
golang.org/x/mod v0.29.0 // indirect
290+
golang.org/x/net v0.47.0 // indirect
287291
golang.org/x/oauth2 v0.30.0 // indirect
288-
golang.org/x/sys v0.34.0 // indirect
289-
golang.org/x/term v0.33.0 // indirect
292+
golang.org/x/sys v0.38.0 // indirect
293+
golang.org/x/term v0.37.0 // indirect
290294
golang.org/x/time v0.12.0 // indirect
291-
golang.org/x/tools v0.34.0 // indirect
295+
golang.org/x/tools v0.38.0 // indirect
292296
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
293297
google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect
294298
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
295299
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
296300
gopkg.in/inf.v0 v0.9.1 // indirect
297301
gopkg.in/warnings.v0 v0.1.2 // indirect
298302
gopkg.in/yaml.v2 v2.4.0 // indirect
299-
helm.sh/helm/v3 v3.18.5 // indirect
300-
k8s.io/api v0.33.3 // indirect
301-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
302-
k8s.io/apimachinery v0.33.3 // indirect
303-
k8s.io/apiserver v0.33.3 // indirect
304-
k8s.io/cli-runtime v0.33.3 // indirect
305-
k8s.io/client-go v0.33.3 // indirect
306-
k8s.io/component-base v0.33.3 // indirect
303+
helm.sh/helm/v3 v3.19.2 // indirect
304+
k8s.io/api v0.34.0 // indirect
305+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
306+
k8s.io/apimachinery v0.34.0 // indirect
307+
k8s.io/apiserver v0.34.0 // indirect
308+
k8s.io/cli-runtime v0.34.0 // indirect
309+
k8s.io/client-go v0.34.0 // indirect
310+
k8s.io/component-base v0.34.0 // indirect
307311
k8s.io/klog/v2 v2.130.1 // indirect
308-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
309-
k8s.io/kubectl v0.33.3 // indirect
310-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
312+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
313+
k8s.io/kubectl v0.34.0 // indirect
314+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
311315
modernc.org/libc v1.66.3 // indirect
312316
modernc.org/mathutil v1.7.1 // indirect
313317
modernc.org/memory v1.11.0 // indirect
314318
modernc.org/sqlite v1.38.2 // indirect
315319
oras.land/oras-go/v2 v2.6.0 // indirect
316320
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
317-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
318-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
321+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
322+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
319323
sigs.k8s.io/randfill v1.0.0 // indirect
320-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
321-
sigs.k8s.io/yaml v1.5.0 // indirect
324+
sigs.k8s.io/yaml v1.6.0 // indirect
322325
)
323326

324-
replace github.com/containerd/containerd => github.com/containerd/containerd v1.7.27
327+
replace github.com/containerd/containerd => github.com/containerd/containerd v1.7.29
328+
329+
replace github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.13.0

0 commit comments

Comments
 (0)