From b893efc5e76fd1dd20810051ddff0b1bc69238de Mon Sep 17 00:00:00 2001 From: Angelo Genovese Date: Thu, 5 Nov 2026 15:00:23 -0500 Subject: [PATCH 1/2] [CU-86bcy5qta] Add wallet_chart local values and fix local e2e auth config helm/values-local.yaml covers every audience this chart's templates reference for dnaservice wallet-render, including trino's resourceUrl as the opaque http://trino.local identifier its APP_AUTH_TRINOOAUTHCLIENT_AUDIENCE expects (see sibling trino repo's own values-local.yaml fix under CU-86bcy5qry) rather than trino's real listening port, which made this service fail to start at all: "No grant for requested audience [http://trino.local]". e2e-tests/e2e-tests.env sets E2E_GLOBAL_METHOD_SECURITY_ENABLED=true to match how this service actually runs locally (SPRING_PROFILES_ACTIVE=wallet-auth, whose app.auth.global-method-security.enabled defaults to true, same as alpha/beta/prod) -- the e2e suite's own default assumes it's off (as it is for the no-auth/basic-auth profiles) and skips sending a Bearer token entirely, which the real profile's security filter chain rejects before this app's custom GA4GH-Search challenge logic ever runs. With both fixes, 37/38 e2e tests pass locally (up from a startup crash). The one remaining failure (getTables_should_returnAPageIndexMatchingTheNextPageTrail, a Trino "Cannot check and eventually update SQL schema" error) is unrelated to wallet config -- root-caused to accumulated stray/orphaned Postgres catalog files in trino's own local-dev/etc/catalog/ from unrelated past e2e runs, a separate local-environment cleanup issue. Co-Authored-By: Claude Sonnet 5 --- e2e-tests/e2e-tests.env | 6 +++++ helm/values-local.yaml | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 e2e-tests/e2e-tests.env create mode 100644 helm/values-local.yaml diff --git a/e2e-tests/e2e-tests.env b/e2e-tests/e2e-tests.env new file mode 100644 index 0000000..1e6a624 --- /dev/null +++ b/e2e-tests/e2e-tests.env @@ -0,0 +1,6 @@ +# Locally this service runs with SPRING_PROFILES_ACTIVE=wallet-auth (services.yaml), whose +# app.auth.global-method-security.enabled defaults to true (application.yml) -- same as alpha/beta/prod. +# The test's own default assumes it's off (as it is for the no-auth/basic-auth profiles) and skips +# sending a Bearer token entirely, which the real profile's security filter chain rejects outright +# before this app's custom GA4GH-Search challenge logic ever runs. +E2E_GLOBAL_METHOD_SECURITY_ENABLED=true diff --git a/helm/values-local.yaml b/helm/values-local.yaml new file mode 100644 index 0000000..09a123f --- /dev/null +++ b/helm/values-local.yaml @@ -0,0 +1,57 @@ +# Local override for `dnaservice wallet-render` (CU-86bcx1v6d). Not used by alpha/beta/prod. +# Each key here is the direct resourceUrl/externalUrl/internalUrl override publisher-helm-library's +# dnastack.. helpers read before falling back to the computed +# https://. form — see helm/templates/_urls.tpl in publisher-helm-library. +# +# `publisherData` is an opaque audience identifier (alternate name for collection-service), not a +# real listening URL — matching the existing mini-cluster convention +# (dnastack-development-tools/mini-cluster/config/wallet/access-policies/*/publisher-data.json) +# so this is a drop-in replacement, not a new value. +# +# trino.resourceUrl is likewise opaque -- it's only ever used as the APP_AUTH_TRINOOAUTHCLIENT_AUDIENCE +# OAuth audience this service requests a token for (see deployment.yaml), not a URL anything connects +# to. application.yml already defaults that property to http://trino.local for local/default dev, and +# the mini-cluster's historical grant (wallet/grants/data-connect-trino/trino.json) issues exactly that +# audience, so this has to match or Wallet returns "No grant for requested audience [http://trino.local]" +# and the app fails to start. trino.internalUrl is unrelated: it's the real JDBC endpoint this service +# connects to (TRINO_DATASOURCE_URL), so it stays a real listening URL. +wallet: + externalUrl: http://localhost:8081 + internalUrl: http://localhost:8081 + resourceUrl: http://localhost:8081 +trino: + internalUrl: http://localhost:8091 + resourceUrl: http://trino.local +indexingService: + internalUrl: http://localhost:8094 + resourceUrl: http://localhost:8094 +collectionService: + internalUrl: http://localhost:8093 + resourceUrl: http://localhost:8093 +dataConnectTrino: + externalUrl: http://localhost:8089 + internalUrl: http://localhost:8089 + resourceUrl: http://localhost:8089 +# No trailing slash: this is used as an OAuth audience, which downstream services (e.g. +# collection-service, see its application.yml "Do not add trailing slash" comment) exact-match. +publisherData: + resourceUrl: http://localhost:8095 + +# --- Deployment-pipeline required values, unrelated to Wallet CRDs --- +# These charts guard several fields with Helm's `required`, even though nothing here deploys a +# real pod or database locally -- dnaservice wallet-render only needs `helm template` to succeed so +# it can extract the Wallet CRD blocks above. Any non-empty placeholder satisfies the guard. +image: + repository: placeholder/not-used-locally +app: + configVersion: local +database: + postgresVersion: "17" + postgresInstance: local +cloud: + clusterNamespace: local + clusterName: local + spaceDnsName: local.dnastack.com +test: + showSchemaForCatalogName: data_lake + showTableForCatalogSchemaName: public From 4fecd3e2c98baff0c4ae9c20d67d638dc501e238 Mon Sep 17 00:00:00 2001 From: Angelo Genovese Date: Wed, 18 Nov 2026 11:57:00 -0500 Subject: [PATCH 2/2] [CU-86bcy5qta] Follow the local Trino catalog rename to publisher in test config and docs The local catalog is renamed from data_lake to publisher to match real deployments; update the chart's local test values, the IDE run configuration and the e2e README. Co-Authored-By: Claude Sonnet 5.5 --- e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml | 4 ++-- e2e-tests/README.md | 2 +- helm/values-local.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml b/e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml index 587c685..972dd7c 100644 --- a/e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml +++ b/e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml @@ -12,8 +12,8 @@ - - + +