Skip to content

Commit 592b560

Browse files
committed
porter set proper env vars / env groups
1 parent ec63e98 commit 592b560

File tree

3 files changed

+30
-9
lines changed

3 files changed

+30
-9
lines changed

.github/workflows/porter-debug.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
PORTER_APP_NAME: cloud-debug
2222
PORTER_NAMESPACE: debug
2323
NODE_ENV: debug
24+
CLOUD_PUBLIC_HOST_NAME: debug.augmentos.cloud
25+
CLOUD_LOCAL_HOST_NAME: cloud-debug-cloud.default.svc.cluster.local:80
2426
PORTER_CLUSTER: "4689"
2527
PORTER_DEPLOYMENT_TARGET_ID: 4a24a192-04c8-421f-8fc2-22db1714fdc0
2628
PORTER_HOST: https://dashboard.porter.run

augmentos_cloud/packages/cloud/src/services/core/websocket.service.ts

+17-5
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,24 @@ import tpaRegistrationService from './tpa-registration.service';
6363
import healthMonitorService from './health-monitor.service';
6464
import axios from 'axios';
6565

66-
export const PUBLIC_HOST_NAME = process.env.PUBLIC_HOST_NAME || "dev.augmentos.cloud";
67-
export let LOCAL_HOST_NAME = process.env.CLOUD_HOST_NAME || process.env.PORTER_APP_NAME ? `${process.env.PORTER_APP_NAME}-cloud.default.svc.cluster.local:80` : "cloud"
66+
export const CLOUD_PUBLIC_HOST_NAME = process.env.PUBLIC_HOST_NAME; // e.g., "prod.augmentos.cloud"
67+
export const CLOUD_LOCAL_HOST_NAME = process.env.LOCAL_HOST_NAME; // e.g., "localhost:8002" | "cloud" | "cloud-debug-cloud.default.svc.cluster.local:80"
6868
export const AUGMENTOS_AUTH_JWT_SECRET = process.env.AUGMENTOS_AUTH_JWT_SECRET || "";
6969

70-
logger.info(`🔥🔥🔥 [websocket.service]: PUBLIC_HOST_NAME: ${PUBLIC_HOST_NAME}`);
71-
logger.info(`🔥🔥🔥 [websocket.service]: LOCAL_HOST_NAME: ${LOCAL_HOST_NAME}`);
70+
if (!CLOUD_PUBLIC_HOST_NAME) {
71+
logger.error("PUBLIC_HOST_NAME is not set. Please set it in your environment variables.");
72+
}
73+
74+
if (!CLOUD_LOCAL_HOST_NAME) {
75+
logger.error("LOCAL_HOST_NAME is not set. Please set it in your environment variables.");
76+
}
77+
78+
if (!AUGMENTOS_AUTH_JWT_SECRET) {
79+
logger.error("AUGMENTOS_AUTH_JWT_SECRET is not set. Please set it in your environment variables.");
80+
}
81+
82+
logger.info(`🔥🔥🔥 [websocket.service]: PUBLIC_HOST_NAME: ${CLOUD_PUBLIC_HOST_NAME}`);
83+
logger.info(`🔥🔥🔥 [websocket.service]: LOCAL_HOST_NAME: ${CLOUD_LOCAL_HOST_NAME}`);
7284

7385
const WebSocketServer = WebSocket.Server || WebSocket.WebSocketServer;
7486

@@ -434,7 +446,7 @@ export class WebSocketService {
434446
}
435447
} else {
436448
// For non-system apps, use the public host
437-
augmentOSWebsocketUrl = `wss://${PUBLIC_HOST_NAME}/tpa-ws`;
449+
augmentOSWebsocketUrl = `wss://${CLOUD_PUBLIC_HOST_NAME}/tpa-ws`;
438450
userSession.logger.info(`Using public URL for app ${packageName}`);
439451
}
440452

augmentos_cloud/porter.yaml

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ version: v2
22
# Omit a hard-coded name here. Use environment variables to supply dynamic values.
33
namespace: ${PORTER_NAMESPACE}
44

5+
envGroups:
6+
- dev
7+
8+
env:
9+
NODE_ENV: ${NODE_ENV}
10+
PORTER_APP_NAME: ${PORTER_APP_NAME}
11+
CLOUD_HOST_NAME: ${CLOUD_PUBLIC_HOST_NAME}
12+
CLOUD_PUBLIC_HOST_NAME: ${CLOUD_PUBLIC_HOST_NAME}
13+
CLOUD_LOCAL_HOST_NAME: ${CLOUD_LOCAL_HOST_NAME}
14+
TEST_ENV: this-is-a-test
15+
516
build:
617
method: docker
718
context: ./augmentos_cloud/.
@@ -15,8 +26,6 @@ services:
1526
cpuCores: 2.0
1627
ramMegabytes: 2048
1728
env:
18-
NODE_ENV: ${NODE_ENV}
19-
PORTER_APP_NAME: ${PORTER_APP_NAME}
2029
HOST: "0.0.0.0"
2130
SERVICE_NAME: "cloud"
2231
- name: dashboard-manager
@@ -26,7 +35,5 @@ services:
2635
cpuCores: 0.5
2736
ramMegabytes: 512
2837
env:
29-
NODE_ENV: ${NODE_ENV}
30-
PORTER_APP_NAME: ${PORTER_APP_NAME}
3138
HOST: "0.0.0.0"
3239
SERVICE_NAME: "dashboard-manager"

0 commit comments

Comments
 (0)