Skip to content

Commit 978ee50

Browse files
committed
Merge branch 'main' of github.com:graphql-hive/console into feat/lab-settings
2 parents 152a348 + fab4b03 commit 978ee50

File tree

39 files changed

+954
-584
lines changed

39 files changed

+954
-584
lines changed

.changeset/bright-buses-say.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Update [`nodemailer`](https://github.com/nodemailer/nodemailer) to address vulnerability
6+
[GHSA-vvjj-xcjg-gr5g](https://github.com/advisories/GHSA-vvjj-xcjg-gr5g).

.changeset/curly-pumas-carry.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
address vulnerability [GHSA-r4q5-vmmm-2653](https://github.com/advisories/GHSA-r4q5-vmmm-2653)

.changeset/deep-lies-happen.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Fix schema contract composition applying `@inaccessible` on the federation types `ContextArgument` and `FieldValue` on the supergraph SDL.
6+
7+
This mitigates the following error in apollo-router upon processing the supergraph:
8+
9+
```
10+
could not create router: Api error(s): The supergraph schema failed to produce a valid API schema: The following errors occurred:
11+
- Core feature type `join__ContextArgument` cannot use @inaccessible.
12+
- Core feature type `join__FieldValue` cannot use @inaccessible.
13+
```

.changeset/stale-cooks-talk.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Update [`opentelemetry-go`](https://github.com/open-telemetry/opentelemetry-go) to address vulnerability
6+
[CVE-2026-39883](https://github.com/advisories/GHSA-hfvc-g4fc-pqhx).

.github/workflows/apollo-router-updater.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install Rust
3030
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
3131
with:
32-
toolchain: '1.91.1'
32+
toolchain: '1.94.1'
3333
default: true
3434
override: true
3535

.github/workflows/build-and-dockerize.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ jobs:
4545
suffix: '-arm64'
4646
runs-on: ${{ matrix.builder }}
4747
name: dockerize (${{ matrix.platform }})
48+
env:
49+
SENTRY_ORG: the-guild-z4
50+
SENTRY_PROJECT: graphql-hive
4851
permissions:
4952
contents: read
5053
packages: write
@@ -66,6 +69,8 @@ jobs:
6669
run: pnpm build
6770
env:
6871
NODE_OPTIONS: '--max-old-space-size=14336' # GitHub Actions gives us 16GB, it's ok to use 80%
72+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
73+
RELEASE: ${{ inputs.imageTag }}
6974

7075
- name: test ESM & CJS exports integrity
7176
if: ${{ inputs.build }}
@@ -191,8 +196,6 @@ jobs:
191196
if: ${{ inputs.publishSourceMaps }}
192197
env:
193198
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
194-
SENTRY_ORG: the-guild-z4
195-
SENTRY_PROJECT: graphql-hive
196199
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
197200
SENTRY_RELEASE: ${{ inputs.imageTag }}
198201
run: pnpm upload-sourcemaps

.github/workflows/publish-rust.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Install Rust
5757
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
5858
with:
59-
toolchain: '1.91.1'
59+
toolchain: '1.94.1'
6060
default: true
6161
override: true
6262

@@ -118,7 +118,7 @@ jobs:
118118
- name: Install Rust
119119
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
120120
with:
121-
toolchain: '1.91.1'
121+
toolchain: '1.94.1'
122122
target: ${{ env.RUST_TARGET }}
123123
default: true
124124
override: true

.github/workflows/tests-integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
name: Install Rust
9191
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
9292
with:
93-
toolchain: '1.91.1'
93+
toolchain: '1.94.1'
9494
default: true
9595
override: true
9696

0 commit comments

Comments
 (0)