From 549296df1f0c34acb3c2420038fd6c57643594fa Mon Sep 17 00:00:00 2001 From: Matthew Crouch Date: Fri, 7 Feb 2025 09:59:55 -0500 Subject: [PATCH] EDSC-4351: Fixes login issue, adds binaryMediaTypes to api gateway (#1854) * EDSC-4351: Fixes login issue, adds binaryMediaTypes to api gateway * EDSC-4351: Removes temp file --- bin/deploy-bamboo.sh | 3 ++- cdk/earthdata-search-infrastructure/package-lock.json | 8 ++++---- cdk/earthdata-search-infrastructure/package.json | 2 +- cdk/earthdata-search-static/package-lock.json | 8 ++++---- cdk/earthdata-search-static/package.json | 2 +- cdk/earthdata-search/lib/earthdata-search-stack.ts | 1 + cdk/earthdata-search/package-lock.json | 8 ++++---- cdk/earthdata-search/package.json | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/bin/deploy-bamboo.sh b/bin/deploy-bamboo.sh index c716eca96a..a04dd19cb2 100755 --- a/bin/deploy-bamboo.sh +++ b/bin/deploy-bamboo.sh @@ -59,6 +59,7 @@ cat < .dockerignore **/node_modules **/cdk.out .DS_Store +.env .git .github .esbuild @@ -77,7 +78,7 @@ FROM node:22 COPY . /build WORKDIR /build RUN npm ci --omit=dev -RUN npm run build +RUN NODE_ENV=production npm run build EOF dockerTag=edsc-$bamboo_STAGE_NAME diff --git a/cdk/earthdata-search-infrastructure/package-lock.json b/cdk/earthdata-search-infrastructure/package-lock.json index 57a0f336a5..00a3e50f6f 100644 --- a/cdk/earthdata-search-infrastructure/package-lock.json +++ b/cdk/earthdata-search-infrastructure/package-lock.json @@ -8,7 +8,7 @@ "name": "earthdata-search-infrastructure", "version": "0.1.0", "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "^2.173.4", "constructs": "^10.0.0" }, @@ -1514,9 +1514,9 @@ } }, "node_modules/@edsc/cdk-utils": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.6.tgz", - "integrity": "sha512-IT3gXyXxUjqvHVWDb+B+4q2YdgdaaXFzM74pxqFjiQ3/SFAkD5R2fU18Z6oIM+0kIVUx73CcD5MvVUTFwN9Gpw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.1.0.tgz", + "integrity": "sha512-+55XvnK2y8iBRvRqfrJkWbMG8XnBBFRjYpLBzaxKaBVD+C+S/CfVy8z6s+hFO34ooiwVjfvy5vo9rQx07zZcBg==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.717.0", diff --git a/cdk/earthdata-search-infrastructure/package.json b/cdk/earthdata-search-infrastructure/package.json index 3fc6f9e44c..ccd3477239 100644 --- a/cdk/earthdata-search-infrastructure/package.json +++ b/cdk/earthdata-search-infrastructure/package.json @@ -20,7 +20,7 @@ "typescript": "~5.6.3" }, "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "^2.173.4", "constructs": "^10.0.0" } diff --git a/cdk/earthdata-search-static/package-lock.json b/cdk/earthdata-search-static/package-lock.json index f19b9e8f0c..db61ecb750 100644 --- a/cdk/earthdata-search-static/package-lock.json +++ b/cdk/earthdata-search-static/package-lock.json @@ -8,7 +8,7 @@ "name": "earthdata-search-static", "version": "0.1.0", "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "2.175.0", "constructs": "^10.0.0" }, @@ -1514,9 +1514,9 @@ } }, "node_modules/@edsc/cdk-utils": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.6.tgz", - "integrity": "sha512-IT3gXyXxUjqvHVWDb+B+4q2YdgdaaXFzM74pxqFjiQ3/SFAkD5R2fU18Z6oIM+0kIVUx73CcD5MvVUTFwN9Gpw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.1.0.tgz", + "integrity": "sha512-+55XvnK2y8iBRvRqfrJkWbMG8XnBBFRjYpLBzaxKaBVD+C+S/CfVy8z6s+hFO34ooiwVjfvy5vo9rQx07zZcBg==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.717.0", diff --git a/cdk/earthdata-search-static/package.json b/cdk/earthdata-search-static/package.json index 6f17109ad8..8f2bfebe5e 100644 --- a/cdk/earthdata-search-static/package.json +++ b/cdk/earthdata-search-static/package.json @@ -20,7 +20,7 @@ "typescript": "~5.6.3" }, "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "2.175.0", "constructs": "^10.0.0" } diff --git a/cdk/earthdata-search/lib/earthdata-search-stack.ts b/cdk/earthdata-search/lib/earthdata-search-stack.ts index f70da747ca..1237ba22ee 100644 --- a/cdk/earthdata-search/lib/earthdata-search-stack.ts +++ b/cdk/earthdata-search/lib/earthdata-search-stack.ts @@ -65,6 +65,7 @@ export class EarthdataSearchStack extends cdk.Stack { const apiGateway = new application.ApiGateway(this, 'ApiGateway', { apiScope: apiNestedStack, apiName: this.stackName, + binaryMediaTypes: ['image/png'], stageName: STAGE_NAME, }) const { diff --git a/cdk/earthdata-search/package-lock.json b/cdk/earthdata-search/package-lock.json index c6c490e5dc..a7490debf5 100644 --- a/cdk/earthdata-search/package-lock.json +++ b/cdk/earthdata-search/package-lock.json @@ -8,7 +8,7 @@ "name": "earthdata-search", "version": "0.1.0", "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "^2.173.4", "constructs": "^10.0.0" }, @@ -1515,9 +1515,9 @@ } }, "node_modules/@edsc/cdk-utils": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.6.tgz", - "integrity": "sha512-IT3gXyXxUjqvHVWDb+B+4q2YdgdaaXFzM74pxqFjiQ3/SFAkD5R2fU18Z6oIM+0kIVUx73CcD5MvVUTFwN9Gpw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.1.0.tgz", + "integrity": "sha512-+55XvnK2y8iBRvRqfrJkWbMG8XnBBFRjYpLBzaxKaBVD+C+S/CfVy8z6s+hFO34ooiwVjfvy5vo9rQx07zZcBg==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.717.0", diff --git a/cdk/earthdata-search/package.json b/cdk/earthdata-search/package.json index 8f48bb2ae2..dd0e066ce6 100644 --- a/cdk/earthdata-search/package.json +++ b/cdk/earthdata-search/package.json @@ -21,7 +21,7 @@ "typescript": "~5.6.3" }, "dependencies": { - "@edsc/cdk-utils": "^0.0.6", + "@edsc/cdk-utils": "^0.1.0", "aws-cdk-lib": "^2.173.4", "constructs": "^10.0.0" }