GQL-98: Fixes local MMT tokens and removes unused lambda code (#153)

* GQL-98: Fixes local MMT tokens and removes unused lambda

* GQL-98: Remove unused code

* GQL-98: Updates cdk-utils

bin/deploy-bamboo.sh

@@ -27,7 +27,6 @@ docker build -t $dockerTag .
 # Convenience function to invoke `docker run` with appropriate env vars instead of baking them into image
 dockerRun() {
   docker run \
-    -e "API_GATEWAY_DEPLOYMENT_ID=$bamboo_API_GATEWAY_DEPLOYMENT_ID" \
     -e "AWS_ACCESS_KEY_ID=$bamboo_AWS_ACCESS_KEY_ID" \
     -e "AWS_ACCOUNT=$bamboo_AWS_ACCOUNT" \
     -e "AWS_SECRET_ACCESS_KEY=$bamboo_AWS_SECRET_ACCESS_KEY" \

cdk/graphql-infrastructure/package.json

@@ -20,7 +20,7 @@
     "typescript": "~5.6.3"
   },
   "dependencies": {
-    "@edsc/cdk-utils": "^0.0.2",
+    "@edsc/cdk-utils": "^0.0.3",
     "aws-cdk-lib": "^2.173.2",
     "constructs": "^10.0.0"
   }

cdk/graphql/lib/graphql-stack.ts

@@ -10,11 +10,10 @@ export interface GraphqlStackProps extends cdk.StackProps {
 }
 
 // `logGroupSuffix` is used during the initial migration from serverless to CDK to avoid name conflicts
-// const logGroupSuffix = '_2'
+// const logGroupSuffix = '_cdk'
 const logGroupSuffix = ''
 
 const {
-  API_GATEWAY_DEPLOYMENT_ID = `ApiGatewayDeployment${new Date().getTime()}`,
   CLOUDFRONT_BUCKET_NAME = 'local-bucket',
   LOG_DESTINATION_ARN = 'local-arn',
   NODE_ENV = 'development',
@@ -45,7 +44,7 @@ const environment = {
   ummToolVersion: '1.2.0',
   ummVariableVersion: '1.9.0',
   maximumQueryPathLength: '1500',
-  stage: STAGE_NAME,
+  stage: STAGE_NAME
 }
 
 // NodeJS bundling options
@@ -89,7 +88,6 @@ export class GraphqlStack extends cdk.Stack {
     });
 
     const apiGateway = new application.ApiGateway(this, 'ApiGateway', {
-      apiDeploymentId: API_GATEWAY_DEPLOYMENT_ID,
       apiName: `${STAGE_NAME}-graphql`,
       stageName: STAGE_NAME,
     })
@@ -179,7 +177,7 @@ export class GraphqlStack extends cdk.Stack {
       logDestinationArn: LOG_DESTINATION_ARN,
       logGroupSuffix,
       runtime,
-      s3Sources: [`graphql_apigw${logGroupSuffix}`],
+      s3Sources: ['graphql_apigw'],
       securityGroups: [lambdaSecurityGroup],
       stageName: STAGE_NAME,
       vpc

cdk/graphql/package.json

@@ -21,7 +21,7 @@
     "typescript": "~5.6.3"
   },
   "dependencies": {
-    "@edsc/cdk-utils": "^0.0.2",
+    "@edsc/cdk-utils": "^0.0.3",
     "aws-cdk-lib": "^2.173.2",
     "constructs": "^10.0.0"
   }

src/graphql/handler.js

@@ -108,10 +108,10 @@ const apolloPlugins = [
   })
 ]
 
-const { IS_OFFLINE: isOffline } = env
+const { AWS_SAM_LOCAL: awsSamLocal } = env
 
 // Only utilize stellate in deployed environments
