Merge branch 'main' into njwe-2618/etpl-add-local-indemand-passaic-co…

…unty
newjersey · Jan 22, 2025 · aaf1d1a · aaf1d1a
2 parents 989ddc2 + 423d4f9
commit aaf1d1a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/backend/src/contentful/client.ts b/backend/src/contentful/client.ts
@@ -1,4 +1,8 @@
 import { GraphQLClient } from "graphql-request";
+import dotenv from "dotenv"
+
+dotenv.config()
+
 export const contentfulClient = ({
   query,
   variables,
@@ -26,8 +30,9 @@ export const contentfulClient = ({
   if (excludeInvalid) {
     headers["X-Exclude-Invalid"] = "true";
   }
+  const environment = process.env.ENVIRONMENT || "master";
   const client = new GraphQLClient(
-    `https://${process.env.BASE_URL}/${process.env.SPACE_ID}`,
+    `https://${process.env.BASE_URL}/${process.env.SPACE_ID}/environments/${environment}`,
     {
       headers,
     },

diff --git a/backend/src/utils/secretManager.ts b/backend/src/utils/secretManager.ts
@@ -1,17 +1,21 @@
 import AWS from 'aws-sdk';
+import dotenv from 'dotenv';
+
+dotenv.config();
 
-// Configure AWS SDK and create SecretsManager instance
 AWS.config.update({ region: 'us-east-1' });
 const secretsManager = new AWS.SecretsManager();
 
 export async function getContentfulAccessToken(): Promise<string> {
     console.log('Retrieving secret for Contentful access token...');
 
+    const environment = process.env.ENVIRONMENT || 'master'; // Default to 'master'
+    const secretEnvironment = environment === 'master' ? 'prod' : environment;
+    const secretId = `mycareernj-contentful-token-${secretEnvironment}`;
     try {
-        // Log the request details for debugging
-        console.log(`Requesting secret value for ID: 'mycareernj-contentful-token-prod'`);
+        console.log(`Requesting secret value for ID: '${secretId}'`);
 
-        const data = await secretsManager.getSecretValue({ SecretId: 'mycareernj-contentful-token-prod' }).promise();
+        const data = await secretsManager.getSecretValue({ SecretId: secretId }).promise();
 
         if (data.SecretString) {
             console.log('Secret string found, returning the secret value.');