From 83a253cfb11213d18dd71c6970e1a2a22c89332b Mon Sep 17 00:00:00 2001 From: "renovate-sh-app[bot]" <219655108+renovate-sh-app[bot]@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:32:25 +0000 Subject: [PATCH] fix(deps): update all patch and digest versions | datasource | package | from | to | | ----------- | ------------------------------------------- | ------- | ------------- | | github-tags | actions/checkout | v5.0.0 | v5.0.1 | | github-tags | actions/checkout | v4.3.0 | v4.3.1 | | github-tags | actions/upload-release-asset | v1.0.0 | v1.0.2 | | crate | actix-files | 0.6.6 | 0.6.9 | | crate | async-stream | 0.3.5 | 0.3.6 | | github-tags | azure/setup-helm | v4.3.0 | v4.3.1 | | docker | eclipse-temurin | 17-jre | 17.0.16_8-jre | | npm | express | 5.2.0 | 5.2.1 | | npm | express | 4.22.0 | 4.22.1 | | go | github.com/grafana/pyroscope-go/godeltaprof | v0.1.8 | v0.1.9 | | go | github.com/segmentio/kafka-go | v0.4.47 | v0.4.49 | | go | go.mongodb.org/mongo-driver | v1.17.4 | v1.17.6 | | go | go.uber.org/zap | v1.27.0 | v1.27.1 | | docker | golang | 1.25.3 | 1.25.4 | | docker | golang | 1.25.3 | 1.25.5 | | go | k8s.io/apimachinery | v0.34.1 | v0.34.3 | | go | k8s.io/client-go | v0.34.1 | v0.34.2 | | crate | log | 0.4.22 | 0.4.29 | | maven | org.apache.maven.wrapper:maven-wrapper | 3.3.2 | 3.3.4 | | docker | mysql | 8.0.34 | 8.0.43 | | docker | opensearchproject/opensearch | 3.3.1 | 3.3.2 | | github-tags | peter-evans/create-pull-request | v5.0.0 | v5.0.3 | | crate | rouille | 3.6.1 | 3.6.2 | | crate | serde | 1.0.210 | 1.0.228 | | crate | serde_json | 1.0.128 | 1.0.145 | Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> --- .github/workflows/backport.yml | 2 +- .github/workflows/check-docs.yml | 2 +- .github/workflows/config-checker.yml | 2 +- .github/workflows/generate-binaries.yml | 2 +- .github/workflows/helm-release.yml | 2 +- .github/workflows/helm-test.yml | 10 +- .github/workflows/obi-drift-check.yml | 2 +- .../publish-technical-documentation-next.yml | 4 +- ...ublish-technical-documentation-release.yml | 2 +- .github/workflows/publish_dockerhub_main.yml | 6 +- .../publish_dockerhub_pre_release.yml | 6 +- .../workflows/publish_dockerhub_release.yml | 6 +- .../pull_request_integration_tests.yml | 4 +- .../pull_request_k8s_integration_tests.yml | 4 +- .github/workflows/pull_request_oats_test.yml | 4 +- .../pull_request_test_docker_build.yml | 4 +- .github/workflows/release-binaries-base.yml | 2 +- .github/workflows/release-notes.yml | 2 +- .github/workflows/update-make-docs.yml | 2 +- .github/workflows/update-offsets.yml | 2 +- .github/workflows/vale.yml | 6 +- .../workflow_integration_tests_vm.yml | 4 +- configs/offsets/kafkago/go.mod | 2 +- configs/offsets/kafkago/go.sum | 56 ++--------- debug.Dockerfile | 4 +- examples/greeting-apps/docker-compose.yaml | 18 ++-- examples/quickstart/nodejs/package-lock.json | 67 ++----------- go.mod | 8 +- .../test/cmd/python_pingserver/Dockerfile | 2 +- internal/test/cmd/ruby_pingserver/Dockerfile | 2 +- internal/test/cmd/rust_ironssl/Dockerfile | 2 +- internal/test/cmd/rust_pingiron/Dockerfile | 2 +- internal/test/cmd/rust_pingrouille/Cargo.lock | 74 ++------------ internal/test/cmd/rust_pingrouille/Dockerfile | 2 +- internal/test/cmd/rust_pingserver/Dockerfile | 2 +- .../components/beyla-k8s-cache/Dockerfile | 2 +- .../integration/components/beyla/Dockerfile | 4 +- .../components/beyla/Dockerfile_dbg | 2 +- .../components/elasticsearch/Dockerfile | 2 +- .../components/go_grpc_server_mux/Dockerfile | 4 +- .../go_grpc_server_mux/Dockerfile_tls | 4 +- .../integration/components/go_otel/Dockerfile | 4 +- .../components/go_otel_grpc/Dockerfile | 4 +- .../components/gohttp2/client/Dockerfile | 4 +- .../components/gohttp2/server/Dockerfile | 4 +- .../components/gokafka-seg/Dockerfile | 4 +- .../integration/components/gokafka-seg/go.mod | 2 +- .../integration/components/gokafka-seg/go.sum | 56 ++--------- .../integration/components/gokafka/Dockerfile | 4 +- .../integration/components/gomongo/Dockerfile | 4 +- .../integration/components/gomongo/go.mod | 2 +- .../integration/components/gomongo/go.sum | 4 +- .../components/gomongov2/Dockerfile | 4 +- .../integration/components/goredis/Dockerfile | 4 +- .../integration/components/gosql/Dockerfile | 4 +- .../components/grpcpinger/Dockerfile | 4 +- .../components/httppinger/Dockerfile | 4 +- .../.mvn/wrapper/maven-wrapper.properties | 18 +--- .../components/javakafka/Dockerfile | 2 +- .../components/javakafka/Dockerfile_400 | 2 +- .../integration/components/javakafka/mvnw | 50 ++++++++-- .../.mvn/wrapper/maven-wrapper.properties | 18 +--- .../components/javatestserver/Dockerfile | 2 +- .../components/javatestserver/Dockerfile_jar | 4 +- .../components/javatestserver/mvnw | 50 ++++++++-- .../integration/components/mysqldb/Dockerfile | 4 +- .../components/nodeclient/Dockerfile | 2 +- .../components/nodejsdist/package-lock.json | 6 +- .../components/nodejsserver/Dockerfile | 2 +- .../components/nodejsserver/Dockerfile_otel | 2 +- .../components/nodejsserver/package-lock.json | 36 +------ .../components/nodemultiproc/Dockerfile | 2 +- .../nodemultiproc/package-lock.json | 6 +- .../php/unix_sock_sql/docker/Dockerfile_mysql | 2 +- .../php/unix_sock_sql/docker/Dockerfile_nginx | 2 +- .../php/unix_sock_sql/docker/Dockerfile_php | 2 +- .../components/pingclient/Dockerfile | 4 +- .../components/postgresql/Dockerfile | 2 +- .../components/pythonawsclient/Dockerfile | 2 +- .../components/pythongraphql/Dockerfile | 2 +- .../components/pythongrpc/Dockerfile | 2 +- .../components/pythongrpc/Dockerfile_srv | 2 +- .../components/pythonkafka/Dockerfile | 2 +- .../components/pythonmongo/Dockerfile | 2 +- .../components/pythonredis/Dockerfile | 2 +- .../components/pythonsql/Dockerfile | 2 +- .../components/pythonsql/Dockerfile_mysql | 2 +- .../components/pythonsql/Dockerfile_ssl | 2 +- .../components/rustssltestserver/Cargo.lock | 97 +++++++++++++++---- .../components/rustssltestserver/Dockerfile | 4 +- .../components/rusttestserver/Cargo.lock | 97 +++++++++++++++---- .../components/rusttestserver/Dockerfile | 4 +- .../components/sqlclient/Dockerfile | 4 +- .../components/testserver/Dockerfile | 4 +- .../testserver/Dockerfile_duplicate | 4 +- .../components/testserver/Dockerfile_nodebug | 4 +- .../components/testserver/Dockerfile_rename1 | 4 +- .../components/testserver/Dockerfile_static | 4 +- .../docker-compose-elasticsearch.yml | 2 +- .../docker-compose-netolly-rdns.yml | 2 +- .../integration/docker-compose-php-fpm.yml | 4 +- .../test/integration/docker-compose-ruby.yml | 2 +- .../redis/docker-compose-beyla-go-redis.yml | 2 +- .../oats/redis/docker-compose-beyla-redis.yml | 2 +- k8scache.Dockerfile | 2 +- 105 files changed, 424 insertions(+), 507 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index ff33348fd4..fb9d05b97a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,7 @@ jobs: pull-requests: write steps: - name: Checkout Actions - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' repository: grafana/grafana-github-actions diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml index 4e565fbafc..a4d02d0246 100644 --- a/.github/workflows/check-docs.yml +++ b/.github/workflows/check-docs.yml @@ -17,7 +17,7 @@ jobs: check-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 diff --git a/.github/workflows/config-checker.yml b/.github/workflows/config-checker.yml index e597a6ab1e..a49460e867 100644 --- a/.github/workflows/config-checker.yml +++ b/.github/workflows/config-checker.yml @@ -17,7 +17,7 @@ jobs: contents: read steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - name: Set up Go diff --git a/.github/workflows/generate-binaries.yml b/.github/workflows/generate-binaries.yml index 6a136d0f01..7eff91c4d9 100644 --- a/.github/workflows/generate-binaries.yml +++ b/.github/workflows/generate-binaries.yml @@ -17,7 +17,7 @@ jobs: contents: write steps: - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: ref: ${{ github.event.release.tag_name || github.event.inputs.tag_name }} fetch-depth: 0 diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index d2d5906792..fb85754d76 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -4,7 +4,7 @@ on: jobs: release-beyla-helm-chart: - uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@64b1c8260d69a9b1d9a186df25c51358b92f7662 + uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@37c5e126b0a28eefd6c18331b88f8036233853d6 permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index d68fffd98c..74b560e60a 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' fetch-depth: 0 # required for chart-testing to work @@ -66,7 +66,7 @@ jobs: tests: ${{ steps.list_tests.outputs.tests }} steps: - name: Checkout code - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' @@ -91,20 +91,20 @@ jobs: fail-fast: false steps: - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: path: source persist-credentials: 'false' - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: path: helm-chart-toolbox repository: grafana/helm-chart-toolbox persist-credentials: 'false' - name: Set up Helm - uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0 + uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1 - name: Install Flux CLI uses: fluxcd/flux2/action@6bf37f6a560fd84982d67f853162e4b3c2235edb # v2.6.4 diff --git a/.github/workflows/obi-drift-check.yml b/.github/workflows/obi-drift-check.yml index 61281f2916..6511b96964 100644 --- a/.github/workflows/obi-drift-check.yml +++ b/.github/workflows/obi-drift-check.yml @@ -23,7 +23,7 @@ jobs: pull-requests: write # Needed for PR comments steps: - name: Checkout repo - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false submodules: true # Initialize submodules to get .obi-src content diff --git a/.github/workflows/publish-technical-documentation-next.yml b/.github/workflows/publish-technical-documentation-next.yml index 09493973e7..644bc47320 100644 --- a/.github/workflows/publish-technical-documentation-next.yml +++ b/.github/workflows/publish-technical-documentation-next.yml @@ -20,9 +20,9 @@ jobs: id-token: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false - - uses: grafana/writers-toolkit/publish-technical-documentation@39cdc38767184996e25d611923f8ce697e33bc70 # publish-technical-documentation/v1 + - uses: grafana/writers-toolkit/publish-technical-documentation@9aed4f7c5b3caa1b58d72ee39232333407d4acbf # publish-technical-documentation/v1 with: website_directory: content/docs/beyla/next diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml index f4074ed13d..3c49e2fb2e 100644 --- a/.github/workflows/publish-technical-documentation-release.yml +++ b/.github/workflows/publish-technical-documentation-release.yml @@ -22,7 +22,7 @@ jobs: id-token: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: fetch-depth: 0 persist-credentials: 'false' diff --git a/.github/workflows/publish_dockerhub_main.yml b/.github/workflows/publish_dockerhub_main.yml index daa5c8ad34..66c4895406 100644 --- a/.github/workflows/publish_dockerhub_main.yml +++ b/.github/workflows/publish_dockerhub_main.yml @@ -15,11 +15,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla context: . @@ -31,7 +31,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/publish_dockerhub_pre_release.yml b/.github/workflows/publish_dockerhub_pre_release.yml index dec46d8a89..540c62d647 100644 --- a/.github/workflows/publish_dockerhub_pre_release.yml +++ b/.github/workflows/publish_dockerhub_pre_release.yml @@ -24,11 +24,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: "false" - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla context: . @@ -40,7 +40,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/publish_dockerhub_release.yml b/.github/workflows/publish_dockerhub_release.yml index 54843dfc0e..a993c49c6a 100644 --- a/.github/workflows/publish_dockerhub_release.yml +++ b/.github/workflows/publish_dockerhub_release.yml @@ -15,11 +15,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla context: . @@ -33,7 +33,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/pull_request_integration_tests.yml b/.github/workflows/pull_request_integration_tests.yml index 2663014819..ecec9a8a59 100644 --- a/.github/workflows/pull_request_integration_tests.yml +++ b/.github/workflows/pull_request_integration_tests.yml @@ -41,7 +41,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -71,7 +71,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_k8s_integration_tests.yml b/.github/workflows/pull_request_k8s_integration_tests.yml index 7ed91fd01a..2d8a57c694 100644 --- a/.github/workflows/pull_request_k8s_integration_tests.yml +++ b/.github/workflows/pull_request_k8s_integration_tests.yml @@ -41,7 +41,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -110,7 +110,7 @@ jobs: docker builder prune -af || true df -h - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_oats_test.yml b/.github/workflows/pull_request_oats_test.yml index ae1e2d7cd8..e48e11ae82 100644 --- a/.github/workflows/pull_request_oats_test.yml +++ b/.github/workflows/pull_request_oats_test.yml @@ -40,7 +40,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: # Required for uploading artifacts actions: write steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_test_docker_build.yml b/.github/workflows/pull_request_test_docker_build.yml index 1c0520f5bb..3a5e42afef 100644 --- a/.github/workflows/pull_request_test_docker_build.yml +++ b/.github/workflows/pull_request_test_docker_build.yml @@ -17,11 +17,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: docker-build-beyla - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@bae259f9ed5b6fcb050e3b58adf7aee776d4edb5 # main with: context: . file: ${{ matrix.file }} diff --git a/.github/workflows/release-binaries-base.yml b/.github/workflows/release-binaries-base.yml index 68ab9d0b0f..eaf7d1981a 100644 --- a/.github/workflows/release-binaries-base.yml +++ b/.github/workflows/release-binaries-base.yml @@ -36,7 +36,7 @@ jobs: GOOS: linux GOARCH: ${{ inputs.arch }} - name: Upload release asset - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1 + uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 9b9d937890..6de47aaf20 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: persist-credentials: 'false' fetch-depth: 0 diff --git a/.github/workflows/update-make-docs.yml b/.github/workflows/update-make-docs.yml index 289ac3590d..fe48eefc93 100644 --- a/.github/workflows/update-make-docs.yml +++ b/.github/workflows/update-make-docs.yml @@ -17,7 +17,7 @@ jobs: contents: write # Needed for creating commits or PRs pull-requests: write # Needed if the action creates PRs steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - uses: grafana/writers-toolkit/update-make-docs@f65819d6a412b752c0e0263375215f049507b0e6 # update-make-docs/v1 diff --git a/.github/workflows/update-offsets.yml b/.github/workflows/update-offsets.yml index bc9dffd52f..832e1eba6a 100644 --- a/.github/workflows/update-offsets.yml +++ b/.github/workflows/update-offsets.yml @@ -29,7 +29,7 @@ jobs: - name: "Update offsets" run: make update-offsets - name: "Create/update PR" - uses: peter-evans/create-pull-request@4e1beaa7521e8b457b572c090b25bd3db56bf1c5 # v5 + uses: peter-evans/create-pull-request@4e1beaa7521e8b457b572c090b25bd3db56bf1c5 # v5.0.3 with: commit-message: Automatic update of offsets.json title: Automatic update of offsets.json diff --git a/.github/workflows/vale.yml b/.github/workflows/vale.yml index f5cf52d624..a8e7c187b9 100644 --- a/.github/workflows/vale.yml +++ b/.github/workflows/vale.yml @@ -12,11 +12,11 @@ jobs: vale: runs-on: ubuntu-latest container: - image: grafana/vale@sha256:5eded74785e98384d84878073d5d41125b2ad21f1d711b06ab214c7890a81a19 + image: grafana/vale@sha256:7da4bbf095c03cd3be20328c792379a0b3b43334a1adab344f325e381ef5d53e steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false - - uses: grafana/writers-toolkit/vale-action@1dd3173b59e3128c9d74645c4684a7b57aadbb77 # vale-action/v1 + - uses: grafana/writers-toolkit/vale-action@f49dd90f007967990095ac2d18c5bdf37b412a5f # vale-action/v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/workflow_integration_tests_vm.yml b/.github/workflows/workflow_integration_tests_vm.yml index b4149186e9..b7a4a97d74 100644 --- a/.github/workflows/workflow_integration_tests_vm.yml +++ b/.github/workflows/workflow_integration_tests_vm.yml @@ -26,7 +26,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -62,7 +62,7 @@ jobs: arch: "x86_64" test: ${{ fromJson(needs.vm-test-matrix.outputs.matrix).include }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/configs/offsets/kafkago/go.mod b/configs/offsets/kafkago/go.mod index a1032667ae..63e08c1123 100644 --- a/configs/offsets/kafkago/go.mod +++ b/configs/offsets/kafkago/go.mod @@ -2,7 +2,7 @@ module kafkago_off go 1.25.3 -require github.com/segmentio/kafka-go v0.4.47 +require github.com/segmentio/kafka-go v0.4.49 require ( github.com/klauspost/compress v1.15.9 // indirect diff --git a/configs/offsets/kafkago/go.sum b/configs/offsets/kafkago/go.sum index 3c1b808d0f..74b476c2d4 100644 --- a/configs/offsets/kafkago/go.sum +++ b/configs/offsets/kafkago/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= @@ -7,11 +6,8 @@ github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= -github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/segmentio/kafka-go v0.4.49 h1:GJiNX1d/g+kG6ljyJEoi9++PUMdXGAxb7JGPiDCuNmk= +github.com/segmentio/kafka-go v0.4.49/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -20,49 +16,9 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/debug.Dockerfile b/debug.Dockerfile index 1710d40a6a..e09826f800 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.3-alpine as builder +FROM golang:1.25.5-alpine@sha256:26111811bc967321e7b6f852e914d14bede324cd1accb7f81811929a6a57fea9 as builder ARG TARGETARCH @@ -27,7 +27,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest # Prior to using this debug.Dockerfile, you should manually run `make generate copy-obi-vendor` RUN make debug -FROM alpine:latest@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 +FROM alpine:latest@sha256:51183f2cfa6320055da30872f211093f9ff1d3cf06f39a0bdb212314c5dc7375 WORKDIR / diff --git a/examples/greeting-apps/docker-compose.yaml b/examples/greeting-apps/docker-compose.yaml index ef78936d20..b5fe8c2bb7 100644 --- a/examples/greeting-apps/docker-compose.yaml +++ b/examples/greeting-apps/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.8" services: nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:325b00a35073d9aa1d3df16da8afbbae1ac7d824c505f7490cd5cdbb79d60f6d container_name: demo-nginx ports: - 3333:3330 @@ -18,7 +18,7 @@ services: # Beyla for NGINX nginxbeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:879cd9b1946757f8118ae58fde96231208427183d1e51c1d0403df5ac360743c volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -48,7 +48,7 @@ services: # Beyla for Java Spring Boot 3.0 GraalVM Native Image gobeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:879cd9b1946757f8118ae58fde96231208427183d1e51c1d0403df5ac360743c volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -78,7 +78,7 @@ services: # Beyla for Java Spring Boot 3.0 GraalVM Native Image javabeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:879cd9b1946757f8118ae58fde96231208427183d1e51c1d0403df5ac360743c volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -108,7 +108,7 @@ services: # Beyla for Rust Actix rustbeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:879cd9b1946757f8118ae58fde96231208427183d1e51c1d0403df5ac360743c volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -130,7 +130,7 @@ services: # Grafana Agent agent: - image: grafana/agent@sha256:fd70f053b520ce2097e655296f08e5e37b8d644f27b983a35a8c3af4a4754abf + image: grafana/agent@sha256:173c2717229fbcdbee00d1f9d4629a08c83512b3579c87f22782a8fe12b043fd container_name: demo-agent command: - run @@ -145,7 +145,7 @@ services: # Tempo tempo: - image: grafana/tempo@sha256:f11e4d5bde8738f549823539acc7b7f50996c7f5fbba61a70798222eb424d8b4 + image: grafana/tempo@sha256:7de700fce594441dd92a6264d8f97f5a50413e953f4c00198ca0f8440987869d container_name: demo-tempo command: - -config.file @@ -159,7 +159,7 @@ services: # Mimir -config.file=config-mimir.yaml -server.grpc-listen-port=9096 mimir: - image: grafana/mimir@sha256:5788fc30c5bafaf0f65ae6b15622cc02c7c14a76c3cdf09fc1781234612a7496 + image: grafana/mimir@sha256:e648c344d8d3c46ab04174c9b1d9fdc76836e6ead6335980081f8ee34ede9f14 container_name: demo-mimir command: - -config.file=/etc/mimir/mimir-config.yaml @@ -171,7 +171,7 @@ services: - "9096:9096" grafana: - image: grafana/grafana@sha256:35c41e0fd0295f5d0ee5db7e780cf33506abfaf47686196f825364889dee878b + image: grafana/grafana@sha256:70d9599b186ce287be0d2c5ba9a78acb2e86c1a68c9c41449454d0fc3eeb84e8 container_name: demo-grafana volumes: - ./configs/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml diff --git a/examples/quickstart/nodejs/package-lock.json b/examples/quickstart/nodejs/package-lock.json index da292f63bd..25dfc39203 100644 --- a/examples/quickstart/nodejs/package-lock.json +++ b/examples/quickstart/nodejs/package-lock.json @@ -226,9 +226,9 @@ } }, "node_modules/express": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.0.tgz", - "integrity": "sha512-c2iPh3xp5vvCLgaHK03+mWLFPhox7j1LwyxcZwFVApEv5i0X+IjPpbT50SJJwwLpdBVfp45AkK/v+AFgv/XlfQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -270,34 +270,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/express/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/express/node_modules/send": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.1.tgz", - "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/finalhandler": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", @@ -978,9 +950,9 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "express": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.0.tgz", - "integrity": "sha512-c2iPh3xp5vvCLgaHK03+mWLFPhox7j1LwyxcZwFVApEv5i0X+IjPpbT50SJJwwLpdBVfp45AkK/v+AFgv/XlfQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -1013,33 +985,6 @@ "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "send": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.1.tgz", - "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - } - } } }, "finalhandler": { diff --git a/go.mod b/go.mod index d944e75f33..f9b1fddfb1 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/gin-gonic/gin v1.10.1 github.com/goccy/go-json v0.10.5 github.com/gorilla/mux v1.8.1 - github.com/grafana/pyroscope-go/godeltaprof v0.1.8 + github.com/grafana/pyroscope-go/godeltaprof v0.1.9 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/mariomac/guara v0.0.0-20250408105519-1e4dbdfb7136 github.com/pkg/errors v0.9.1 @@ -39,14 +39,14 @@ require ( go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/sdk/metric v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 - go.uber.org/zap v1.27.0 + go.uber.org/zap v1.27.1 golang.org/x/net v0.46.0 golang.org/x/sync v0.17.0 google.golang.org/grpc v1.76.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apimachinery v0.34.1 - k8s.io/client-go v0.34.1 + k8s.io/apimachinery v0.34.3 + k8s.io/client-go v0.34.2 sigs.k8s.io/e2e-framework v0.6.0 ) diff --git a/internal/test/cmd/python_pingserver/Dockerfile b/internal/test/cmd/python_pingserver/Dockerfile index 05dae8fa36..cb6ff9b237 100644 --- a/internal/test/cmd/python_pingserver/Dockerfile +++ b/internal/test/cmd/python_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:latest@sha256:671d8548cfc6ec789cbdd74c8585bd614864d1005970167350a2586be8db5650 +FROM python:latest@sha256:2febcd1e225a79391d5c9a7b416125af542ffd2f686201a58ea1d5595e110c4d EXPOSE 8080 RUN pip install fastapi uvicorn COPY main.py /main.py diff --git a/internal/test/cmd/ruby_pingserver/Dockerfile b/internal/test/cmd/ruby_pingserver/Dockerfile index f0c0a09bab..dccb7c5406 100644 --- a/internal/test/cmd/ruby_pingserver/Dockerfile +++ b/internal/test/cmd/ruby_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs a simple ruby http server on port 8080 -FROM ruby:latest@sha256:4bef3ee023c0525189f1907ac256bc4511cc9ef4d5dc088c20b5c5a478638e28 +FROM ruby:latest@sha256:b2dcadfcbaf93fceaf321b70c41a587ff535c2b10c22f8a25b401f21772670ba EXPOSE 8080 COPY pingserver.rb /pingserver.rb CMD ["ruby", "pingserver.rb"] \ No newline at end of file diff --git a/internal/test/cmd/rust_ironssl/Dockerfile b/internal/test/cmd/rust_ironssl/Dockerfile index f97d6bcbf7..308b4cc688 100644 --- a/internal/test/cmd/rust_ironssl/Dockerfile +++ b/internal/test/cmd/rust_ironssl/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust ironssl HTTPS on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:867f1d1162913c401378a8504fb17fe2032c760dc316448766f150a130204aad EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingiron/Dockerfile b/internal/test/cmd/rust_pingiron/Dockerfile index 9d1777ef4e..9da76c5015 100644 --- a/internal/test/cmd/rust_pingiron/Dockerfile +++ b/internal/test/cmd/rust_pingiron/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust ironssl HTTP on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:867f1d1162913c401378a8504fb17fe2032c760dc316448766f150a130204aad EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingrouille/Cargo.lock b/internal/test/cmd/rust_pingrouille/Cargo.lock index eb40cc0443..183cf9ac85 100644 --- a/internal/test/cmd/rust_pingrouille/Cargo.lock +++ b/internal/test/cmd/rust_pingrouille/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler32" @@ -56,15 +56,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "brotli" version = "3.3.4" @@ -148,15 +139,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.3.2" @@ -166,16 +148,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "cxx" version = "1.0.92" @@ -230,16 +202,6 @@ dependencies = [ "gzip-header", ] -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "errno" version = "0.2.8" @@ -291,16 +253,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.8" @@ -601,9 +553,9 @@ dependencies = [ [[package]] name = "rouille" -version = "3.6.1" +version = "3.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f86e4c51a773f953f02bbab5fd049f004bfd384341d62da2a079aff812ab176" +checksum = "3716fbf57fc1084d7a706adf4e445298d123e4a44294c4e8213caf1b85fcc921" dependencies = [ "base64", "brotli", @@ -611,13 +563,12 @@ dependencies = [ "deflate", "filetime", "multipart", - "num_cpus", "percent-encoding", "rand", "serde", "serde_derive", "serde_json", - "sha1", + "sha1_smol", "threadpool", "time", "tiny_http", @@ -692,15 +643,10 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.5" +name = "sha1_smol" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "syn" @@ -798,12 +744,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - [[package]] name = "unicase" version = "2.6.0" diff --git a/internal/test/cmd/rust_pingrouille/Dockerfile b/internal/test/cmd/rust_pingrouille/Dockerfile index 02cf1bf506..35c0d9e582 100644 --- a/internal/test/cmd/rust_pingrouille/Dockerfile +++ b/internal/test/cmd/rust_pingrouille/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust rouille HTTP on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:867f1d1162913c401378a8504fb17fe2032c760dc316448766f150a130204aad EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingserver/Dockerfile b/internal/test/cmd/rust_pingserver/Dockerfile index 5cdac2d6db..2e3fdbfe09 100644 --- a/internal/test/cmd/rust_pingserver/Dockerfile +++ b/internal/test/cmd/rust_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust basic net tcp on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:867f1d1162913c401378a8504fb17fe2032c760dc316448766f150a130204aad EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/integration/components/beyla-k8s-cache/Dockerfile b/internal/test/integration/components/beyla-k8s-cache/Dockerfile index c612e04204..3f79944cc8 100644 --- a/internal/test/integration/components/beyla-k8s-cache/Dockerfile +++ b/internal/test/integration/components/beyla-k8s-cache/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/beyla/Dockerfile b/internal/test/integration/components/beyla/Dockerfile index 11d3fa7aa0..27500476cf 100644 --- a/internal/test/integration/components/beyla/Dockerfile +++ b/internal/test/integration/components/beyla/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -23,7 +23,7 @@ COPY internal/test/integration/components/beyla/beyla_wrapper.sh /beyla_wrapper. RUN make compile-for-coverage # Create final image from minimal + built binary -FROM ubuntu@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 +FROM ubuntu@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 COPY --from=builder /src/bin/beyla /beyla # Wrap the executable in a script that waits for the processes to end diff --git a/internal/test/integration/components/beyla/Dockerfile_dbg b/internal/test/integration/components/beyla/Dockerfile_dbg index b0aa92d86e..457d589707 100644 --- a/internal/test/integration/components/beyla/Dockerfile_dbg +++ b/internal/test/integration/components/beyla/Dockerfile_dbg @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/elasticsearch/Dockerfile b/internal/test/integration/components/elasticsearch/Dockerfile index de70487046..0f869dab17 100644 --- a/internal/test/integration/components/elasticsearch/Dockerfile +++ b/internal/test/integration/components/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:3466e9a530f0226fc09fbc479bde2387fd773f760749612e94d8696fe1aa5877 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN apt update RUN pip install fastapi uvicorn requests diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile b/internal/test/integration/components/go_grpc_server_mux/Dockerfile index e4d2e1d4b0..379dfb2a6f 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ COPY x509/server_test_key.pem x509/server_test_key.pem RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls index 57c333d891..4688eca39e 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ COPY x509/server_test_key.pem x509/server_test_key.pem RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/go_otel/Dockerfile b/internal/test/integration/components/go_otel/Dockerfile index 069b06e3ce..8f866a04cb 100644 --- a/internal/test/integration/components/go_otel/Dockerfile +++ b/internal/test/integration/components/go_otel/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/go_otel/ . RUN go build -o rolldice main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/rolldice . diff --git a/internal/test/integration/components/go_otel_grpc/Dockerfile b/internal/test/integration/components/go_otel_grpc/Dockerfile index 136254cc7a..0031b897ec 100644 --- a/internal/test/integration/components/go_otel_grpc/Dockerfile +++ b/internal/test/integration/components/go_otel_grpc/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/go_otel_grpc/ . RUN go build -o rolldice main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/rolldice . diff --git a/internal/test/integration/components/gohttp2/client/Dockerfile b/internal/test/integration/components/gohttp2/client/Dockerfile index a608e3c4ee..53607524a8 100644 --- a/internal/test/integration/components/gohttp2/client/Dockerfile +++ b/internal/test/integration/components/gohttp2/client/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o http2client ./internal/test/integration/components/gohttp2/client/main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/http2client . diff --git a/internal/test/integration/components/gohttp2/server/Dockerfile b/internal/test/integration/components/gohttp2/server/Dockerfile index 1f49848708..9e3551b11f 100644 --- a/internal/test/integration/components/gohttp2/server/Dockerfile +++ b/internal/test/integration/components/gohttp2/server/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o http2srv ./internal/test/integration/components/gohttp2/server/main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/http2srv . diff --git a/internal/test/integration/components/gokafka-seg/Dockerfile b/internal/test/integration/components/gokafka-seg/Dockerfile index 8ab0f5e6ea..1beb814ff2 100644 --- a/internal/test/integration/components/gokafka-seg/Dockerfile +++ b/internal/test/integration/components/gokafka-seg/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gokafka-seg/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gokafka-seg/go.mod b/internal/test/integration/components/gokafka-seg/go.mod index 32c3a1da87..1661e170d8 100644 --- a/internal/test/integration/components/gokafka-seg/go.mod +++ b/internal/test/integration/components/gokafka-seg/go.mod @@ -2,7 +2,7 @@ module grafana.com/gokafka-seg go 1.25.3 -require github.com/segmentio/kafka-go v0.4.47 +require github.com/segmentio/kafka-go v0.4.49 require ( github.com/klauspost/compress v1.15.9 // indirect diff --git a/internal/test/integration/components/gokafka-seg/go.sum b/internal/test/integration/components/gokafka-seg/go.sum index 3c1b808d0f..74b476c2d4 100644 --- a/internal/test/integration/components/gokafka-seg/go.sum +++ b/internal/test/integration/components/gokafka-seg/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= @@ -7,11 +6,8 @@ github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= -github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/segmentio/kafka-go v0.4.49 h1:GJiNX1d/g+kG6ljyJEoi9++PUMdXGAxb7JGPiDCuNmk= +github.com/segmentio/kafka-go v0.4.49/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -20,49 +16,9 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/test/integration/components/gokafka/Dockerfile b/internal/test/integration/components/gokafka/Dockerfile index ad07afbb67..a8e8e32ab2 100644 --- a/internal/test/integration/components/gokafka/Dockerfile +++ b/internal/test/integration/components/gokafka/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gokafka/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gomongo/Dockerfile b/internal/test/integration/components/gomongo/Dockerfile index 1854d0fd6f..5d87a2a96c 100644 --- a/internal/test/integration/components/gomongo/Dockerfile +++ b/internal/test/integration/components/gomongo/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gomongo/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:7e490910eea2861b9664577a96b54ce68ea3e02ce7f51d89cb0103a6f9c386e0 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gomongo/go.mod b/internal/test/integration/components/gomongo/go.mod index 8eed951272..b21060f7e2 100644 --- a/internal/test/integration/components/gomongo/go.mod +++ b/internal/test/integration/components/gomongo/go.mod @@ -2,7 +2,7 @@ module opentelemetry.io/obi/mongo go 1.25.3 -require go.mongodb.org/mongo-driver v1.17.4 +require go.mongodb.org/mongo-driver v1.17.6 require ( github.com/golang/snappy v0.0.4 // indirect diff --git a/internal/test/integration/components/gomongo/go.sum b/internal/test/integration/components/gomongo/go.sum index 631d709325..f02e1d1220 100644 --- a/internal/test/integration/components/gomongo/go.sum +++ b/internal/test/integration/components/gomongo/go.sum @@ -17,8 +17,8 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= -go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= +go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= diff --git a/internal/test/integration/components/gomongov2/Dockerfile b/internal/test/integration/components/gomongov2/Dockerfile index 1854d0fd6f..5d87a2a96c 100644 --- a/internal/test/integration/components/gomongov2/Dockerfile +++ b/internal/test/integration/components/gomongov2/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gomongo/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:7e490910eea2861b9664577a96b54ce68ea3e02ce7f51d89cb0103a6f9c386e0 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/goredis/Dockerfile b/internal/test/integration/components/goredis/Dockerfile index 18e66768a6..9f5ec37fbf 100644 --- a/internal/test/integration/components/goredis/Dockerfile +++ b/internal/test/integration/components/goredis/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/goredis/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gosql/Dockerfile b/internal/test/integration/components/gosql/Dockerfile index 2f64a82c18..9c6e231373 100644 --- a/internal/test/integration/components/gosql/Dockerfile +++ b/internal/test/integration/components/gosql/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ RUN go mod download RUN go build -o gosql gosql.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/gosql . diff --git a/internal/test/integration/components/grpcpinger/Dockerfile b/internal/test/integration/components/grpcpinger/Dockerfile index 5bb498ca37..28c6187ea9 100644 --- a/internal/test/integration/components/grpcpinger/Dockerfile +++ b/internal/test/integration/components/grpcpinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o grpcpinger ./internal/test/integration/components/grpcpinger/grpcpinger.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/grpcpinger . diff --git a/internal/test/integration/components/httppinger/Dockerfile b/internal/test/integration/components/httppinger/Dockerfile index 4e46322bdb..df412a9968 100644 --- a/internal/test/integration/components/httppinger/Dockerfile +++ b/internal/test/integration/components/httppinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o httppinger ./internal/test/integration/components/httppinger/httppinger.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/httppinger . diff --git a/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties b/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties index 12fbe1e907..c0bcafe984 100644 --- a/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties +++ b/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/internal/test/integration/components/javakafka/Dockerfile b/internal/test/integration/components/javakafka/Dockerfile index 55b61d06f4..46aa4ede82 100644 --- a/internal/test/integration/components/javakafka/Dockerfile +++ b/internal/test/integration/components/javakafka/Dockerfile @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 EXPOSE 8080 diff --git a/internal/test/integration/components/javakafka/Dockerfile_400 b/internal/test/integration/components/javakafka/Dockerfile_400 index 3a629dd19a..236fcbb1a1 100644 --- a/internal/test/integration/components/javakafka/Dockerfile_400 +++ b/internal/test/integration/components/javakafka/Dockerfile_400 @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:df52e55e3361a81ac1bead266f3373ee55d29aa50cf0975d440c2be3483d8ed3 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 EXPOSE 8080 diff --git a/internal/test/integration/components/javakafka/mvnw b/internal/test/integration/components/javakafka/mvnw index 19529ddf8c..bd8896bf22 100755 --- a/internal/test/integration/components/javakafka/mvnw +++ b/internal/test/integration/components/javakafka/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties b/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties index 12fbe1e907..c0bcafe984 100644 --- a/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties +++ b/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/internal/test/integration/components/javatestserver/Dockerfile b/internal/test/integration/components/javatestserver/Dockerfile index 5f1472d909..52e28267c5 100644 --- a/internal/test/integration/components/javatestserver/Dockerfile +++ b/internal/test/integration/components/javatestserver/Dockerfile @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 EXPOSE 8085 diff --git a/internal/test/integration/components/javatestserver/Dockerfile_jar b/internal/test/integration/components/javatestserver/Dockerfile_jar index d9320df138..d3164899aa 100644 --- a/internal/test/integration/components/javatestserver/Dockerfile_jar +++ b/internal/test/integration/components/javatestserver/Dockerfile_jar @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17@sha256:54a16ef91e00c11ac9b05029faa5efd02c37296844204a6561d2440629559c38 AS javabuilder +FROM eclipse-temurin:17@sha256:7995efb7f9276fc16433aa8e2856a06082cd09f7f6603579db2534937ccc6778 AS javabuilder # Install tar and gzip to extract the Maven binaries RUN apt install -y tar gzip @@ -22,7 +22,7 @@ RUN ./mvnw -version RUN ./mvnw clean package # The App Image -FROM eclipse-temurin:17-jre@sha256:db1c787e2cd41943a90b025191e4e66cbecfc0695e4ff619353eef92e460378f +FROM eclipse-temurin:17.0.16_8-jre@sha256:696817d4fb79b9c442e84e18483d8345dd2d0b6710546344e5eb182bd3153333 EXPOSE 8085 diff --git a/internal/test/integration/components/javatestserver/mvnw b/internal/test/integration/components/javatestserver/mvnw index 19529ddf8c..bd8896bf22 100755 --- a/internal/test/integration/components/javatestserver/mvnw +++ b/internal/test/integration/components/javatestserver/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/internal/test/integration/components/mysqldb/Dockerfile b/internal/test/integration/components/mysqldb/Dockerfile index 131492f257..a7bf2dc304 100644 --- a/internal/test/integration/components/mysqldb/Dockerfile +++ b/internal/test/integration/components/mysqldb/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:8@sha256:b306273d4d36bc1a7f265130c3dd93c0462253af7634203e569add0403a7b273 as builder +FROM mysql:8@sha256:5cdee9be17b6b7c804980be29d1bb0ba1536c7afaaed679fe0c1578ea0e3c233 as builder ENV MYSQL_ROOT_PASSWORD=p_ssW0rd ENV MYSQL_DATABASE=sakila ENV MYSQL_USER=sakila @@ -15,7 +15,7 @@ RUN ["sed", "-i", "s/exec \"$@\"/echo \"skipping...\"/", "/usr/local/bin/docker- USER mysql RUN ["/usr/local/bin/docker-entrypoint.sh", "mysqld"] -FROM mysql:8@sha256:b306273d4d36bc1a7f265130c3dd93c0462253af7634203e569add0403a7b273 +FROM mysql:8@sha256:5cdee9be17b6b7c804980be29d1bb0ba1536c7afaaed679fe0c1578ea0e3c233 ENV MYSQL_ROOT_PASSWORD=p_ssW0rd ENV MYSQL_DATABASE=sakila ENV MYSQL_USER=sakila diff --git a/internal/test/integration/components/nodeclient/Dockerfile b/internal/test/integration/components/nodeclient/Dockerfile index 67ef5d1ec8..d6485b8bdd 100644 --- a/internal/test/integration/components/nodeclient/Dockerfile +++ b/internal/test/integration/components/nodeclient/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:1b38aaddff63cd0d3a9b5b03863a71fd33ee62047dd2e915f494d96b4b9c18cc # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsdist/package-lock.json b/internal/test/integration/components/nodejsdist/package-lock.json index 7b50110907..b3d4327cf5 100644 --- a/internal/test/integration/components/nodejsdist/package-lock.json +++ b/internal/test/integration/components/nodejsdist/package-lock.json @@ -285,9 +285,9 @@ } }, "node_modules/express": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.2.0.tgz", - "integrity": "sha512-XdpJDLxfztVY59X0zPI6sibRiGcxhTPXRD3IhJmjKf2jwMvkRGV1j7loB8U+heeamoU3XvihAaGRTR4aXXUN3A==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", "license": "MIT", "dependencies": { "accepts": "^2.0.0", diff --git a/internal/test/integration/components/nodejsserver/Dockerfile b/internal/test/integration/components/nodejsserver/Dockerfile index 6be58464a7..6702a34367 100644 --- a/internal/test/integration/components/nodejsserver/Dockerfile +++ b/internal/test/integration/components/nodejsserver/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:1b38aaddff63cd0d3a9b5b03863a71fd33ee62047dd2e915f494d96b4b9c18cc # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsserver/Dockerfile_otel b/internal/test/integration/components/nodejsserver/Dockerfile_otel index 2cd150e856..cb61d1a10d 100644 --- a/internal/test/integration/components/nodejsserver/Dockerfile_otel +++ b/internal/test/integration/components/nodejsserver/Dockerfile_otel @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:1b38aaddff63cd0d3a9b5b03863a71fd33ee62047dd2e915f494d96b4b9c18cc # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsserver/package-lock.json b/internal/test/integration/components/nodejsserver/package-lock.json index fc2eadda17..097aeb052d 100644 --- a/internal/test/integration/components/nodejsserver/package-lock.json +++ b/internal/test/integration/components/nodejsserver/package-lock.json @@ -236,9 +236,9 @@ } }, "node_modules/express": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.0.tgz", - "integrity": "sha512-c2iPh3xp5vvCLgaHK03+mWLFPhox7j1LwyxcZwFVApEv5i0X+IjPpbT50SJJwwLpdBVfp45AkK/v+AFgv/XlfQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -281,36 +281,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/express/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/express/node_modules/send": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.1.tgz", - "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==", - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/finalhandler": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", diff --git a/internal/test/integration/components/nodemultiproc/Dockerfile b/internal/test/integration/components/nodemultiproc/Dockerfile index 595e84a9a9..f1b1dcbe13 100644 --- a/internal/test/integration/components/nodemultiproc/Dockerfile +++ b/internal/test/integration/components/nodemultiproc/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:1b38aaddff63cd0d3a9b5b03863a71fd33ee62047dd2e915f494d96b4b9c18cc WORKDIR /app diff --git a/internal/test/integration/components/nodemultiproc/package-lock.json b/internal/test/integration/components/nodemultiproc/package-lock.json index 2d70f1fb7d..ed442abf15 100644 --- a/internal/test/integration/components/nodemultiproc/package-lock.json +++ b/internal/test/integration/components/nodemultiproc/package-lock.json @@ -277,9 +277,9 @@ } }, "node_modules/express": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.2.0.tgz", - "integrity": "sha512-XdpJDLxfztVY59X0zPI6sibRiGcxhTPXRD3IhJmjKf2jwMvkRGV1j7loB8U+heeamoU3XvihAaGRTR4aXXUN3A==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", "license": "MIT", "dependencies": { "accepts": "^2.0.0", diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql index 87c474b549..6588a1d80d 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql @@ -1,4 +1,4 @@ -FROM mysql:8.0.34-debian@sha256:2a31847951cdf92d6901ef58b4c5a9fbe75b47823d9ade1f7a4652ede7a88e2d +FROM mysql:8.0.43-debian@sha256:bced38c0ca97bd00c8fbc877a019ff141f014608b0762e6e1978cc76e63f473f SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx index 4ef95c8330..56fffce7f3 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx @@ -1,4 +1,4 @@ -FROM nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 +FROM nginx:latest@sha256:325b00a35073d9aa1d3df16da8afbbae1ac7d824c505f7490cd5cdbb79d60f6d SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php index e576c29cf8..26ea7c1b39 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php @@ -1,4 +1,4 @@ -FROM php:8.2-fpm@sha256:14b7774a36d424da12c1a138fad283142bdf297ebd625176dce04ea674781c6c +FROM php:8.2-fpm@sha256:affa3d46b521ec5356667cb677daf6b82b76df305837d5147deac878b10c46be SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/pingclient/Dockerfile b/internal/test/integration/components/pingclient/Dockerfile index 7e30b9c3bc..3afdb9e58f 100644 --- a/internal/test/integration/components/pingclient/Dockerfile +++ b/internal/test/integration/components/pingclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o pingclient ./internal/test/integration/components/pingclient/pingclient.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/pingclient . diff --git a/internal/test/integration/components/postgresql/Dockerfile b/internal/test/integration/components/postgresql/Dockerfile index 426e2a992d..543b2dc54f 100644 --- a/internal/test/integration/components/postgresql/Dockerfile +++ b/internal/test/integration/components/postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:latest@sha256:7499fa0ed6b106d3b513fe792d673f1b496a539a541674fdcd9539c13c6427f3 +FROM postgres:latest@sha256:0033c194dc640cc4dcc62ef7c3117e5791365cca5fc1a2998e5c1693254784bc ENV POSTGRES_DB sqltest COPY accounting.sql /docker-entrypoint-initdb.d/ EXPOSE 5432 diff --git a/internal/test/integration/components/pythonawsclient/Dockerfile b/internal/test/integration/components/pythonawsclient/Dockerfile index eebc906884..89694b2dab 100644 --- a/internal/test/integration/components/pythonawsclient/Dockerfile +++ b/internal/test/integration/components/pythonawsclient/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12@sha256:de96c54f25e2d69597a72bd3309d723110e59586845c5675c8cb83afb808af18 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN pip install boto3 fastapi uvicorn COPY main.py /main.py diff --git a/internal/test/integration/components/pythongraphql/Dockerfile b/internal/test/integration/components/pythongraphql/Dockerfile index bc3dcffd34..5b77bfb28a 100644 --- a/internal/test/integration/components/pythongraphql/Dockerfile +++ b/internal/test/integration/components/pythongraphql/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12@sha256:de96c54f25e2d69597a72bd3309d723110e59586845c5675c8cb83afb808af18 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN pip install ariadne fastapi uvicorn COPY main.py /main.py diff --git a/internal/test/integration/components/pythongrpc/Dockerfile b/internal/test/integration/components/pythongrpc/Dockerfile index 965e3f273e..9be0384568 100644 --- a/internal/test/integration/components/pythongrpc/Dockerfile +++ b/internal/test/integration/components/pythongrpc/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN pip install fastapi uvicorn grpcio grpcio_tools COPY main.py /main.py diff --git a/internal/test/integration/components/pythongrpc/Dockerfile_srv b/internal/test/integration/components/pythongrpc/Dockerfile_srv index 9edc6f1a36..42c618aaf4 100644 --- a/internal/test/integration/components/pythongrpc/Dockerfile_srv +++ b/internal/test/integration/components/pythongrpc/Dockerfile_srv @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 50051 RUN pip install grpcio grpcio_tools COPY route_guide_server.py /route_guide_server.py diff --git a/internal/test/integration/components/pythonkafka/Dockerfile b/internal/test/integration/components/pythonkafka/Dockerfile index 2791e3b857..59aaaf4cf9 100644 --- a/internal/test/integration/components/pythonkafka/Dockerfile +++ b/internal/test/integration/components/pythonkafka/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python -FROM python:3.11@sha256:80d0556a9376af37548850151f0838cfa50137214fe7a2563e627c297d4811e1 +FROM python:3.11@sha256:38639aa0267125ab0def2778f0aa8453043178ec67bf494c5af11f75a8392d9d EXPOSE 8080 RUN apt update RUN pip install kafka-python diff --git a/internal/test/integration/components/pythonmongo/Dockerfile b/internal/test/integration/components/pythonmongo/Dockerfile index f1451ce69b..b4e0c9f109 100644 --- a/internal/test/integration/components/pythonmongo/Dockerfile +++ b/internal/test/integration/components/pythonmongo/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:1cb6108b64a4caf2a862499bf90dc65703a08101e8bfb346a18c9d12c0ed5b7e +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN pip install fastapi uvicorn pymongo COPY main.py /main.py diff --git a/internal/test/integration/components/pythonredis/Dockerfile b/internal/test/integration/components/pythonredis/Dockerfile index 3c5e681377..35f5a4bc02 100644 --- a/internal/test/integration/components/pythonredis/Dockerfile +++ b/internal/test/integration/components/pythonredis/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN pip install fastapi uvicorn redis COPY main.py /main.py diff --git a/internal/test/integration/components/pythonsql/Dockerfile b/internal/test/integration/components/pythonsql/Dockerfile index 7c5a95d5d4..643e27f6f5 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile +++ b/internal/test/integration/components/pythonsql/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN apt update RUN apt install -y libpq-dev diff --git a/internal/test/integration/components/pythonsql/Dockerfile_mysql b/internal/test/integration/components/pythonsql/Dockerfile_mysql index 9d2154fe6e..0506f788b3 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile_mysql +++ b/internal/test/integration/components/pythonsql/Dockerfile_mysql @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN apt update RUN pip install fastapi uvicorn mysql-connector-python diff --git a/internal/test/integration/components/pythonsql/Dockerfile_ssl b/internal/test/integration/components/pythonsql/Dockerfile_ssl index 81b225e2f7..f708f85790 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile_ssl +++ b/internal/test/integration/components/pythonsql/Dockerfile_ssl @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:b499cef422563a0ea06776df379781343de803291ffcfcd5513faf87a36ede6b EXPOSE 8080 RUN apt update RUN apt install -y libpq-dev diff --git a/internal/test/integration/components/rustssltestserver/Cargo.lock b/internal/test/integration/components/rustssltestserver/Cargo.lock index 95efc62fb2..2c01efa0ad 100644 --- a/internal/test/integration/components/rustssltestserver/Cargo.lock +++ b/internal/test/integration/components/rustssltestserver/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" dependencies = [ "actix-http", "actix-service", @@ -31,7 +31,7 @@ dependencies = [ "actix-web", "bitflags", "bytes", - "derive_more", + "derive_more 2.1.0", "futures-core", "http-range", "log", @@ -59,7 +59,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -195,7 +195,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -410,6 +410,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.16.2" @@ -464,13 +473,36 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", "syn", ] +[[package]] +name = "derive_more" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" +dependencies = [ + "convert_case 0.10.0", + "proc-macro2", + "quote", + "rustc_version", + "syn", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -794,9 +826,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "memchr" @@ -1108,18 +1140,28 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1128,14 +1170,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1203,9 +1246,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1365,6 +1408,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "url" version = "2.5.2" diff --git a/internal/test/integration/components/rustssltestserver/Dockerfile b/internal/test/integration/components/rustssltestserver/Dockerfile index 394c473c3d..c44c0e0587 100644 --- a/internal/test/integration/components/rustssltestserver/Dockerfile +++ b/internal/test/integration/components/rustssltestserver/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:26f2a7cab45014541c65f9d140ccfa6aaefbb49686c6759bea9c6f7f5bb3d72f AS rustbuilder +FROM debian:bookworm@sha256:7e5bc0e499a8d50cb1e32287944a90b9ec8fd7d500673e75daff3f52882f5798 AS rustbuilder RUN apt update RUN apt install -y build-essential curl pkg-config libssl-dev @@ -17,7 +17,7 @@ COPY internal/test/integration/components/rusttestserver/large_data.json . RUN cargo build --release # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 RUN apt update RUN apt install libssl3 -y diff --git a/internal/test/integration/components/rusttestserver/Cargo.lock b/internal/test/integration/components/rusttestserver/Cargo.lock index 8a4d117cd0..7613cff2cd 100644 --- a/internal/test/integration/components/rusttestserver/Cargo.lock +++ b/internal/test/integration/components/rusttestserver/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" dependencies = [ "actix-http", "actix-service", @@ -31,7 +31,7 @@ dependencies = [ "actix-web", "bitflags 2.6.0", "bytes", - "derive_more", + "derive_more 2.1.0", "futures-core", "http-range", "log", @@ -58,7 +58,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -174,7 +174,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -407,6 +407,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.16.2" @@ -477,13 +486,36 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", "syn", ] +[[package]] +name = "derive_more" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" +dependencies = [ + "convert_case 0.10.0", + "proc-macro2", + "quote", + "rustc_version", + "syn", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -913,9 +945,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "memchr" @@ -1344,18 +1376,28 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1364,14 +1406,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1439,9 +1482,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1651,6 +1694,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "url" version = "2.5.2" diff --git a/internal/test/integration/components/rusttestserver/Dockerfile b/internal/test/integration/components/rusttestserver/Dockerfile index d5c2138ab9..fd874d2da4 100644 --- a/internal/test/integration/components/rusttestserver/Dockerfile +++ b/internal/test/integration/components/rusttestserver/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd AS rustbuilder +FROM rust:latest@sha256:867f1d1162913c401378a8504fb17fe2032c760dc316448766f150a130204aad AS rustbuilder # Set the working directory to /build WORKDIR /build @@ -10,7 +10,7 @@ COPY internal/test/integration/components/rusttestserver . RUN cargo build --release # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 RUN apt update RUN apt install libssl3 -y diff --git a/internal/test/integration/components/sqlclient/Dockerfile b/internal/test/integration/components/sqlclient/Dockerfile index a71a5adad2..a58e7301d4 100644 --- a/internal/test/integration/components/sqlclient/Dockerfile +++ b/internal/test/integration/components/sqlclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ RUN go mod download RUN go build gosqlite.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / COPY --from=builder /src/gosqlite . diff --git a/internal/test/integration/components/testserver/Dockerfile b/internal/test/integration/components/testserver/Dockerfile index 21d8020fe8..f7eb9315bf 100644 --- a/internal/test/integration/components/testserver/Dockerfile +++ b/internal/test/integration/components/testserver/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_duplicate b/internal/test/integration/components/testserver/Dockerfile_duplicate index fcd66315c2..7f7f6fdd18 100644 --- a/internal/test/integration/components/testserver/Dockerfile_duplicate +++ b/internal/test/integration/components/testserver/Dockerfile_duplicate @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_nodebug b/internal/test/integration/components/testserver/Dockerfile_nodebug index e29df4d38c..6b1f1356ac 100644 --- a/internal/test/integration/components/testserver/Dockerfile_nodebug +++ b/internal/test/integration/components/testserver/Dockerfile_nodebug @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver -ldflags="-s -w" ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_rename1 b/internal/test/integration/components/testserver/Dockerfile_rename1 index a062010376..da4cc3501f 100644 --- a/internal/test/integration/components/testserver/Dockerfile_rename1 +++ b/internal/test/integration/components/testserver/Dockerfile_rename1 @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:e899040a73d36e2b36fa33216943539d9957cba8172b858097c2cabcdb20a3e2 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_static b/internal/test/integration/components/testserver/Dockerfile_static index de8fcb5834..b7fd0b68ab 100644 --- a/internal/test/integration/components/testserver/Dockerfile_static +++ b/internal/test/integration/components/testserver/Dockerfile_static @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ RUN go build -tags -a -ldflags '-linkmode external -extldflags "-static"' -o tes # Create final image from minimal + built binary #TODO: use minimal image -FROM debian:12@sha256:26f2a7cab45014541c65f9d140ccfa6aaefbb49686c6759bea9c6f7f5bb3d72f +FROM debian:12@sha256:7e5bc0e499a8d50cb1e32287944a90b9ec8fd7d500673e75daff3f52882f5798 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/docker-compose-elasticsearch.yml b/internal/test/integration/docker-compose-elasticsearch.yml index 83fd909386..6e3997e98e 100644 --- a/internal/test/integration/docker-compose-elasticsearch.yml +++ b/internal/test/integration/docker-compose-elasticsearch.yml @@ -17,7 +17,7 @@ services: memory: 1G opensearchserver: - image: opensearchproject/opensearch:3.3.1@sha256:773b05b026c01e7d520f6b857f486b7312d9290e14f2aebe4630eb80787e9eb3 + image: opensearchproject/opensearch:3.3.2@sha256:22fdee0d6db3f500a64cd27ddff3633f32244d0ea58b68ffb151cd2217f0bb0d container_name: opensearch-server ports: - "9201:9200" diff --git a/internal/test/integration/docker-compose-netolly-rdns.yml b/internal/test/integration/docker-compose-netolly-rdns.yml index 7fdc9a6829..f5434f2045 100644 --- a/internal/test/integration/docker-compose-netolly-rdns.yml +++ b/internal/test/integration/docker-compose-netolly-rdns.yml @@ -2,7 +2,7 @@ version: "3.8" services: curler: - image: alpine/curl@sha256:d9d451635fea7317186adda62cebe3f7e46810a3de6ddfcae662339e456b6c55 + image: alpine/curl@sha256:bd3d6bf85a478818cb858cce42c87fcecbac141249f10814be96309e4abeb807 command: - sh - -c diff --git a/internal/test/integration/docker-compose-php-fpm.yml b/internal/test/integration/docker-compose-php-fpm.yml index a12da3e5cf..3c3b6dea46 100644 --- a/internal/test/integration/docker-compose-php-fpm.yml +++ b/internal/test/integration/docker-compose-php-fpm.yml @@ -2,7 +2,7 @@ version: "3.8" services: nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:325b00a35073d9aa1d3df16da8afbbae1ac7d824c505f7490cd5cdbb79d60f6d mem_limit: 128m container_name: hatest-nginx ports: @@ -14,7 +14,7 @@ services: - php-fpm php-fpm: - image: php:fpm@sha256:231ab3ac3db542e1d019a35abee1bd106d278a5712d1dc2bb4fbe103de016792 + image: php:fpm@sha256:baa4dd163e5c9e95c4ba31773173b408c69c824f6a21da56af274a47e7ddbee6 mem_limit: 512m container_name: hatest-php-fpm volumes: diff --git a/internal/test/integration/docker-compose-ruby.yml b/internal/test/integration/docker-compose-ruby.yml index bc638504d7..28ec3cfb44 100644 --- a/internal/test/integration/docker-compose-ruby.yml +++ b/internal/test/integration/docker-compose-ruby.yml @@ -13,7 +13,7 @@ services: condition: service_started nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:325b00a35073d9aa1d3df16da8afbbae1ac7d824c505f7490cd5cdbb79d60f6d container_name: nginx_server ports: - "8443:443" # Expose TLS port diff --git a/internal/test/oats/redis/docker-compose-beyla-go-redis.yml b/internal/test/oats/redis/docker-compose-beyla-go-redis.yml index 0315d4b553..dc0ab84742 100644 --- a/internal/test/oats/redis/docker-compose-beyla-go-redis.yml +++ b/internal/test/oats/redis/docker-compose-beyla-go-redis.yml @@ -1,7 +1,7 @@ services: # Use postgres as a test SQL server redis: - image: redis:latest@sha256:acb90ced0bd769b7c04cb4c32c4494ba7b3e0ee068bdbfff0eeb0d31c2a21078 + image: redis:latest@sha256:3906b477e4b60250660573105110c28bfce93b01243eab37610a484daebceb04 ports: - "6379:6379" # Simple python HTTP server, which exposes one endpoint /query that does a few redis queries diff --git a/internal/test/oats/redis/docker-compose-beyla-redis.yml b/internal/test/oats/redis/docker-compose-beyla-redis.yml index 09fee8e9f1..c4cb7227dc 100644 --- a/internal/test/oats/redis/docker-compose-beyla-redis.yml +++ b/internal/test/oats/redis/docker-compose-beyla-redis.yml @@ -1,7 +1,7 @@ services: # Use postgres as a test SQL server redis: - image: redis:latest@sha256:acb90ced0bd769b7c04cb4c32c4494ba7b3e0ee068bdbfff0eeb0d31c2a21078 + image: redis:latest@sha256:3906b477e4b60250660573105110c28bfce93b01243eab37610a484daebceb04 ports: - "6379:6379" # Simple python HTTP server, which exposes one endpoint /query that does a few redis queries diff --git a/k8scache.Dockerfile b/k8scache.Dockerfile index 398263773d..8a659032d5 100644 --- a/k8scache.Dockerfile +++ b/k8scache.Dockerfile @@ -1,5 +1,5 @@ # Build the binary for the k8s-cache service -FROM golang:1.25.3 AS builder +FROM golang:1.25.4@sha256:698183780de28062f4ef46f82a79ec0ae69d2d22f7b160cf69f71ea8d98bf25d AS builder ARG TARGETARCH ENV GOARCH=$TARGETARCH