-if (!isOffline) {
+if (awsSamLocal !== 'true') {
   const {
     stellateAppName,
     stellateKey

src/permissions/index.js

@@ -45,7 +45,7 @@ const permissions = shield(
     fallbackRule: allow,
 
     // Only allow the external errors when running in the local DEV environment
-    allowExternalErrors: process.env.IS_OFFLINE,
+    allowExternalErrors: process.env.AWS_SAM_LOCAL === 'true',
 
     // `fallbackError` displays a useful message to the user containing a requestId, rather than the default "Not Authorized!" GraphQL Shield error.
     fallbackError: async (thrownThing, parent, args, context) => {

src/permissions/rules/__tests__/isLocalMMT.test.js

@@ -12,7 +12,7 @@ describe('isLocalMMT', () => {
   })
 
   test('returns true if the request is offline and has the admin token', async () => {
-    process.env.IS_OFFLINE = true
+    process.env.AWS_SAM_LOCAL = 'true'
 
     const result = await isLocalMMT.resolve(
       null,
@@ -28,7 +28,7 @@ describe('isLocalMMT', () => {
   })
 
   test('returns false if the request is offline but a real token is passed', async () => {
-    process.env.IS_OFFLINE = true
+    process.env.AWS_SAM_LOCAL = 'true'
 
     const result = await isLocalMMT.resolve(
       null,
@@ -44,7 +44,7 @@ describe('isLocalMMT', () => {
   })
 
   test('returns false if the request is not offline', async () => {
-    process.env.IS_OFFLINE = false
+    process.env.AWS_SAM_LOCAL = 'false'
 
     const result = await isLocalMMT.resolve(
       null,

src/permissions/rules/isLocalMMT.js

@@ -4,7 +4,7 @@ import { downcaseKeys } from '../../utils/downcaseKeys'
 import { isOfflineMMT } from '../../utils/isOfflineMMT'
 
 /**
- * Check to see if the request is made while running in dev mode (IS_OFFLINE),
+ * Check to see if the request is made while running in dev mode (AWS_SAM_LOCAL === 'true'),
  * and is coming from the local MMT (token ABC-1).
  */
 export const isLocalMMT = rule()(async (parent, params, context) => {

src/utils/__tests__/fetchLaunchpadEdlUid.test.js

@@ -30,7 +30,7 @@ describe('fetchLaunchpadEdlUid', () => {
   })
 
   test('returns null for the local MMT', async () => {
-    process.env.IS_OFFLINE = true
+    process.env.AWS_SAM_LOCAL = 'true'
     const token = await fetchLaunchpadEdlUid('ABC-1', 'mock-client-token')
 
     expect(token).toBeNull()

src/utils/__tests__/isOfflineMMT.test.js

@@ -16,7 +16,7 @@ describe('isOfflineMMT', () => {
 
   describe('when running offline with the local MMT token', () => {
     test('returns true', async () => {
-      process.env.IS_OFFLINE = true
+      process.env.AWS_SAM_LOCAL = 'true'
       const token = await isOfflineMMT('ABC-1')
 
       expect(token).toEqual(true)
@@ -25,7 +25,7 @@ describe('isOfflineMMT', () => {
 
   describe('when running online with the local MMT token', () => {
     test('returns false', async () => {
-      process.env.IS_OFFLINE = false
+      process.env.AWS_SAM_LOCAL = 'false'
       const token = await isOfflineMMT('ABC-1')
 
       expect(token).toEqual(false)
@@ -34,7 +34,7 @@ describe('isOfflineMMT', () => {
 
   describe('when running online a regular token', () => {
     test('returns false', async () => {
-      process.env.IS_OFFLINE = false
+      process.env.AWS_SAM_LOCAL = 'false'
       const token = await isOfflineMMT('mock-token')
 
       expect(token).toEqual(false)

src/utils/aws/__test__/getLambdaConfig.test.js

@@ -12,15 +12,15 @@ describe('Test getLambdaConfig', () => {
   })
 
   test('when offline endpoint is configured', () => {
-    process.env.IS_OFFLINE = true
+    process.env.AWS_SAM_LOCAL = 'true'
 
     const lambdaConfig = getLambdaConfig()
     expect(lambdaConfig.endpoint).toEqual('http://localhost:3014')
     process.env = OLD_ENV
   })
 
   test('when online endpoint is configured', () => {
-    process.env.IS_OFFLINE = false
+    process.env.AWS_SAM_LOCAL = 'false'
 
     const lambdaConfig = getLambdaConfig()
     expect(lambdaConfig.endpoint).toEqual(undefined)

src/utils/aws/getLambdaConfig.js

@@ -9,9 +9,9 @@ export const getLambdaConfig = () => {
   }
 
   const { env } = process
-  const { IS_OFFLINE: isOffline } = env
+  const { AWS_SAM_LOCAL: awsSamLocal } = env
 
-  if (isOffline) {
+  if (awsSamLocal === 'true') {
     config.endpoint = 'http://localhost:3014'
   }
 

src/utils/isOfflineMMT.js

@@ -3,4 +3,4 @@
  * @param {String} token User token to check
  * @returns Boolean
  */
-export const isOfflineMMT = (token) => process.env.IS_OFFLINE && token === 'ABC-1'
+export const isOfflineMMT = (token) => process.env.AWS_SAM_LOCAL === 'true' && token === 'ABC-1'