Skip to content

Commit c8d895b

Browse files
cx-margarita-levitmcx-margarita-levitm
authored
Merge branch 'main' into bug/AST-127206-NeedToDelete
2 parents de6c4f3 + a4bf451 commit c8d895b

45 files changed

Lines changed: 3444 additions & 271 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ jobs:
8080
AZURE_PROJECT: ${{ secrets.AZURE_PROJECT }}
8181
AZURE_REPOS: ${{ secrets.AZURE_REPOS }}
8282
AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
83-
AZURE_NEW_ORG: ${{ secrets.AZURE_NEW_ORG }}
84-
AZURE_PROJECT_NAME: ${{ secrets.AZURE_PROJECT_NAME }}
8583
AZURE_PR_NUMBER: 1
86-
AZURE_NEW_TOKEN: ${{ secrets.AZURE_NEW_TOKEN }}
8784
BITBUCKET_WORKSPACE: ${{ secrets.BITBUCKET_WORKSPACE }}
8885
BITBUCKET_REPOS: ${{ secrets.BITBUCKET_REPOS }}
8986
BITBUCKET_USERNAME: ${{ secrets.BITBUCKET_USERNAME }}

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This project includes third-party software licensed under the BSD 3-Clause License.
2+
See `licenses/github.com_alexbrainman_sspi_LICENSE` for full text.

