running out of ideas...

Author: Mario-SO

docker-compose.prod.yml

@@ -43,7 +43,7 @@ x-common-environment: &common-environment
   REMOTION_WEBHOOK_SECRET_FILE: /run/secrets/remotion-webhook-secret
   REMOTION_ID: pebs
   REMOTION_SITE_NAME: https://streameth.org
-  REMOTION_WEBHOOK_URL: https://prod.api.streameth.org/remotion-webhook
+  REMOTION_WEBHOOK_URL: https://prod.api.streameth.org/webhook/remotion
   PIPEDREAM_AUTH_TOKEN_FILE: /run/secrets/pipedream-auth-token
   DEVCON_UPLOAD_ENDPOINT_FILE: /run/secrets/devcon-upload-endpoint
   LOG_DIR: logs
@@ -231,7 +231,6 @@ services:
       - redis
     environment: 
       <<: *common-environment
-      REMOTION_WEBHOOK_URL: https://prod.api.streameth.org/remotion-webhook
     deploy:
       <<: *common-deploy
       mode: replicated

docker-compose.staging.yml

@@ -43,7 +43,7 @@ x-common-environment: &common-environment
   REMOTION_WEBHOOK_SECRET_FILE: /run/secrets/remotion-webhook-secret
   REMOTION_ID: pebs
   REMOTION_SITE_NAME: rendering-engine
-  REMOTION_WEBHOOK_URL: https://staging.api.streameth.org/remotion-webhook
+  REMOTION_WEBHOOK_URL: https://staging.api.streameth.org/webhook/remotion
   PIPEDREAM_AUTH_TOKEN_FILE: /run/secrets/pipedream-auth-token
   DEVCON_UPLOAD_ENDPOINT_FILE: /run/secrets/devcon-upload-endpoint
   LOG_DIR: logs
@@ -52,7 +52,6 @@ x-common-environment: &common-environment
   REDIS_HOST: redis
   REDIS_PORT: 6379
   OPENAI_API_KEY_FILE: /run/secrets/openai-api-key
-  # AWS Configuration read from GitHub Actions secrets
   AWS_ACCESS_KEY_ID_FILE: /run/secrets/aws-access-key
   AWS_SECRET_ACCESS_KEY_FILE: /run/secrets/aws-secret-key
 
@@ -242,7 +241,6 @@ services:
       - redis
     environment: 
       <<: *common-environment
-      REMOTION_WEBHOOK_URL: https://staging.api.streameth.org/remotion-webhook
     deploy:
       <<: *common-deploy
       mode: replicated

packages/reel-creator/app/api/lambda/progress/route.ts

