From bca501757691b1691917b512e47053bbc71469c7 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 13:59:18 -0700 Subject: [PATCH 1/7] scaffolding for sentry-options --- .github/workflows/validate-sentry-options.yml | 13 +++++++++++++ Cargo.toml | 1 + Dockerfile | 3 +++ sentry-options/schemas/objectstore/schema.json | 5 +++++ 4 files changed, 22 insertions(+) create mode 100644 .github/workflows/validate-sentry-options.yml create mode 100644 sentry-options/schemas/objectstore/schema.json diff --git a/.github/workflows/validate-sentry-options.yml b/.github/workflows/validate-sentry-options.yml new file mode 100644 index 00000000..14bfbca9 --- /dev/null +++ b/.github/workflows/validate-sentry-options.yml @@ -0,0 +1,13 @@ +name: Validate sentry-options schema + +on: + pull_request: + paths: + - 'sentry-options/schemas/**' + +jobs: + validate: + uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@1.0.0 + secrets: inherit + with: + schemas-path: sentry-options/schemas diff --git a/Cargo.toml b/Cargo.toml index b5b0a3c7..dc5f7a42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,3 +53,4 @@ tokio-util = "0.7.15" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } uuid = { version = "1.17.0", features = ["v4"] } +sentry-options = "1.0.0" diff --git a/Dockerfile b/Dockerfile index b732f059..09f61a80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM gcr.io/distroless/cc-debian12:nonroot ARG BINARY=objectstore COPY ${BINARY} /bin/entrypoint +COPY sentry-options/schemas /etc/sentry-options/schemas + +ENV SENTRY_OPTIONS_DIR=/etc/sentry-options # Ensure correct permissions on the data volume COPY --from=gcr.io/distroless/cc-debian12:nonroot --chown=nonroot:nonroot /home/nonroot /data diff --git a/sentry-options/schemas/objectstore/schema.json b/sentry-options/schemas/objectstore/schema.json new file mode 100644 index 00000000..2ffee859 --- /dev/null +++ b/sentry-options/schemas/objectstore/schema.json @@ -0,0 +1,5 @@ +{ + "version": "1.0", + "type": "object", + "properties": {} +} From 60feaae23075f8a2399f01a95cd51adf544e2acd Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 14:25:53 -0700 Subject: [PATCH 2/7] use validation workflow sha with new schema bug fix --- .github/workflows/validate-sentry-options.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-sentry-options.yml b/.github/workflows/validate-sentry-options.yml index 14bfbca9..f45d3093 100644 --- a/.github/workflows/validate-sentry-options.yml +++ b/.github/workflows/validate-sentry-options.yml @@ -7,7 +7,7 @@ on: jobs: validate: - uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@1.0.0 + uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@f3f76cb9d1ee1ea5202cb986ce8a943a9e6212d9 secrets: inherit with: schemas-path: sentry-options/schemas From 7f6856a85967049be233065add92f70e9c20aaa3 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 15:56:41 -0700 Subject: [PATCH 3/7] bump validation job version --- .github/workflows/validate-sentry-options.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-sentry-options.yml b/.github/workflows/validate-sentry-options.yml index f45d3093..6d6b2e02 100644 --- a/.github/workflows/validate-sentry-options.yml +++ b/.github/workflows/validate-sentry-options.yml @@ -7,7 +7,7 @@ on: jobs: validate: - uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@f3f76cb9d1ee1ea5202cb986ce8a943a9e6212d9 + uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@1.0.1 secrets: inherit with: schemas-path: sentry-options/schemas From b99ffd630f16ad80578417ba28bc78b2b06d7d23 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 15:57:06 -0700 Subject: [PATCH 4/7] bump sentry-options crate to 1.0.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index dc5f7a42..9dd89f03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,4 +53,4 @@ tokio-util = "0.7.15" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } uuid = { version = "1.17.0", features = ["v4"] } -sentry-options = "1.0.0" +sentry-options = "1.0.1" From 208e6b787aa5c02519ba7c346d37e58fca104ecb Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 16:33:43 -0700 Subject: [PATCH 5/7] add workflow permissions --- .github/workflows/validate-sentry-options.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/validate-sentry-options.yml b/.github/workflows/validate-sentry-options.yml index 6d6b2e02..bd7b99ca 100644 --- a/.github/workflows/validate-sentry-options.yml +++ b/.github/workflows/validate-sentry-options.yml @@ -5,6 +5,9 @@ on: paths: - 'sentry-options/schemas/**' +permissions: + contents: read + jobs: validate: uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@1.0.1 From 4498a02b9151eb35dcd2d794627415d232c44cd5 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Tue, 10 Mar 2026 16:36:21 -0700 Subject: [PATCH 6/7] pin action to sha --- .github/workflows/validate-sentry-options.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-sentry-options.yml b/.github/workflows/validate-sentry-options.yml index bd7b99ca..80b3c7ca 100644 --- a/.github/workflows/validate-sentry-options.yml +++ b/.github/workflows/validate-sentry-options.yml @@ -10,7 +10,7 @@ permissions: jobs: validate: - uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@1.0.1 + uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@586df8a9214a4bb7d5cf0a39b6bb3887ddab70c6 # v1.0.1 secrets: inherit with: schemas-path: sentry-options/schemas From c7267f6e751cddfe9cc43320fec84437c75fc0a8 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Wed, 11 Mar 2026 09:58:19 -0700 Subject: [PATCH 7/7] remove dockerfile changes --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09f61a80..b732f059 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,6 @@ FROM gcr.io/distroless/cc-debian12:nonroot ARG BINARY=objectstore COPY ${BINARY} /bin/entrypoint -COPY sentry-options/schemas /etc/sentry-options/schemas - -ENV SENTRY_OPTIONS_DIR=/etc/sentry-options # Ensure correct permissions on the data volume COPY --from=gcr.io/distroless/cc-debian12:nonroot --chown=nonroot:nonroot /home/nonroot /data