‎cmd/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func main() {
3737
results := viper.GetString(params.ResultsPathKey)
3838
scanSummary := viper.GetString(params.ScanSummaryPathKey)
3939
risksOverview := viper.GetString(params.RisksOverviewPathKey)
40+
apiSecurityResult := viper.GetString(params.APISecurityResultPathKey)
4041
riskManagement := viper.GetString(params.RiskManagementPathKey)
4142
scsScanOverview := viper.GetString(params.ScsScanOverviewPathKey)
4243
uploads := viper.GetString(params.UploadsPathKey)
@@ -69,7 +70,7 @@ func main() {
6970
uploadsWrapper := wrappers.NewUploadsHTTPWrapper(uploads)
7071
projectsWrapper := wrappers.NewHTTPProjectsWrapper(projects)
7172
applicationsWrapper := wrappers.NewApplicationsHTTPWrapper(applications)
72-
risksOverviewWrapper := wrappers.NewHTTPRisksOverviewWrapper(risksOverview)
73+
risksOverviewWrapper := wrappers.NewHTTPRisksOverviewWrapper(risksOverview, apiSecurityResult)
7374
riskManagementWrapper := wrappers.NewHTTPRiskManagementWrapper(riskManagement)
7475
scsScanOverviewWrapper := wrappers.NewHTTPScanOverviewWrapper(scsScanOverview)
7576
resultsWrapper := wrappers.NewHTTPResultsWrapper(results, scanSummary)

‎go.mod‎

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/checkmarx/ast-cli
33
go 1.24.11
44

55
require (
6-
github.com/Checkmarx/containers-resolver v1.0.28
6+
github.com/Checkmarx/containers-resolver v1.0.30
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
@@ -30,14 +30,31 @@ require (
3030
golang.org/x/crypto v0.45.0
3131
golang.org/x/sync v0.18.0
3232
golang.org/x/text v0.31.0
33-
google.golang.org/grpc v1.72.2
34-
google.golang.org/protobuf v1.36.6
33+
google.golang.org/grpc v1.75.0
34+
google.golang.org/protobuf v1.36.10
3535
gopkg.in/yaml.v3 v3.0.1
3636
gotest.tools v2.2.0+incompatible
3737
)
3838

3939
require (
4040
cyphar.com/go-pathrs v0.2.1 // indirect
41+
github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect
42+
github.com/cilium/ebpf v0.16.0 // indirect
43+
github.com/containerd/console v1.0.5 // indirect
44+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
45+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
46+
github.com/godbus/dbus/v5 v5.1.0 // indirect
47+
github.com/mrunalp/fileutils v0.5.1 // indirect
48+
github.com/onsi/ginkgo/v2 v2.25.1 // indirect
49+
github.com/onsi/gomega v1.38.1 // indirect
50+
github.com/opencontainers/runc v1.2.8 // indirect
51+
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
52+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
53+
github.com/urfave/cli v1.22.16 // indirect
54+
github.com/vishvananda/netlink v1.3.1-0.20250303224720-0e7078ed04c8 // indirect
55+
github.com/vishvananda/netns v0.0.5 // indirect
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
57+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
4158
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
4259
)
4360

@@ -102,16 +119,16 @@ require (
102119
github.com/containerd/fifo v1.1.0 // indirect
103120
github.com/containerd/log v0.1.0 // indirect
104121
github.com/containerd/platforms v1.0.0-rc.1 // indirect
105-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
122+
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
106123
github.com/containerd/ttrpc v1.2.7 // indirect
107124
github.com/containerd/typeurl/v2 v2.2.3 // indirect
108125
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
109126
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
110127
github.com/deitch/magic v0.0.0-20240306090643-c67ab88f10cb // indirect
111128
github.com/distribution/reference v0.6.0 // indirect
112-
github.com/docker/cli v28.0.3+incompatible // indirect
129+
github.com/docker/cli v29.0.3+incompatible // indirect
113130
github.com/docker/distribution v2.8.3+incompatible // indirect
114-
github.com/docker/docker v28.0.3+incompatible // indirect
131+
github.com/docker/docker v28.5.2+incompatible // indirect
115132
github.com/docker/docker-credential-helpers v0.9.3 // indirect
116133
github.com/docker/go-connections v0.5.0 // indirect
117134
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
@@ -139,7 +156,7 @@ require (
139156
github.com/go-git/go-billy/v5 v5.6.2 // indirect
140157
github.com/go-git/go-git/v5 v5.14.0 // indirect
141158
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
142-
github.com/go-logr/logr v1.4.2 // indirect
159+
github.com/go-logr/logr v1.4.3 // indirect
143160
github.com/go-logr/stdr v1.2.2 // indirect
144161
github.com/go-ole/go-ole v1.2.6 // indirect
145162
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -154,9 +171,9 @@ require (
154171
github.com/google/btree v1.1.3 // indirect
155172
github.com/google/gnostic-models v0.7.0 // indirect
156173
github.com/google/go-cmp v0.7.0 // indirect
157-
github.com/google/go-containerregistry v0.20.3 // indirect
174+
github.com/google/go-containerregistry v0.20.7 // indirect
158175
github.com/google/licensecheck v0.3.1 // indirect
159-
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
176+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
160177
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
161178
github.com/gosuri/uitable v0.0.4 // indirect
162179
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -180,7 +197,7 @@ require (
180197
github.com/json-iterator/go v1.1.12 // indirect
181198
github.com/kastenhq/goversion v0.0.0-20230811215019-93b2f8823953 // indirect
182199
github.com/kevinburke/ssh_config v1.2.0 // indirect
183-
github.com/klauspost/compress v1.18.0 // indirect
200+
github.com/klauspost/compress v1.18.1 // indirect
184201
github.com/klauspost/pgzip v1.2.6 // indirect
185202
github.com/knqyf263/go-rpmdb v0.1.1 // indirect
186203
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
@@ -221,10 +238,10 @@ require (
221238
github.com/opencontainers/go-digest v1.0.0 // indirect
222239
github.com/opencontainers/image-spec v1.1.1 // indirect
223240
github.com/opencontainers/runtime-spec v1.2.1 // indirect
224-
github.com/opencontainers/selinux v1.13.0 // indirect
241+
github.com/opencontainers/selinux v1.13.1 // indirect
225242
github.com/pborman/indent v1.2.1 // indirect
226243
github.com/pelletier/go-toml v1.9.5 // indirect
227-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
244+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
228245
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
229246
github.com/pierrec/lz4/v4 v4.1.22 // indirect
230247
github.com/pjbgf/sha1cd v0.3.2 // indirect
@@ -261,7 +278,7 @@ require (
261278
github.com/therootcompany/xz v1.0.1 // indirect
262279
github.com/ulikunitz/xz v0.5.15 // indirect
263280
github.com/vbatts/go-mtree v0.5.4 // indirect
264-
github.com/vbatts/tar-split v0.12.1 // indirect
281+
github.com/vbatts/tar-split v0.12.2 // indirect
265282
github.com/vifraa/gopom v1.0.0 // indirect
266283
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
267284
github.com/wagoodman/go-progress v0.0.0-20230925121702-07e42b3cdba0 // indirect
@@ -277,30 +294,30 @@ require (
277294
github.com/zricethezav/gitleaks/v8 v8.18.2 // indirect
278295
go.opencensus.io v0.24.0 // indirect
279296
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
280-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
281-
go.opentelemetry.io/otel v1.35.0 // indirect
282-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
283-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
297+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
298+
go.opentelemetry.io/otel v1.37.0 // indirect
299+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
300+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
284301
go.uber.org/mock v0.5.2 // indirect
285302
go.uber.org/multierr v1.11.0 // indirect
286-
go.yaml.in/yaml/v2 v2.4.2 // indirect
303+
go.yaml.in/yaml/v2 v2.4.3 // indirect
287304
go.yaml.in/yaml/v3 v3.0.4 // indirect
288305
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
289-
golang.org/x/mod v0.29.0 // indirect
306+
golang.org/x/mod v0.30.0 // indirect
290307
golang.org/x/net v0.47.0 // indirect
291-
golang.org/x/oauth2 v0.30.0 // indirect
308+
golang.org/x/oauth2 v0.33.0 // indirect
292309
golang.org/x/sys v0.38.0 // indirect
293310
golang.org/x/term v0.37.0 // indirect
294311
golang.org/x/time v0.12.0 // indirect
295-
golang.org/x/tools v0.38.0 // indirect
312+
golang.org/x/tools v0.39.0 // indirect
296313
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
297314
google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect
298-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
299-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
315+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
316+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
300317
gopkg.in/inf.v0 v0.9.1 // indirect
301318
gopkg.in/warnings.v0 v0.1.2 // indirect
302319
gopkg.in/yaml.v2 v2.4.0 // indirect
303-
helm.sh/helm/v3 v3.19.2 // indirect
320+
helm.sh/helm/v3 v3.19.3 // indirect
304321
k8s.io/api v0.34.0 // indirect
305322
k8s.io/apiextensions-apiserver v0.34.0 // indirect
306323
k8s.io/apimachinery v0.34.0 // indirect
@@ -309,15 +326,15 @@ require (
309326
k8s.io/client-go v0.34.0 // indirect
310327
k8s.io/component-base v0.34.0 // indirect
311328
k8s.io/klog/v2 v2.130.1 // indirect
312-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
329+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
313330
k8s.io/kubectl v0.34.0 // indirect
314-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
331+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
315332
modernc.org/libc v1.66.3 // indirect
316333
modernc.org/mathutil v1.7.1 // indirect
317334
modernc.org/memory v1.11.0 // indirect
318335
modernc.org/sqlite v1.38.2 // indirect
319336
oras.land/oras-go/v2 v2.6.0 // indirect
320-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
337+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
321338
sigs.k8s.io/kustomize/api v0.20.1 // indirect
322339
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
323340
sigs.k8s.io/randfill v1.0.0 // indirect

0 commit comments

Comments
 (0)