From 3cf1eccc8dc5cf508a80fa47a251236862221f4c Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Mon, 3 Mar 2025 14:49:30 -0500 Subject: [PATCH 01/18] chore(host_metrics source): ignore flakey tcp metrics tests (#22544) --- src/sources/host_metrics/tcp.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sources/host_metrics/tcp.rs b/src/sources/host_metrics/tcp.rs index 316d40d087930..c45eb164c11ba 100644 --- a/src/sources/host_metrics/tcp.rs +++ b/src/sources/host_metrics/tcp.rs @@ -273,6 +273,8 @@ mod tests { assert_eq!(*tcp_stats.conn_states.get("syn_recv").unwrap(), 1.0); } + #[ignore] + /// These tests are flakey and need reworking. /// This is a workaround for running these tests serially. /// The `generates_tcp_metrics` test internally calls `fetch_nl_inet_hdrs` and reads /// from the same socket as the `fetches_nl_net_hdrs` test. From e1dce44355c7dcf0b0d0880111a67f15b997b5d4 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Tue, 4 Mar 2025 09:36:01 -0500 Subject: [PATCH 02/18] fix(ci): `prepare.sh` should install the toolchain (#22572) * fix(ci): prepare.sh override toolchain not installed * update scripts/environment/bootstrap-ubuntu-24.04.sh * need path to be set first * toolchain install is equivalent but better * both scripts need to install, in case prepare.sh is not used, second call will return immediately * also fix 'Build VRL Playground' step * test vrl playground again * this works, move the playground step back to the bottom * add target required by k8s e2e workflow * fix macos: explicitly specify toolchain to install * fix exceptional case: msrv.yml * now that we moved the installation outside bootstrap-ubuntu-24.04, we can remove 'sudo -E' * we can now revert bootstrap-ubuntu-24.04.sh * try a new way to feed active toolchain to the install command --- .github/workflows/k8s_e2e.yml | 1 + .github/workflows/msrv.yml | 3 +++ .github/workflows/test.yml | 1 + scripts/environment/prepare.sh | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml index 70710521b4694..61cdd84090754 100644 --- a/.github/workflows/k8s_e2e.yml +++ b/.github/workflows/k8s_e2e.yml @@ -101,6 +101,7 @@ jobs: - run: sudo -E bash scripts/ci-free-disk-space.sh - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh - run: bash scripts/environment/prepare.sh + - run: ~/.cargo/bin/rustup target add x86_64-unknown-linux-gnu - run: echo "::add-matcher::.github/matchers/rust.json" - run: VECTOR_VERSION="$(cargo vdev version)" make package-deb-x86_64-unknown-linux-gnu diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index bad4f25cc7cab..18a70126da711 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -18,5 +18,8 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh + - run: | + # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain. + rustup show active-toolchain || rustup toolchain install - run: cargo install cargo-msrv --version 0.15.1 - run: cargo msrv verify diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f12aedad99ddd..c30215f33bf49 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -126,6 +126,7 @@ jobs: if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true' run: | cd lib/vector-vrl/web-playground/ + ~/.cargo/bin/rustup target add wasm32-unknown-unknown wasm-pack build --target web --out-dir public/pkg # This is a required status check, so it always needs to run if prior jobs failed, in order to mark the status correctly. diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh index ca8aff9c0d4ec..f7b0f2508516b 100755 --- a/scripts/environment/prepare.sh +++ b/scripts/environment/prepare.sh @@ -3,8 +3,8 @@ set -e -o verbose git config --global --add safe.directory /git/vectordotdev/vector -rustup show # causes installation of version from rust-toolchain.toml -rustup default "$(rustup show active-toolchain | awk '{print $1;}')" +rustup show active-toolchain || rustup toolchain install +rustup show if [[ "$(cargo-deb --version)" != "2.0.2" ]] ; then rustup run stable cargo install cargo-deb --version 2.0.0 --force --locked fi From 620ff9747c66a974b5145eb0d47561cf2b9ac463 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:49:54 +0000 Subject: [PATCH 03/18] chore(ci): Bump docker/setup-qemu-action from 3.4.0 to 3.6.0 (#22578) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.4.0 to 3.6.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v3.4.0...v3.6.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- .github/workflows/environment.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml index ddfe3c779fe0b..578076c61747e 100644 --- a/.github/workflows/environment.yml +++ b/.github/workflows/environment.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v3.4.0 + uses: docker/setup-qemu-action@v3.6.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.9.0 - name: Login to DockerHub diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a1c8b557b62ee..2a7318893a659 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -519,7 +519,7 @@ jobs: username: ${{ secrets.CI_DOCKER_USERNAME }} password: ${{ secrets.CI_DOCKER_PASSWORD }} - name: Set up QEMU - uses: docker/setup-qemu-action@v3.4.0 + uses: docker/setup-qemu-action@v3.6.0 with: platforms: all - name: Set up Docker Buildx From 4fdbe8e9dc5762388427abad39e7fc3c076c90db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:54:15 +0000 Subject: [PATCH 04/18] chore(ci): Bump docker/metadata-action from 5.6.1 to 5.7.0 (#22577) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5.6.1 to 5.7.0. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](https://github.com/docker/metadata-action/compare/369eb591f429131d6889c46b94e711f089e6ca96...902fa8ec7d6ecbf8d84d538b9b233a880e428804) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- .github/workflows/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml index 578076c61747e..7c3bbf0d15fd4 100644 --- a/.github/workflows/environment.yml +++ b/.github/workflows/environment.yml @@ -50,7 +50,7 @@ jobs: password: ${{ secrets.CI_DOCKER_PASSWORD }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 + uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 with: images: timberio/vector-dev flavor: | From 5ad8b89124a1a11b6d53d6cffa854f62c872cfaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:55:32 +0000 Subject: [PATCH 05/18] chore(ci): Bump docker/build-push-action from 6.13.0 to 6.15.0 (#22575) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.13.0 to 6.15.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.13.0...v6.15.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- .github/workflows/environment.yml | 2 +- .github/workflows/regression.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml index 7c3bbf0d15fd4..751a8a5d39e4d 100644 --- a/.github/workflows/environment.yml +++ b/.github/workflows/environment.yml @@ -62,7 +62,7 @@ jobs: org.opencontainers.image.title=Vector development environment org.opencontainers.image.url=https://github.com/vectordotdev/vector - name: Build and push - uses: docker/build-push-action@v6.13.0 + uses: docker/build-push-action@v6.15.0 with: context: . file: ./scripts/environment/Dockerfile diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 6103a0ff2bf58..1c32a4637eb02 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -204,7 +204,7 @@ jobs: uses: docker/setup-buildx-action@v3.9.0 - name: Build 'vector' target image - uses: docker/build-push-action@v6.13.0 + uses: docker/build-push-action@v6.15.0 with: context: baseline-vector/ cache-from: type=gha @@ -243,7 +243,7 @@ jobs: uses: docker/setup-buildx-action@v3.9.0 - name: Build 'vector' target image - uses: docker/build-push-action@v6.13.0 + uses: docker/build-push-action@v6.15.0 with: context: comparison-vector/ cache-from: type=gha From c6ee08ab33d1833fd0a982517d39af04f6d7944c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:56:37 +0000 Subject: [PATCH 06/18] chore(ci): Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#22574) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/v2.4.0...v2.4.1) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 472ed4e9ae07b..ba19d832ca3fb 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -37,7 +37,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@v2.4.0 + uses: ossf/scorecard-action@v2.4.1 with: results_file: results.sarif results_format: sarif From e5f1b1d26a525283e8746a62aaf465141bfeaa9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:02:40 +0000 Subject: [PATCH 07/18] chore(ci): Bump docker/setup-buildx-action from 3.9.0 to 3.10.0 (#22576) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- .github/workflows/environment.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/regression.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml index 751a8a5d39e4d..1132e6bded2d9 100644 --- a/.github/workflows/environment.yml +++ b/.github/workflows/environment.yml @@ -41,7 +41,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3.6.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.9.0 + uses: docker/setup-buildx-action@v3.10.0 - name: Login to DockerHub uses: docker/login-action@v3 if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2a7318893a659..9431a943971ce 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -524,7 +524,7 @@ jobs: platforms: all - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.9.0 + uses: docker/setup-buildx-action@v3.10.0 with: version: latest install: true diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 1c32a4637eb02..ff572af0063de 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -201,7 +201,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.9.0 + uses: docker/setup-buildx-action@v3.10.0 - name: Build 'vector' target image uses: docker/build-push-action@v6.15.0 @@ -240,7 +240,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.9.0 + uses: docker/setup-buildx-action@v3.10.0 - name: Build 'vector' target image uses: docker/build-push-action@v6.15.0 From d39ca7386d98fbf914da6aa71406015bcfc38460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 4 Mar 2025 17:12:49 +0100 Subject: [PATCH 08/18] docs(external): add missing Quad9 credits in previous releases (#22569) chore(docs): add missing Quad9 credits in previous releases This adds missing Quad9 credits in my PRs from previous releases, because that work was sponsored by Quad9. Co-authored-by: Pavlos Rontidis --- website/cue/reference/releases/0.36.0.cue | 2 +- website/cue/reference/releases/0.37.0.cue | 12 ++++++------ website/cue/reference/releases/0.37.1.cue | 2 +- website/cue/reference/releases/0.38.0.cue | 2 +- website/cue/reference/releases/0.41.0.cue | 2 +- website/cue/reference/releases/0.42.0.cue | 4 ++-- website/cue/reference/releases/0.43.0.cue | 2 +- website/cue/reference/releases/0.44.0.cue | 2 +- website/cue/reference/releases/0.45.0.cue | 10 +++++----- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/website/cue/reference/releases/0.36.0.cue b/website/cue/reference/releases/0.36.0.cue index 70c1710764147..70817f6770fff 100644 --- a/website/cue/reference/releases/0.36.0.cue +++ b/website/cue/reference/releases/0.36.0.cue @@ -138,7 +138,7 @@ releases: "0.36.0": { description: """ Added support for parsing HTTPS (type 65) and SVCB (type 64) resource records from DNS messages """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "fix" diff --git a/website/cue/reference/releases/0.37.0.cue b/website/cue/reference/releases/0.37.0.cue index c4f21e50c0d99..31963f2dee974 100644 --- a/website/cue/reference/releases/0.37.0.cue +++ b/website/cue/reference/releases/0.37.0.cue @@ -76,21 +76,21 @@ releases: "0.37.0": { description: """ Added support for TCP mode for DNSTAP source. As the `dnstap` source now supports multiple socket types, you will need to update your configuration to specify which type - either `mode: unix` for the existing unix sockets mode or `mode: tcp` for the new tcp mode. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" description: """ Added support for more DNS record types (HINFO, CSYNC, OPT, DNSSEC CDS, DNSSEC CDNSKEY, DNSSEC KEY) """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" description: """ Added support for parsing EDNS EDE (Extended DNS errors) options """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" @@ -112,14 +112,14 @@ releases: "0.37.0": { Added `lowercase_hostnames` option to `dnstap` source, to filter hostnames in DNS records and lowercase them for consistency. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" description: """ Added support for `permit_origin` config option for all sources with TCP mode (`fluent`, `logstash`, `statsd`, `syslog`). """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" @@ -128,7 +128,7 @@ releases: "0.37.0": { City type for unknown types and will instead return an error. New MMDB enrichment table should be used for such types. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "chore" diff --git a/website/cue/reference/releases/0.37.1.cue b/website/cue/reference/releases/0.37.1.cue index b2c3627c0c9f0..8d9860a848ffa 100644 --- a/website/cue/reference/releases/0.37.1.cue +++ b/website/cue/reference/releases/0.37.1.cue @@ -20,7 +20,7 @@ releases: "0.37.1": { description: """ Fixed an issue where `GeoLite2-City` MMDB database type was not supported. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, ] diff --git a/website/cue/reference/releases/0.38.0.cue b/website/cue/reference/releases/0.38.0.cue index d51a719fb6ccd..73d43df4900b6 100644 --- a/website/cue/reference/releases/0.38.0.cue +++ b/website/cue/reference/releases/0.38.0.cue @@ -46,7 +46,7 @@ releases: "0.38.0": { description: """ Support was added for additional config options for `length_delimited` framing. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" diff --git a/website/cue/reference/releases/0.41.0.cue b/website/cue/reference/releases/0.41.0.cue index 96a20999f431d..0b3d972f84743 100644 --- a/website/cue/reference/releases/0.41.0.cue +++ b/website/cue/reference/releases/0.41.0.cue @@ -94,7 +94,7 @@ releases: "0.41.0": { description: """ A new `static_metrics` source was added. This source periodically emits preconfigured values. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "fix" diff --git a/website/cue/reference/releases/0.42.0.cue b/website/cue/reference/releases/0.42.0.cue index 1166075226821..cb1ee2490087f 100644 --- a/website/cue/reference/releases/0.42.0.cue +++ b/website/cue/reference/releases/0.42.0.cue @@ -42,7 +42,7 @@ releases: "0.42.0": { description: """ Adds more aggregations to `aggregate` transform: count, diff, max, min, mean, sum, latest and stdev. The current aggregation is named `auto` and is made the default (acts like a combination of `sum` and `latest`). """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" @@ -63,7 +63,7 @@ releases: "0.42.0": { description: """ Adds support for additional `graph` configuration on each component so that users can add arbitrary graphviz node attributes when generating a graph through `vector graph`. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" diff --git a/website/cue/reference/releases/0.43.0.cue b/website/cue/reference/releases/0.43.0.cue index d7f2166848862..e6f4f04678355 100644 --- a/website/cue/reference/releases/0.43.0.cue +++ b/website/cue/reference/releases/0.43.0.cue @@ -174,7 +174,7 @@ releases: "0.43.0": { description: """ The `dnstap` source now supports decoding of EDE code 30 (Invalid Query Type) (added in [Compact Denial of Existence in DNSSEC](https://datatracker.ietf.org/doc/draft-ietf-dnsop-compact-denial-of-existence/04/)) and has the correct `purpose` attached to it. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" diff --git a/website/cue/reference/releases/0.44.0.cue b/website/cue/reference/releases/0.44.0.cue index 17386c945eb38..e10d28e400239 100644 --- a/website/cue/reference/releases/0.44.0.cue +++ b/website/cue/reference/releases/0.44.0.cue @@ -97,7 +97,7 @@ releases: "0.44.0": { description: """ Add VRL function `parse_dnstap` that can parse dnstap data and produce output in the same format as `dnstap` source. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "enhancement" diff --git a/website/cue/reference/releases/0.45.0.cue b/website/cue/reference/releases/0.45.0.cue index 94226e17ff325..39ac5a9fbd306 100644 --- a/website/cue/reference/releases/0.45.0.cue +++ b/website/cue/reference/releases/0.45.0.cue @@ -81,7 +81,7 @@ releases: "0.45.0": { Add a new type of `enrichment_table` - `memory`, which can also act as a sink, ingesting all the data and storing it per key, enabling it to be read from all other enrichment tables. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" @@ -120,14 +120,14 @@ releases: "0.45.0": { description: """ The `tag_cardinality_limit` transform now supports customizing limits for specific metrics, matched by metric name and optionally, its namespace. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" description: """ Add `websocket_server` sink that acts as a websocket server and broadcasts events to all clients. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "feat" @@ -137,7 +137,7 @@ releases: "0.45.0": { You can read more in this [how it works](/docs/reference/configuration/sources/http_server/#authorization-configuration) section. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "fix" @@ -151,7 +151,7 @@ releases: "0.45.0": { description: """ The `dnstap` source now uses [v20250201](https://github.com/dnstap/dnstap.pb/releases/tag/v20250201) dnstap protobuf schema. """ - contributors: ["esensar"] + contributors: ["esensar", "Quad9DNS"] }, { type: "fix" From 30995ea87315acaf57b6f1dcfe8ffd1462d104b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 4 Mar 2025 17:13:18 +0100 Subject: [PATCH 09/18] docs(external): add missing Quad9 credits in changelog entries (#22568) chore(docs): add missing Quad9 credits in changelog entries This adds missing Quad9 credits in my recently merged PRs, because that work was sponsored by Quad9. Co-authored-by: Pavlos Rontidis --- changelog.d/22479_websocket_server_sink_buffering.feature.md | 2 +- changelog.d/22528_enrichment_panic.fix.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.d/22479_websocket_server_sink_buffering.feature.md b/changelog.d/22479_websocket_server_sink_buffering.feature.md index 6024d71d4820d..c90d89f9736cb 100644 --- a/changelog.d/22479_websocket_server_sink_buffering.feature.md +++ b/changelog.d/22479_websocket_server_sink_buffering.feature.md @@ -1,4 +1,4 @@ Add message buffering feature to `websocket_server` sink, that enables replaying missed messages to newly connected clients. -authors: esensar +authors: esensar Quad9DNS diff --git a/changelog.d/22528_enrichment_panic.fix.md b/changelog.d/22528_enrichment_panic.fix.md index f827a6c1a9186..89645e2ad5ede 100644 --- a/changelog.d/22528_enrichment_panic.fix.md +++ b/changelog.d/22528_enrichment_panic.fix.md @@ -1,3 +1,3 @@ Prevent panic when an enrichment table has the same name as one of components. -authors: esensar +authors: esensar Quad9DNS From faab8586d7dad34035bae1f764f6e9882ec504eb Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Tue, 4 Mar 2025 11:14:03 -0500 Subject: [PATCH 10/18] chore(ci): delete unused script (#22583) --- scripts/ensure-wasm-pack-installed.sh | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 scripts/ensure-wasm-pack-installed.sh diff --git a/scripts/ensure-wasm-pack-installed.sh b/scripts/ensure-wasm-pack-installed.sh deleted file mode 100755 index 5cedc1e445bb7..0000000000000 --- a/scripts/ensure-wasm-pack-installed.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /usr/bin/env bash - -if [[ "$(wasm-pack --version)" != "wasm-pack 0.13.0" ]] ; then - echo "wasm-pack version 0.13.0 is not installed" - # We are using the version from git due to the bug: https://github.com/vectordotdev/vector/pull/16060#issuecomment-1428429602 - echo "running cargo install --git https://github.com/rustwasm/wasm-pack.git --rev e3582b7 wasm-pack" - cargo install --git https://github.com/rustwasm/wasm-pack.git --rev e3582b7 wasm-pack -else - echo "wasm-pack version 0.13.0 is installed already" -fi - -brew install llvm -export PATH="/opt/homebrew/opt/llvm/bin:$PATH" From c3d0f080af57f7da950d335e0b16925decfcb28c Mon Sep 17 00:00:00 2001 From: Shin Seunghun <36041278+seunghunee@users.noreply.github.com> Date: Wed, 5 Mar 2025 01:20:17 +0900 Subject: [PATCH 11/18] docs(internal docs): Fix dead link on commit sub-categories (#22520) Co-authored-by: Pavlos Rontidis --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d15a6dbdcc26b..a02ba70d8bc5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,7 +131,7 @@ format. Vector performs a pull request check to verify the pull request title in case you forget. A list of allowed sub-categories is defined -[here](https://github.com/vectordotdev/vector/blob/master/.github/semantic.yml#L21). +[here](https://github.com/vectordotdev/vector/blob/master/.github/workflows/semantic.yml#L21). The following are all good examples of pull request titles: From 09d795a4c64dc7f4537da738e9e01a960bffddd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:59:39 +0000 Subject: [PATCH 12/18] chore(deps): Bump similar-asserts from 1.6.1 to 1.7.0 (#22562) Bumps [similar-asserts](https://github.com/mitsuhiko/similar-asserts) from 1.6.1 to 1.7.0. - [Changelog](https://github.com/mitsuhiko/similar-asserts/blob/main/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/similar-asserts/compare/1.6.1...1.7.0) --- updated-dependencies: - dependency-name: similar-asserts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- lib/codecs/Cargo.toml | 2 +- lib/file-source/Cargo.toml | 2 +- lib/vector-core/Cargo.toml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff35eeb86edca..0e9b24f3f0d63 100644 --- a/Cargo.lock +++ b/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 = "Inflector" @@ -4594,7 +4594,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.8", "tokio", "tower-service", "tracing 0.1.41", @@ -6237,7 +6237,7 @@ dependencies = [ [[package]] name = "nix" version = "0.26.2" -source = "git+https://github.com/vectordotdev/nix.git?branch=memfd/gnu/musl#6c53a918d2d5bf4307fd60a19d9e10913ae71eeb" +source = "git+https://github.com/vectordotdev/nix.git?branch=memfd%2Fgnu%2Fmusl#6c53a918d2d5bf4307fd60a19d9e10913ae71eeb" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -7642,7 +7642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2 1.0.93", "quote 1.0.38", "syn 2.0.98", @@ -9256,9 +9256,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f08357795f0d604ea7d7130f22c74b03838c959bdb14adde3142aab4d18a293" +checksum = "b5b441962c817e33508847a22bd82f03a30cff43642dc2fae8b050566121eb9a" dependencies = [ "console", "similar", diff --git a/Cargo.toml b/Cargo.toml index e40f5bb0baaad..42478a3b90c65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -425,7 +425,7 @@ base64 = "0.22.1" criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] } libc = "0.2.170" -similar-asserts = "1.6.1" +similar-asserts = "1.7.0" proptest.workspace = true quickcheck = "1.0.3" reqwest = { version = "0.11", features = ["json"] } diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index e24f7855a996d..c078036928a9b 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -44,7 +44,7 @@ vector-core = { path = "../vector-core", default-features = false, features = [" futures.workspace = true indoc = { version = "2", default-features = false } tokio = { version = "1", features = ["test-util"] } -similar-asserts = "1.6.1" +similar-asserts = "1.7.0" vector-core = { path = "../vector-core", default-features = false, features = ["vrl", "test"] } rstest = "0.24.0" tracing-test = "0.2.5" diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml index 7292ec3f46803..dff4f30e9ad1d 100644 --- a/lib/file-source/Cargo.toml +++ b/lib/file-source/Cargo.toml @@ -76,7 +76,7 @@ features = ["full"] criterion = "0.5" quickcheck = "1" tempfile.workspace = true -similar-asserts = "1.6.1" +similar-asserts = "1.7.0" [[bench]] name = "buffer" diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index 6645b0f114e33..2e6808ec1222d 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -83,7 +83,7 @@ env-test-util = "1.0.1" quickcheck = "1" quickcheck_macros = "1" proptest = "1.6" -similar-asserts = "1.6.1" +similar-asserts = "1.7.0" tokio-test = "0.4.4" toml.workspace = true ndarray = "0.16.1" From a698327ccce69f13e638f73aa67d47233656f252 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:05:39 +0000 Subject: [PATCH 13/18] chore(deps): Bump owo-colors from 4.1.0 to 4.2.0 (#22565) * chore(deps): Bump owo-colors from 4.1.0 to 4.2.0 Bumps [owo-colors](https://github.com/owo-colors/owo-colors) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/owo-colors/owo-colors/releases) - [Changelog](https://github.com/owo-colors/owo-colors/blob/main/CHANGELOG.md) - [Commits](https://github.com/owo-colors/owo-colors/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: owo-colors dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * dd-rust-license-tool write --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- Cargo.lock | 4 ++-- LICENSE-3rdparty.csv | 2 +- vdev/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e9b24f3f0d63..88a07b8cf64b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6831,9 +6831,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" +checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" dependencies = [ "supports-color 2.1.0", "supports-color 3.0.1", diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index cea0de21679a8..9c9de422bd1b4 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -430,7 +430,7 @@ openssl-sys,https://github.com/sfackler/rust-openssl,MIT,"Alex Crichton , Matt Brubeck " outref,https://github.com/Nugine/outref,MIT,The outref Authors overload,https://github.com/danaugrs/overload,MIT,Daniel Salvadori -owo-colors,https://github.com/jam1garner/owo-colors,MIT,jam1garner <8260240+jam1garner@users.noreply.github.com> +owo-colors,https://github.com/owo-colors/owo-colors,MIT,jam1garner <8260240+jam1garner@users.noreply.github.com> p256,https://github.com/RustCrypto/elliptic-curves/tree/master/p256,Apache-2.0 OR MIT,RustCrypto Developers p384,https://github.com/RustCrypto/elliptic-curves/tree/master/p384,Apache-2.0 OR MIT,"RustCrypto Developers, Frank Denis " pad,https://github.com/ogham/rust-pad,MIT,Ben S diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml index 0c34448a4d532..3bb2931c0b937 100644 --- a/vdev/Cargo.toml +++ b/vdev/Cargo.toml @@ -24,7 +24,7 @@ indicatif = { version = "0.17.11", features = ["improved_unicode"] } itertools = "0.14.0" log = "0.4.26" # watch https://github.com/epage/anstyle for official interop with Clap -owo-colors = { version = "4.1.0", features = ["supports-colors"] } +owo-colors = { version = "4.2.0", features = ["supports-colors"] } paste = "1.0.15" regex = { version = "1.11.1", default-features = false, features = ["std", "perf"] } reqwest = { version = "0.11", features = ["json", "blocking"] } From 1dcc0df4e303994d7ff6ea686fc42040cd1224c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:39:27 +0000 Subject: [PATCH 14/18] chore(deps): Bump bytesize from 1.3.2 to 2.0.1 (#22563) * chore(deps): Bump bytesize from 1.3.2 to 2.0.1 Bumps [bytesize](https://github.com/bytesize-rs/bytesize) from 1.3.2 to 2.0.1. - [Release notes](https://github.com/bytesize-rs/bytesize/releases) - [Changelog](https://github.com/bytesize-rs/bytesize/blob/master/CHANGELOG.md) - [Commits](https://github.com/bytesize-rs/bytesize/compare/v1.3.2...bytesize-v2.0.1) --- updated-dependencies: - dependency-name: bytesize dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * dd-rust-license-tool write --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- LICENSE-3rdparty.csv | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88a07b8cf64b4..59666d06ab9c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1938,9 +1938,9 @@ dependencies = [ [[package]] name = "bytesize" -version = "1.3.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2c12f985c78475a6b8d629afd0c360260ef34cfef52efccdcfd31972f81c2e" +checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba" [[package]] name = "cargo-lock" diff --git a/Cargo.toml b/Cargo.toml index 42478a3b90c65..07fefec18abfd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -306,7 +306,7 @@ base64 = { version = "0.22.1", default-features = false, optional = true } bloomy = { version = "1.2.0", default-features = false, optional = true } bollard = { version = "0.16.1", default-features = false, features = ["ssl", "chrono"], optional = true } bytes = { version = "1.10.0", default-features = false, features = ["serde"] } -bytesize = { version = "1.3.2", default-features = false } +bytesize = { version = "2.0.1", default-features = false } chrono.workspace = true chrono-tz.workspace = true colored = { version = "3.0.0", default-features = false } diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 9c9de422bd1b4..a63d4905d6c9a 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -115,7 +115,7 @@ byteorder,https://github.com/BurntSushi/byteorder,Unlicense OR MIT,Andrew Gallan bytes,https://github.com/carllerche/bytes,MIT,Carl Lerche bytes,https://github.com/tokio-rs/bytes,MIT,"Carl Lerche , Sean McArthur " bytes-utils,https://github.com/vorner/bytes-utils,Apache-2.0 OR MIT,Michal 'vorner' Vaner -bytesize,https://github.com/bytesize-rs/bytesize,Apache-2.0,Hyunsik Choi +bytesize,https://github.com/bytesize-rs/bytesize,Apache-2.0,"Hyunsik Choi , MrCroxx , Rob Ede " cassowary,https://github.com/dylanede/cassowary-rs,MIT OR Apache-2.0,Dylan Ede castaway,https://github.com/sagebind/castaway,MIT,Stephen M. Coakley cbc,https://github.com/RustCrypto/block-modes,MIT OR Apache-2.0,RustCrypto Developers From 5b7c485e290a57142bca2925b9a42ad4e1c2c4dd Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Tue, 4 Mar 2025 17:41:43 -0500 Subject: [PATCH 15/18] chore(dev): cargo update -p vrl (#22591) * chore(dev): cargo update -p vrl * dd-rust-license-tool write --- Cargo.lock | 99 ++------------------------------------------ LICENSE-3rdparty.csv | 4 -- 2 files changed, 4 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 59666d06ab9c5..9a160cf32200c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1779,30 +1779,6 @@ dependencies = [ "serde_with 3.12.0", ] -[[package]] -name = "borsh" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" -dependencies = [ - "borsh-derive", - "cfg_aliases 0.1.1", -] - -[[package]] -name = "borsh-derive" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" -dependencies = [ - "once_cell", - "proc-macro-crate 2.0.0", - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.98", - "syn_derive", -] - [[package]] name = "brotli" version = "7.0.0" @@ -2016,12 +1992,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -4594,7 +4564,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.8", + "socket2 0.4.10", "tokio", "tower-service", "tracing 0.1.41", @@ -6254,7 +6224,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.8.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", ] @@ -7399,15 +7369,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -7417,29 +7378,6 @@ dependencies = [ "toml_edit 0.22.23", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2 1.0.93", - "quote 1.0.38", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -7642,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.10.5", "proc-macro2 1.0.93", "quote 1.0.38", "syn 2.0.98", @@ -8523,13 +8461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", - "borsh", - "bytes 1.10.0", "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", ] [[package]] @@ -9611,18 +9543,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.98", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -10176,17 +10096,6 @@ dependencies = [ "winnow 0.5.18", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.7.1", - "toml_datetime", - "winnow 0.5.18", -] - [[package]] name = "toml_edit" version = "0.22.23" @@ -11517,7 +11426,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" version = "0.22.0" -source = "git+https://github.com/vectordotdev/vrl?branch=main#37f4dc7e88cf6fc81d9b29823cdaaa7cc99dd367" +source = "git+https://github.com/vectordotdev/vrl?branch=main#2d5e2dfb28ad22c2f659099f3d7869954f4a6be3" dependencies = [ "aes", "aes-siv", diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index a63d4905d6c9a..52b29cc6d6d92 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -102,8 +102,6 @@ block-padding,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto D blocking,https://github.com/smol-rs/blocking,Apache-2.0 OR MIT,Stjepan Glavina bloomy,https://docs.rs/bloomy/,MIT,"Aleksandr Bezobchuk , Alexis Sellier " bollard,https://github.com/fussybeaver/bollard,Apache-2.0,Bollard contributors -borsh,https://github.com/near/borsh-rs,MIT OR Apache-2.0,Near Inc -borsh-derive,https://github.com/nearprotocol/borsh,Apache-2.0,Near Inc brotli,https://github.com/dropbox/rust-brotli,BSD-3-Clause AND MIT,"Daniel Reiter Horn , The Brotli Authors" brotli-decompressor,https://github.com/dropbox/rust-brotli-decompressor,BSD-3-Clause OR MIT,"Daniel Reiter Horn , The Brotli Authors" bson,https://github.com/mongodb/bson-rust,MIT,"Y. T. Chung , Kevin Yeh , Saghm Rossi , Patrick Freed , Isabel Atkinson , Abraham Egnor " @@ -467,7 +465,6 @@ prettydiff,https://github.com/romankoblov/prettydiff,MIT,Roman Koblov -proc-macro-error,https://gitlab.com/CreepySkeleton/proc-macro-error,MIT OR Apache-2.0,CreepySkeleton proc-macro-error-attr2,https://github.com/GnomedDev/proc-macro-error-2,MIT OR Apache-2.0,"CreepySkeleton , GnomedDev " proc-macro-error2,https://github.com/GnomedDev/proc-macro-error-2,MIT OR Apache-2.0,"CreepySkeleton , GnomedDev " proc-macro-hack,https://github.com/dtolnay/proc-macro-hack,MIT OR Apache-2.0,David Tolnay @@ -606,7 +603,6 @@ strum,https://github.com/Peternator7/strum,MIT,Peter Glotfelty , Henry de Valence " supports-color,https://github.com/zkat/supports-color,Apache-2.0,Kat Marchán syn,https://github.com/dtolnay/syn,MIT OR Apache-2.0,David Tolnay -syn_derive,https://github.com/Kyuuhachi/syn_derive,MIT OR Apache-2.0,Kyuuhachi sync_wrapper,https://github.com/Actyx/sync_wrapper,Apache-2.0,Actyx AG synstructure,https://github.com/mystor/synstructure,MIT,Nika Layzell sysinfo,https://github.com/GuillaumeGomez/sysinfo,MIT,Guillaume Gomez From 9fd77616b687c7a49472a6b95eecc26eae69fb7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:48:17 +0000 Subject: [PATCH 16/18] chore(deps): Bump the patches group with 7 updates (#22551) Bumps the patches group with 7 updates: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.30` | `4.5.31` | | [prost-reflect](https://github.com/andrewhickman/prost-reflect) | `0.14.6` | `0.14.7` | | [async-compression](https://github.com/Nullus157/async-compression) | `0.4.18` | `0.4.20` | | [chrono](https://github.com/chronotope/chrono) | `0.4.39` | `0.4.40` | | [typetag](https://github.com/dtolnay/typetag) | `0.2.19` | `0.2.20` | | [wiremock](https://github.com/LukeMathWalker/wiremock-rs) | `0.6.2` | `0.6.3` | | [clap_complete](https://github.com/clap-rs/clap) | `4.5.45` | `4.5.46` | Updates `clap` from 4.5.30 to 4.5.31 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.30...v4.5.31) Updates `prost-reflect` from 0.14.6 to 0.14.7 - [Changelog](https://github.com/andrewhickman/prost-reflect/blob/main/CHANGELOG.md) - [Commits](https://github.com/andrewhickman/prost-reflect/commits) Updates `async-compression` from 0.4.18 to 0.4.20 - [Release notes](https://github.com/Nullus157/async-compression/releases) - [Changelog](https://github.com/Nullus157/async-compression/blob/main/CHANGELOG.md) - [Commits](https://github.com/Nullus157/async-compression/compare/v0.4.18...v0.4.20) Updates `chrono` from 0.4.39 to 0.4.40 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.39...v0.4.40) Updates `typetag` from 0.2.19 to 0.2.20 - [Release notes](https://github.com/dtolnay/typetag/releases) - [Commits](https://github.com/dtolnay/typetag/compare/0.2.19...0.2.20) Updates `wiremock` from 0.6.2 to 0.6.3 - [Changelog](https://github.com/LukeMathWalker/wiremock-rs/blob/main/CHANGELOG.md) - [Commits](https://github.com/LukeMathWalker/wiremock-rs/compare/v0.6.2...v0.6.3) Updates `clap_complete` from 4.5.45 to 4.5.46 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.45...clap_complete-v4.5.46) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: prost-reflect dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: async-compression dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: typetag dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: wiremock dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patches ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlos Rontidis --- Cargo.lock | 44 +++++++++++++++++++++++++------------------- Cargo.toml | 10 +++++----- vdev/Cargo.toml | 2 +- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a160cf32200c..71a3c073c552a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +checksum = "310c9bcae737a48ef5cdee3174184e6d548b292739ede61a1f955ef76a738861" dependencies = [ "brotli", "flate2", @@ -2034,9 +2034,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2044,7 +2044,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -2126,9 +2126,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.30" +version = "4.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d" +checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" dependencies = [ "clap_builder", "clap_derive", @@ -2146,9 +2146,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.30" +version = "4.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c" +checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" dependencies = [ "anstream", "anstyle", @@ -2159,9 +2159,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.45" +version = "4.5.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3040c8291884ddf39445dc033c70abc2bc44a42f0a3a00571a0f483a83f0cd" +checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98" dependencies = [ "clap", ] @@ -7588,9 +7588,9 @@ dependencies = [ [[package]] name = "prost-reflect" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b318f733603136dcc61aa9e77c928d67f87d2436c34ec052ba3f1b5ca219de" +checksum = "7b5edd582b62f5cde844716e66d92565d7faf7ab1445c8cebce6e00fba83ddb2" dependencies = [ "base64 0.22.1", "once_cell", @@ -10594,9 +10594,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e" +checksum = "73f22b40dd7bfe8c14230cf9702081366421890435b2d625fa92b4acc4c3de6f" dependencies = [ "erased-serde", "inventory", @@ -10607,9 +10607,9 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc" +checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952" dependencies = [ "proc-macro2 1.0.93", "quote 1.0.38", @@ -11908,6 +11908,12 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "windows-link" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" + [[package]] name = "windows-result" version = "0.1.2" @@ -12182,9 +12188,9 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" +checksum = "101681b74cd87b5899e87bcf5a64e83334dd313fcd3053ea72e6dba18928e301" dependencies = [ "assert-json-diff", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 07fefec18abfd..0963bb6c7c711 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,9 +136,9 @@ members = [ [workspace.dependencies] anyhow = "1.0.96" cfg-if = { version = "1.0.0", default-features = false } -chrono = { version = "0.4.39", default-features = false, features = ["clock", "serde"] } +chrono = { version = "0.4.40", default-features = false, features = ["clock", "serde"] } chrono-tz = { version = "0.10.1", default-features = false, features = ["serde"] } -clap = { version = "4.5.30", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] } +clap = { version = "4.5.31", default-features = false, features = ["derive", "error-context", "env", "help", "std", "string", "usage", "wrap_help"] } flate2 = { version = "1.0.35", default-features = false, features = ["default"] } futures = { version = "0.3.31", default-features = false, features = ["compat", "io-compat", "std"], package = "futures" } glob = { version = "0.3.2", default-features = false } @@ -299,7 +299,7 @@ greptimedb-ingester = { git = "https://github.com/GreptimeTeam/greptimedb-ingest # External libs arc-swap = { version = "1.7", default-features = false, optional = true } -async-compression = { version = "0.4.18", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true } +async-compression = { version = "0.4.20", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true } apache-avro = { version = "0.16.0", default-features = false, optional = true } axum = { version = "0.6.20", default-features = false } base64 = { version = "0.22.1", default-features = false, optional = true } @@ -380,7 +380,7 @@ toml.workspace = true tonic = { workspace = true, optional = true } hickory-proto = { workspace = true, optional = true } thread_local = { version = "1.1.8", default-features = false, optional = true } -typetag = { version = "0.2.19", default-features = false } +typetag = { version = "0.2.20", default-features = false } url = { version = "2.5.4", default-features = false, features = ["serde"] } warp = { version = "0.3.7", default-features = false } zstd = { version = "0.13.0", default-features = false } @@ -438,7 +438,7 @@ tower-test = "0.4.0" vector-lib = { workspace = true, features = ["test"] } vrl.workspace = true -wiremock = "0.6.2" +wiremock = "0.6.3" zstd = { version = "0.13.0", default-features = false } [patch.crates-io] diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml index 3bb2931c0b937..bcc03582541ca 100644 --- a/vdev/Cargo.toml +++ b/vdev/Cargo.toml @@ -12,7 +12,7 @@ anyhow.workspace = true chrono.workspace = true clap.workspace = true clap-verbosity-flag = "3.0.2" -clap_complete = "4.5.45" +clap_complete = "4.5.46" confy = "0.6.1" directories = "6.0.0" # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html From d0d770fbae5106511c1c88852599c82cdfcf32df Mon Sep 17 00:00:00 2001 From: Devin Ford Date: Wed, 5 Mar 2025 09:15:19 -0500 Subject: [PATCH 17/18] fix(website): Update permissions and revert id call (#22580) * feat: update permissions, fix calls * chore: fix formatting * chore: more fmt fixes * chore: finalize formatting... --------- Co-authored-by: Pavlos Rontidis --- .github/workflows/build_preview_sites.yml | 1 + .github/workflows/create_preview_sites.yml | 275 +++++++++++---------- 2 files changed, 151 insertions(+), 125 deletions(-) diff --git a/.github/workflows/build_preview_sites.yml b/.github/workflows/build_preview_sites.yml index ea3c8b203529b..aa802412e0e7c 100644 --- a/.github/workflows/build_preview_sites.yml +++ b/.github/workflows/build_preview_sites.yml @@ -7,6 +7,7 @@ on: - completed permissions: + actions: read issues: write pull-requests: write statuses: write diff --git a/.github/workflows/create_preview_sites.yml b/.github/workflows/create_preview_sites.yml index 9d7b02f812f24..cd943c5f4f8be 100644 --- a/.github/workflows/create_preview_sites.yml +++ b/.github/workflows/create_preview_sites.yml @@ -26,134 +26,159 @@ permissions: issues: write pull-requests: write statuses: write + actions: read jobs: create_preview_site: runs-on: ubuntu-24.04 timeout-minutes: 5 steps: - - # Get the artifacts with the PR number and branch name - - name: Download artifact - uses: actions/github-script@v7.0.1 - with: - script: | - const fs = require('fs'); - const artifacts = await github.rest.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: context.runId, - }); - const matchArtifact = artifacts.data.artifacts.filter(artifact => artifact.name == "pr")[0]; - const download = await github.rest.actions.downloadArtifact({ - owner: context.repo.owner, - repo: context.repo.repo, - artifact_id: matchArtifact.id, - archive_format: 'zip', - }); - fs.writeFileSync('${{ github.workspace }}/pr.zip', Buffer.from(download.data)); - - # Extract the info from the artifact and set variables - - name: Extract PR info from artifact - uses: actions/github-script@v7.0.1 - with: - script: | - const fs = require('fs'); - const { execSync } = require('child_process'); - const path = require('path'); - const core = require('@actions/core'); - - execSync('unzip pr.zip -d pr'); - const branchName = fs.readFileSync(path.join('pr', 'branch'), 'utf8').trim(); - const prNumber = fs.readFileSync(path.join('pr', 'number'), 'utf8').trim(); - const integrity = fs.readFileSync(path.join('pr', 'integrity'), 'utf8').trim(); - - // Validate branch name again (only allow alphanumeric, dash, and underscore) - const branchNameRegex = /^[a-zA-Z0-9_\-]+$/; - if (!branchNameRegex.test(branchName)) { - core.setFailed(`Invalid branch name detected: ${branchName}`); - return; - } - - const sanitizedBranchName = branchName.replace(/[\/\.]/g, '-'); - core.exportVariable('SANITIZED_BRANCH_NAME', sanitizedBranchName); - core.exportVariable('BRANCH_NAME', branchName); - core.exportVariable('PR_NUMBER', prNumber); - core.exportVariable('INTEGRITY', integrity); - - # Validate the integrity of the artifact - - name: Validate Artifact Integrity - uses: actions/github-script@v7.0.1 - with: - script: | - const crypto = require('crypto'); - const core = require('@actions/core'); - - const prNumber = process.env.PR_NUMBER; - const branchName = process.env.BRANCH_NAME; - const integrity = process.env.INTEGRITY; - - const numberHash = crypto.createHash('sha256').update(prNumber).digest('hex'); - const branchHash = crypto.createHash('sha256').update(branchName).digest('hex'); - const expectedIntegrity = `${numberHash}:${branchHash}`; - - if (expectedIntegrity !== integrity) { - core.setFailed('Artifact integrity validation failed'); - } - - # Kick off the job in amplify - - name: Deploy Site - uses: actions/github-script@v7.0.1 - with: - script: | - const crypto = require('crypto'); - const fetch = require('node-fetch'); - const core = require('@actions/core'); - - const appId = core.getInput('APP_ID'); - const appName = core.getInput('APP_NAME'); - const requestToken = core.getSecret('REQUEST_TOKEN'); - const requestMessage = core.getSecret('REQUEST_MESSAGE'); - const endpoint = core.getSecret('ENDPOINT'); - const sanitizedBranchName = process.env.SANITIZED_BRANCH_NAME; - - const hmacKey = crypto.createHmac('sha256', requestToken).update(requestMessage).digest('hex'); - const signature = `sha256=${hmacKey}`; - - const response = await fetch(endpoint, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-Hub-Signature': signature, - }, - body: JSON.stringify({ - app_id: appId, - branch_name: sanitizedBranchName, - }), - }); - - if (!response.ok) { - core.setFailed(`Request failed with response code ${response.status}`); - } - - # Add preview link to comment if all 3 sites successfully start - - name: Comment Preview Link - if: success() - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - APP_ID: ${{ inputs.APP_ID }} - APP_NAME: ${{ inputs.APP_NAME }} - uses: actions/github-script@v7.0.1 - with: - script: | - const fs = require('fs'); - const prNumber = fs.readFileSync('./pr/number', 'utf8'); - const issueNumber = parseInt(prNumber); - const { APP_ID, APP_NAME, SANITIZED_BRANCH_NAME } = process.env; - - await github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: issueNumber, - body: `Your preview site for the **${APP_NAME}** will be ready in a few minutes, please allow time for it to build. \n \n Heres your preview link: \n [${APP_NAME} preview](https://${SANITIZED_BRANCH_NAME}.${APP_ID}.amplifyapp.com)` - }); + # Get the artifacts with the PR number and branch name + - name: Download artifact + uses: actions/github-script@v7.0.1 + with: + script: | + const fs = require('fs'); + const artifacts = await github.rest.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{ github.event.workflow_run.id }}, + }); + const matchArtifact = artifacts.data.artifacts.filter(artifact => artifact.name == "pr")[0]; + const download = await github.rest.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: 'zip', + }); + fs.writeFileSync('${{ github.workspace }}/pr.zip', Buffer.from(download.data)); + + # Extract the info from the artifact and set variables + - name: Extract PR info from artifact + uses: actions/github-script@v7.0.1 + with: + script: | + const fs = require('fs'); + const { execSync } = require('child_process'); + const path = require('path'); + + execSync('unzip pr.zip -d pr'); + const branchName = fs.readFileSync(path.join('pr', 'branch'), 'utf8').trim(); + const prNumber = fs.readFileSync(path.join('pr', 'number'), 'utf8').trim(); + const integrity = fs.readFileSync(path.join('pr', 'integrity'), 'utf8').trim(); + + // Validate branch name again (only allow alphanumeric, dash, and underscore) + const branchNameRegex = /^[a-zA-Z0-9_\-]+$/; + if (!branchNameRegex.test(branchName)) { + core.setFailed(`Invalid branch name detected: ${branchName}`); + return; + } + + const sanitizedBranchName = branchName.replace(/[\/\.]/g, '-'); + core.exportVariable('SANITIZED_BRANCH_NAME', sanitizedBranchName); + core.exportVariable('BRANCH_NAME', branchName); + core.exportVariable('PR_NUMBER', prNumber); + core.exportVariable('INTEGRITY', integrity); + + # Validate the integrity of the artifact + - name: Validate Artifact Integrity + uses: actions/github-script@v7.0.1 + with: + script: | + const crypto = require('crypto'); + + const prNumber = process.env.PR_NUMBER; + const branchName = process.env.BRANCH_NAME; + const integrity = process.env.INTEGRITY; + + const numberHash = crypto.createHash('sha256').update(prNumber).digest('hex'); + const branchHash = crypto.createHash('sha256').update(branchName).digest('hex'); + const expectedIntegrity = `${numberHash}:${branchHash}`; + + if (expectedIntegrity !== integrity) { + core.setFailed('Artifact integrity validation failed'); + } + + # Kick off the job in amplify + - name: Deploy Site + uses: actions/github-script@v7.0.1 + env: + APP_ID: ${{ inputs.APP_ID }} + APP_NAME: ${{ inputs.APP_NAME }} + REQUEST_TOKEN: ${{ secrets.REQUEST_TOKEN }} + REQUEST_MESSAGE: ${{ secrets.REQUEST_MESSAGE }} + ENDPOINT: ${{ secrets.ENDPOINT }} + with: + script: | + const crypto = require('crypto'); + const https = require('https'); + + // Access secrets through environment variables + const appId = process.env.APP_ID; + const appName = process.env.APP_NAME; + const requestToken = process.env.REQUEST_TOKEN; + const requestMessage = process.env.REQUEST_MESSAGE; + const endpoint = process.env.ENDPOINT; + const sanitizedBranchName = process.env.SANITIZED_BRANCH_NAME; + + const hmacKey = crypto.createHmac('sha256', requestToken).update(requestMessage).digest('hex'); + const signature = `sha256=${hmacKey}`; + + const makeRequest = () => { + return new Promise((resolve, reject) => { + const options = { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Hub-Signature': signature, + } + }; + + const req = https.request(endpoint, options, (res) => { + let data = ''; + res.on('data', (chunk) => { data += chunk; }); + res.on('end', () => { + resolve({ ok: res.statusCode >= 200 && res.statusCode < 300, status: res.statusCode }); + }); + }); + + req.on('error', (error) => { + reject(error); + }); + + req.write(JSON.stringify({ + app_id: appId, + branch_name: sanitizedBranchName, + })); + + req.end(); + }); + }; + + const response = await makeRequest(); + + if (!response.ok) { + core.setFailed(`Request failed with response code ${response.status}`); + } + + # Add preview link to comment if all 3 sites successfully start + - name: Comment Preview Link + if: success() + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + APP_ID: ${{ inputs.APP_ID }} + APP_NAME: ${{ inputs.APP_NAME }} + uses: actions/github-script@v7.0.1 + with: + script: | + const fs = require('fs'); + const prNumber = fs.readFileSync('./pr/number', 'utf8'); + const issueNumber = parseInt(prNumber); + const { APP_ID, APP_NAME, SANITIZED_BRANCH_NAME } = process.env; + + await github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: issueNumber, + body: `Your preview site for the **${APP_NAME}** will be ready in a few minutes, please allow time for it to build. \n \n Heres your preview link: \n [${APP_NAME} preview](https://${SANITIZED_BRANCH_NAME}.${APP_ID}.amplifyapp.com)` + }); From cba85ca47704033f6c0001d3f7f807074ab226a4 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Wed, 5 Mar 2025 11:53:29 -0500 Subject: [PATCH 18/18] fix(ci): install rust toolchain for macos nightly targets (#22596) * fix(ci): install rust toolchain for macos nightly targets * more elegant fix --- .github/workflows/publish.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9431a943971ce..2ae2270058373 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -297,7 +297,11 @@ jobs: with: ref: ${{ inputs.git_ref }} - name: Bootstrap runner environment (macOS-specific) - run: bash scripts/environment/bootstrap-macos.sh + run: | + bash scripts/environment/bootstrap-macos.sh + # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain. + rustup show active-toolchain || rustup toolchain install + rustup show - name: Build Vector env: TARGET: "${{ matrix.architecture }}-apple-darwin"