diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5618d14..3930d99 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -121,10 +121,10 @@ jobs: - name: Fail on CRITICAL/HIGH vulnerabilities run: | - COUNT=$(jq '[.runs[].results[]] | length' trivy-results.sarif) + COUNT=$(jq '[.runs[].results[] | select(.level == "error")] | length' trivy-results.sarif) if [ "$COUNT" -gt 0 ]; then echo "::error::Found $COUNT CRITICAL/HIGH fixable vulnerabilities:" - jq -r '.runs[].results[] | "\(.ruleId): \(.message.text | split("\n") | .[0])"' trivy-results.sarif + jq -r '.runs[].results[] | select(.level == "error") | "\(.ruleId): \(.message.text | split("\n") | .[0])"' trivy-results.sarif exit 1 fi diff --git a/agent/go.mod b/agent/go.mod index f62468d..4ddd335 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon -go 1.26.4 +go 1.26.5 require ( github.com/google/uuid v1.6.0 @@ -30,9 +30,9 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.uber.org/dig v1.18.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sys v0.46.0 // indirect + golang.org/x/text v0.39.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/agent/go.sum b/agent/go.sum index 0a3a751..273948a 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -80,14 +80,20 @@ golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= +golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww= diff --git a/agent/test/relay/Dockerfile.snyk-broker-server b/agent/test/relay/Dockerfile.snyk-broker-server index cc51140..23e2bdd 100644 --- a/agent/test/relay/Dockerfile.snyk-broker-server +++ b/agent/test/relay/Dockerfile.snyk-broker-server @@ -6,7 +6,7 @@ ARG SNYK_BROKER_VERSION=v1.0.6-axon RUN apt update && apt install -y git wget && \ wget -q -O - https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \ apt install -y nodejs && \ - npm install --global npm@latest typescript@4.9.3 + npm install --global npm@11.18.0 typescript@4.9.3 RUN git clone https://github.com/cortexapps/snyk-broker.git /tmp/snyk-broker && \ cd /tmp/snyk-broker && \ diff --git a/docker/Dockerfile b/docker/Dockerfile index 743b860..5bb179a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stable-slim AS builder RUN apt-get update && apt-get upgrade -y && apt-get install -y protobuf-compiler git wget build-essential -ENV GOLANG_VERSION=1.26.4 +ENV GOLANG_VERSION=1.26.5 RUN wget -q "https://dl.google.com/go/go${GOLANG_VERSION}.linux-$(dpkg --print-architecture).tar.gz" -O /tmp/go.tar.gz \ && tar -C /usr/local -xzf /tmp/go.tar.gz \ && rm /tmp/go.tar.gz @@ -27,7 +27,7 @@ WORKDIR /agent # when the scheduled Trivy scan flags OS-package CVEs whose fixes are already # in the archive — the cache is just serving a stale layer. Leaves the rest of # the build (Go, npm, snyk-broker clone) hitting cache as normal. -ARG APT_CACHE_BUST=2026-07-07 +ARG APT_CACHE_BUST=2026-07-14 RUN echo "apt cache bust: $APT_CACHE_BUST" \ && apt-get update && apt-get upgrade -y && apt-get install -y \ protobuf-compiler git python3 python3-venv wget build-essential openssl jq @@ -37,7 +37,7 @@ ENV NODE_VERSION=20 ARG SNYK_BROKER_VERSION=v1.0.16-axon RUN wget -q -O - https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && apt-get install -y nodejs -RUN npm install --global npm@latest typescript@4.9.3 +RUN npm install --global npm@11.18.0 typescript@4.9.3 RUN git clone https://github.com/cortexapps/snyk-broker.git /tmp/snyk-broker && \ cd /tmp/snyk-broker && \ git checkout ${SNYK_BROKER_VERSION} && \ @@ -52,7 +52,7 @@ RUN git clone https://github.com/cortexapps/snyk-broker.git /tmp/snyk-broker && ENV PATH="/usr/local/lib/node_modules/.bin:${PATH}" # Install Go (needed by scaffold apps that build on top of this image) -ENV GOLANG_VERSION=1.26.4 +ENV GOLANG_VERSION=1.26.5 RUN wget -q "https://dl.google.com/go/go${GOLANG_VERSION}.linux-$(dpkg --print-architecture).tar.gz" -O /tmp/go.tar.gz \ && tar -C /usr/local -xzf /tmp/go.tar.gz \ && rm /tmp/go.tar.gz diff --git a/scaffold/go/go.mod b/scaffold/go/go.mod index 3f74d64..a1d96e3 100644 --- a/scaffold/go/go.mod +++ b/scaffold/go/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon_apps/{{.ProjectName}} -go 1.26.4 +go 1.26.5 require ( github.com/google/uuid v1.6.0 diff --git a/sdks/go/go.mod b/sdks/go/go.mod index 27a66b7..fff9e2f 100644 --- a/sdks/go/go.mod +++ b/sdks/go/go.mod @@ -1,6 +1,6 @@ module github.com/cortexapps/axon-go -go 1.26.4 +go 1.26.5 require ( github.com/google/uuid v1.6.0