Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e-tests/.run/Data Connect Trino E2E Tests - Local.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<env name="E2E_GLOBAL_METHOD_SECURITY_ENABLED" value="true" />
<env name="E2E_INDEXING_SERVICE_ENABLED" value="true" />
<env name="E2E_SCOPE_CHECKING_ENABLED" value="true" />
<env name="E2E_SHOW_SCHEMA_FOR_CATALOG_NAME" value="data_lake" />
<env name="E2E_SHOW_TABLE_FOR_CATALOG_SCHEMA_NAME" value="data_lake.public" />
<env name="E2E_SHOW_SCHEMA_FOR_CATALOG_NAME" value="publisher" />
<env name="E2E_SHOW_TABLE_FOR_CATALOG_SCHEMA_NAME" value="publisher.public" />
</envs>
<method v="2">
<option name="Make" enabled="true" />
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ collection-service and indexing-service to be up, and it sets only the variables
authorization tests.
- `E2E_INDEXING_SERVICE_ENABLED` has no default, and the indexing-service test is disabled without it.
- `E2E_SHOW_SCHEMA_FOR_CATALOG_NAME` and `E2E_SHOW_TABLE_FOR_CATALOG_SCHEMA_NAME` have no defaults, because the
catalog to query differs per environment. `data_lake` is the local equivalent of the chart's `publisher`.
catalog to query differs per environment. The local Trino catalog is named `publisher`, matching the chart.

Everything else — base URIs, wallet client and the publisher-data resource — comes from the defaults in
the test code. Overriding them in the run configuration is how they drift.
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/e2e-tests.env
Original file line number Diff line number Diff line change
@@ -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
57 changes: 57 additions & 0 deletions helm/values-local.yaml
Original file line number Diff line number Diff line change
@@ -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.<service>.<kind> helpers read before falling back to the computed
# https://<appName>.<spaceDnsName> 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: publisher
showTableForCatalogSchemaName: public