@@ -11,20 +11,20 @@ import {
   REGION,
   SITE_NAME,
   TIMEOUT,
-  SERVER_WEBHOOK_SECRET_FILE,
-  SERVER_WEBHOOK_URL,
-  AWS_ACCESS_KEY_ID_FILE,
-  AWS_SECRET_ACCESS_KEY_FILE,
+  WEBHOOK_SECRET,
+  WEBHOOK_URL,
+  AWS_ACCESS_KEY_ID,
+  AWS_SECRET_ACCESS_KEY,
 } from "../../../../config.mjs";
 
 export const POST = executeApi<ProgressResponse, typeof ProgressRequest>(
   ProgressRequest,
   async (req, body) => {
     if (
-      !AWS_ACCESS_KEY_ID_FILE ||
-      !AWS_SECRET_ACCESS_KEY_FILE ||
-      !SERVER_WEBHOOK_URL ||
-      !SERVER_WEBHOOK_SECRET_FILE ||
+      !AWS_ACCESS_KEY_ID ||
+      !AWS_SECRET_ACCESS_KEY ||
+      !WEBHOOK_URL ||
+      !WEBHOOK_SECRET ||
       !SITE_NAME
     ) {
       throw new TypeError(
@@ -33,9 +33,9 @@ export const POST = executeApi<ProgressResponse, typeof ProgressRequest>(
     }
 
     // set REMOTION_AWS_SECRET_ACCESS_KEY env
-    process.env.REMOTION_AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY_FILE;
+    process.env.REMOTION_AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY;
     // set REMOTION_AWS_ACCESS_KEY_ID env
-    process.env.REMOTION_AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID_FILE;
+    process.env.REMOTION_AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID;
 
     const renderProgress = await getRenderProgress({
       bucketName: body.bucketName,

packages/reel-creator/app/api/lambda/render/route.ts

@@ -12,10 +12,10 @@ import {
   REGION,
   SITE_NAME,
   TIMEOUT,
-  SERVER_WEBHOOK_SECRET_FILE,
-  SERVER_WEBHOOK_URL,
-  AWS_ACCESS_KEY_ID_FILE,
-  AWS_SECRET_ACCESS_KEY_FILE,
+  WEBHOOK_SECRET,
+  WEBHOOK_URL,
+  AWS_ACCESS_KEY_ID,
+  AWS_SECRET_ACCESS_KEY,
 } from "../../../../config.mjs";
 import { executeApi } from "../../../../helpers/api-response";
 import { RenderRequest } from "../../../../types/schema";
@@ -24,10 +24,10 @@ export const POST = executeApi<RenderMediaOnLambdaOutput, typeof RenderRequest>(
 	RenderRequest,
 	async (req, body) => {
 		if (
-			!AWS_ACCESS_KEY_ID_FILE ||
-			!AWS_SECRET_ACCESS_KEY_FILE ||
-			!SERVER_WEBHOOK_URL ||
-			!SERVER_WEBHOOK_SECRET_FILE ||
+			!AWS_ACCESS_KEY_ID ||
+			!AWS_SECRET_ACCESS_KEY ||
+			!WEBHOOK_URL ||
+			!WEBHOOK_SECRET ||
 			!SITE_NAME
 		) {
 			throw new TypeError(
@@ -36,14 +36,14 @@ export const POST = executeApi<RenderMediaOnLambdaOutput, typeof RenderRequest>(
 		}
 
     // set REMOTION_AWS_SECRET_ACCESS_KEY env
-    process.env.REMOTION_AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY_FILE;
+    process.env.REMOTION_AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY;
     // set REMOTION_AWS_ACCESS_KEY_ID env
-    process.env.REMOTION_AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID_FILE;
+    process.env.REMOTION_AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID;
 
 		// Add webhook configuration
 		const webhook = {
-			url: SERVER_WEBHOOK_URL,
-			secret: SERVER_WEBHOOK_SECRET_FILE,
+			url: WEBHOOK_URL,
+			secret: WEBHOOK_SECRET,
 			customData: {
 				compositionId: body.id, // Add custom data here.
 			},
@@ -69,7 +69,7 @@ export const POST = executeApi<RenderMediaOnLambdaOutput, typeof RenderRequest>(
 			webhook,
 		});
 
-		console.log("secrets", AWS_ACCESS_KEY_ID_FILE, AWS_SECRET_ACCESS_KEY_FILE, SERVER_WEBHOOK_SECRET_FILE, SERVER_WEBHOOK_URL, SITE_NAME);
+		console.log("secrets", AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, WEBHOOK_SECRET, WEBHOOK_URL, SITE_NAME);
 
 		return result;
 	},

packages/reel-creator/config.mjs

@@ -35,7 +35,7 @@ export const RAM = 4096;
 export const DISK = 10240;
 export const TIMEOUT = 900;
 
-export const SERVER_WEBHOOK_URL = process.env.SERVER_WEBHOOK_URL;
-export const SERVER_WEBHOOK_SECRET_FILE = readSecretFile(process.env.SERVER_WEBHOOK_SECRET_FILE);
-export const AWS_ACCESS_KEY_ID_FILE = readSecretFile(process.env.AWS_ACCESS_KEY_ID_FILE);
-export const AWS_SECRET_ACCESS_KEY_FILE = readSecretFile(process.env.AWS_SECRET_ACCESS_KEY_FILE);
+export const WEBHOOK_URL = process.env.SERVER_WEBHOOK_URL;
+export const WEBHOOK_SECRET = readSecretFile(process.env.SERVER_WEBHOOK_SECRET_FILE);
+export const AWS_ACCESS_KEY_ID = readSecretFile(process.env.AWS_ACCESS_KEY_ID_FILE);
+export const AWS_SECRET_ACCESS_KEY = readSecretFile(process.env.AWS_SECRET_ACCESS_KEY_FILE);