From d2381609777d623990d6e6e1f554e7667e4740d7 Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Thu, 16 Jan 2025 12:49:50 +0100 Subject: [PATCH 1/3] Adjust examples for new .well-known/tenzir-platform endpoint --- components/tenant-manager | 2 +- examples/localdev/docker-compose.yaml | 4 ++++ examples/tenzir-developers/docker-compose.yaml | 4 ++++ examples/tenzir-developers/env.example | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/components/tenant-manager b/components/tenant-manager index 9e6cab32..3f586247 160000 --- a/components/tenant-manager +++ b/components/tenant-manager @@ -1 +1 @@ -Subproject commit 9e6cab328d8b7830989505a03e99f7579390253a +Subproject commit 3f58624784b0c4ed317dc5697f81f996c044e5dc diff --git a/examples/localdev/docker-compose.yaml b/examples/localdev/docker-compose.yaml index e440d421..cb2ac986 100644 --- a/examples/localdev/docker-compose.yaml +++ b/examples/localdev/docker-compose.yaml @@ -21,6 +21,10 @@ services: - TENANT_MANAGER_AUTH__ENABLE_SELF_SIGNED=false - TENANT_MANAGER_AUTH__TRUSTED_AUDIENCES=${TENZIR_PLATFORM_OIDC_TRUSTED_AUDIENCES} - TENANT_MANAGER_AUTH__ADMIN_FUNCTIONS=${TENZIR_PLATFORM_OIDC_ADMIN_RULES} + - TENANT_MANAGER_OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} + - TENANT_MANAGER_OIDC__CLI_CLIENT_ID=tenzir-cli + - TENANT_MANAGER_OIDC__NODE_CLIENT_ID=tenzir-node + - TENANT_MANAGER_OIDC__APP_CLIENT_ID=tenzir-app - STORE__TYPE=${TENZIR_PLATFORM_STORE_TYPE} - STORE__POSTGRES_URI=postgresql://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB} # seaweedfs s3 connection diff --git a/examples/tenzir-developers/docker-compose.yaml b/examples/tenzir-developers/docker-compose.yaml index 1ee04b06..4541d954 100644 --- a/examples/tenzir-developers/docker-compose.yaml +++ b/examples/tenzir-developers/docker-compose.yaml @@ -19,6 +19,10 @@ services: - TENANT_MANAGER_AUTH__ENABLE_SELF_SIGNED=false - TENANT_MANAGER_AUTH__TRUSTED_AUDIENCES=${TENZIR_PLATFORM_OIDC_TRUSTED_AUDIENCES} - TENANT_MANAGER_AUTH__ADMIN_FUNCTIONS=${TENZIR_PLATFORM_OIDC_ADMIN_RULES} + - TENANT_MANAGER_OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} + - TENANT_MANAGER_OIDC__CLI_CLIENT_ID=${TENZIR_PLATFORM_CLI_CLIENT_ID} + - TENANT_MANAGER_OIDC__NODE_CLIENT_ID=${TENZIR_PLATFORM_NODE_CLIENT_ID} + - TENANT_MANAGER_OIDC__APP_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID} - STORE__TYPE=${TENZIR_PLATFORM_STORE_TYPE} - STORE__POSTGRES_URI=postgresql://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB} # seaweedfs s3 connection diff --git a/examples/tenzir-developers/env.example b/examples/tenzir-developers/env.example index f0bf2035..76ed611d 100644 --- a/examples/tenzir-developers/env.example +++ b/examples/tenzir-developers/env.example @@ -15,6 +15,9 @@ TENZIR_PLATFORM_OIDC_ADMIN_RULES='[{"auth_fn":"auth_email_suffix","connection":" # Specific OIDC Settings for the CLI TENZIR_PLATFORM_CLI_CLIENT_ID=bkdMIMCPjLwl28J1oU4lAGr7tg107w0s +# Specific OIDC Settings for the Tenzir Node signup +TENZIR_PLATFORM_NODE_CLIENT_ID=bkbYctvS3knaieU3GIGh5aK4opP816uV + # Specific OIDC Settings for the frontend. # (client secret can be found in 1password under the 'Auth0 Shared Account' entry) TENZIR_PLATFORM_APP_CLIENT_ID=bTFcQLMzDiHJzxbouREVu6q1LB00vDAq From d8ff8348cd778a1ff59c45a48305605ec93b453d Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Thu, 16 Jan 2025 22:37:50 +0100 Subject: [PATCH 2/3] continue work on device code stuff --- .../tenzir-developers/docker-compose.yaml | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/examples/tenzir-developers/docker-compose.yaml b/examples/tenzir-developers/docker-compose.yaml index 4541d954..839d6516 100644 --- a/examples/tenzir-developers/docker-compose.yaml +++ b/examples/tenzir-developers/docker-compose.yaml @@ -5,24 +5,49 @@ # Container ports are mapped to the range 3000-3004 services: + app: + image: ghcr.io/tenzir/app:${TENZIR_PLATFORM_VERSION:-latest} + #build: ../../components/app + environment: + - AUTH_TRUST_HOST=true + - PUBLIC_ENABLE_HIGHLIGHT=false + - ORIGIN=${TENZIR_PLATFORM_DOMAIN} + - PRIVATE_OIDC_PROVIDER_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID} + - PRIVATE_OIDC_PROVIDER_CLIENT_SECRET=${TENZIR_PLATFORM_APP_CLIENT_SECRET} + - PRIVATE_OIDC_PROVIDER_ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} + - PRIVATE_OIDC_PROVIDER_NAME=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME} + - PUBLIC_OIDC_PROVIDER_ID=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME} + - PUBLIC_WEBSOCKET_GATEWAY_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT} + - PRIVATE_USER_ENDPOINT=http://platform:5000/user + - PRIVATE_WEBAPP_ENDPOINT=http://platform:5000/webapp + - PRIVATE_WEBAPP_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY} + - AUTH_SECRET=${TENZIR_PLATFORM_INTERNAL_AUTH_SECRET} + - PRIVATE_DRIZZLE_DATABASE_URL=postgres://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB} + depends_on: + - postgres + ports: + - "3000:3000" + platform: # image: ghcr.io/tenzir/platform:${TENZIR_PLATFORM_VERSION:-latest} build: ../../components/tenant-manager/platform/tenant_manager/ command: ["tenant_manager/rest/server/local.py"] environment: + - DOMAIN=${TENZIR_PLATFORM_API_ENDPOINT} - BASE_PATH= - GATEWAY_WS_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT} - GATEWAY_HTTP_ENDPOINT=http://websocket-gateway:5000 + - GATEWAY_PUBLIC_HTTP_ENDPOINT=${TENZIR_PLATFORM_PROXY_ENDPOINT} - TENZIR_DEMO_NODE_IMAGE=${TENZIR_PLATFORM_DEMO_NODE_IMAGE:-tenzir/tenzir-demo:latest} - TENANT_MANAGER_APP_API_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY} - TENANT_MANAGER_TENANT_TOKEN_ENCRYPTION_KEY=${TENZIR_PLATFORM_INTERNAL_TENANT_TOKEN_ENCRYPTION_KEY} - TENANT_MANAGER_AUTH__ENABLE_SELF_SIGNED=false - TENANT_MANAGER_AUTH__TRUSTED_AUDIENCES=${TENZIR_PLATFORM_OIDC_TRUSTED_AUDIENCES} - TENANT_MANAGER_AUTH__ADMIN_FUNCTIONS=${TENZIR_PLATFORM_OIDC_ADMIN_RULES} - - TENANT_MANAGER_OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} - - TENANT_MANAGER_OIDC__CLI_CLIENT_ID=${TENZIR_PLATFORM_CLI_CLIENT_ID} - - TENANT_MANAGER_OIDC__NODE_CLIENT_ID=${TENZIR_PLATFORM_NODE_CLIENT_ID} - - TENANT_MANAGER_OIDC__APP_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID} + - OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} + - OIDC__CLI_CLIENT_ID=${TENZIR_PLATFORM_CLI_CLIENT_ID} + - OIDC__NODE_CLIENT_ID=${TENZIR_PLATFORM_NODE_CLIENT_ID} + - OIDC__APP_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID} - STORE__TYPE=${TENZIR_PLATFORM_STORE_TYPE} - STORE__POSTGRES_URI=postgresql://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB} # seaweedfs s3 connection @@ -53,30 +78,7 @@ services: - postgres command: ["tenant_manager/ws/server/local.py"] ports: - - 3099:5000 - - app: - # image: ghcr.io/tenzir/app:${TENZIR_PLATFORM_VERSION:-latest} - build: ../../components/app - environment: - - AUTH_TRUST_HOST=true - - PUBLIC_ENABLE_HIGHLIGHT=false - - ORIGIN=${TENZIR_PLATFORM_DOMAIN} - - PRIVATE_OIDC_PROVIDER_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID} - - PRIVATE_OIDC_PROVIDER_CLIENT_SECRET=${TENZIR_PLATFORM_APP_CLIENT_SECRET} - - PRIVATE_OIDC_PROVIDER_ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL} - - PRIVATE_OIDC_PROVIDER_NAME=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME} - - PUBLIC_OIDC_PROVIDER_ID=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME} - - PUBLIC_WEBSOCKET_GATEWAY_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT} - - PRIVATE_USER_ENDPOINT=http://platform:5000/user - - PRIVATE_WEBAPP_ENDPOINT=http://platform:5000/webapp - - PRIVATE_WEBAPP_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY} - - AUTH_SECRET=${TENZIR_PLATFORM_INTERNAL_AUTH_SECRET} - - PRIVATE_DRIZZLE_DATABASE_URL=postgres://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB} - depends_on: - - postgres - ports: - - "3000:3000" + - 3002:5000 cli: # image: ghcr.io/tenzir/tenzir-platform:${TENZIR_PLATFORM_VERSION:-latest} From 774232b75522817d2eee84c3a7d1e435ebc40f5e Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 12 Feb 2025 13:20:05 +0100 Subject: [PATCH 3/3] Update to latest tenant-manager changes --- components/tenant-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tenant-manager b/components/tenant-manager index 3f586247..f275be57 160000 --- a/components/tenant-manager +++ b/components/tenant-manager @@ -1 +1 @@ -Subproject commit 3f58624784b0c4ed317dc5697f81f996c044e5dc +Subproject commit f275be573e823f763686923310ca7ebd15f58785