diff --git a/.npmrc b/.npmrc index fcdbb5524a8bff8905b96f274821a3c8f1c5f6f4..b93715b6f13ff97bc5032efa59ee1e9c04b533ba 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ @ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/ +@usgs-cdk:registry=https://code.chs.usgs.gov/api/v4/projects/usgs-cdk%2Fusgs-cdk/packages/npm/ diff --git a/libs/aws/reverse-proxy/update-proxy.ts b/libs/aws/reverse-proxy/update-proxy.ts index 5fc5d1378c866a358ea11760210b2abbf990a4c6..a3167d2b0c9c5561d59671f5c80cd0198d79e16d 100644 --- a/libs/aws/reverse-proxy/update-proxy.ts +++ b/libs/aws/reverse-proxy/update-proxy.ts @@ -1,4 +1,5 @@ -import {aws_ssm as ssm, custom_resources as cr, Stack} from 'aws-cdk-lib'; +import {usgsSsm} from '@usgs-cdk/lib'; +import {custom_resources as cr, Stack} from 'aws-cdk-lib'; import {Construct} from 'constructs'; import * as fs from 'fs'; import * as path from 'path'; @@ -33,6 +34,9 @@ export interface UpdateProxyProps { scope: Construct; /** SSM parameter name for reverse proxy topic arn */ topicArnSsmName: string; + + /** Region of SSM parameter */ + parameterRegion?: string; } /** @@ -53,9 +57,10 @@ export function updateProxy(props: UpdateProxyProps): cr.AwsCustomResource { }; }); - const topicArn = ssm.StringParameter.valueFromLookup( + const topicArn = usgsSsm.StringParameter.valueFromLookup( props.scope, - props.topicArnSsmName + props.topicArnSsmName, + props.parameterRegion ); const {bundlingRequired, stackName} = Stack.of(props.scope); diff --git a/package-lock.json b/package-lock.json index 9e1dfb19c5631b1086c6042c6b2dd587fb4fc5b1..54847ea8e9ef16bd385eba1268c71d92265b5a5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ }, "devDependencies": { "@types/node": "^18.11.9", + "@usgs-cdk/lib": "^1.4.1-cdk-2-110-0.1", "aws-cdk-lib": "^2.95.0", "constructs": "^10.3.0", "eslint-plugin-simple-import-sort": "^8.0.0", @@ -51,6 +52,21 @@ "integrity": "sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==", "dev": true }, + "node_modules/@aws-cdk/aws-apigatewayv2-alpha": { + "version": "2.110.0-alpha.0", + "resolved": "https://registry.npmjs.org/@aws-cdk/aws-apigatewayv2-alpha/-/aws-apigatewayv2-alpha-2.110.0-alpha.0.tgz", + "integrity": "sha512-9JhPK6azSrzL6kCewbvrN4nGJLqR6iEy0KY9TqQ2VL3EqW+W8YLfH2eovcmgCU7ggE0J0zlEtCt8Ixr3Wy1r7g==", + "deprecated": "This package has been stabilized and moved to aws-cdk-lib", + "dev": true, + "peer": true, + "engines": { + "node": ">= 14.15.0" + }, + "peerDependencies": { + "aws-cdk-lib": "^2.110.0", + "constructs": "^10.0.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", @@ -698,6 +714,18 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@usgs-cdk/lib": { + "version": "1.4.1-cdk-2-110-0.1", + "resolved": "https://code.chs.usgs.gov/api/v4/projects/6739/packages/npm/@usgs-cdk/lib/-/@usgs-cdk/lib-1.4.1-cdk-2-110-0.1.tgz", + "integrity": "sha1-5RUuzw/zxV3HnMZuQ80BuO6reJ8=", + "dev": true, + "peerDependencies": { + "@aws-cdk/aws-apigatewayv2-alpha": "^2.110.0-alpha.0", + "aws-cdk-lib": "2.110.0", + "constructs": "^10.2.70", + "fast-deep-equal": "^3.1.3" + } + }, "node_modules/abs-svg-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", @@ -915,9 +943,9 @@ "integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=" }, "node_modules/aws-cdk-lib": { - "version": "2.95.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.95.0.tgz", - "integrity": "sha512-2G8QAldRI2Fa/ThaMyO04iLu9lER5AYKgrWshJ59L6JT4XraRTqh8sjti+ew4I6ADk6Zaprh2YcLRS2wTcICzA==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.110.0.tgz", + "integrity": "sha512-4IxjdtaoGjQPqtFyYXG6kOs9t/UTAh06tlGyCPpvhTZNoKNFUkku3H6MArlazpiKtm+dThdF+p5lQLB/kIu/qw==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -932,7 +960,7 @@ ], "dev": true, "dependencies": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", @@ -941,7 +969,7 @@ "ignore": "^5.2.4", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -1165,7 +1193,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/punycode": { - "version": "2.3.0", + "version": "2.3.1", "dev": true, "inBundle": true, "license": "MIT", @@ -1257,7 +1285,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/universalify": { - "version": "2.0.0", + "version": "2.0.1", "dev": true, "inBundle": true, "license": "MIT", @@ -6084,6 +6112,14 @@ "integrity": "sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==", "dev": true }, + "@aws-cdk/aws-apigatewayv2-alpha": { + "version": "2.110.0-alpha.0", + "resolved": "https://registry.npmjs.org/@aws-cdk/aws-apigatewayv2-alpha/-/aws-apigatewayv2-alpha-2.110.0-alpha.0.tgz", + "integrity": "sha512-9JhPK6azSrzL6kCewbvrN4nGJLqR6iEy0KY9TqQ2VL3EqW+W8YLfH2eovcmgCU7ggE0J0zlEtCt8Ixr3Wy1r7g==", + "dev": true, + "peer": true, + "requires": {} + }, "@babel/code-frame": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", @@ -6586,6 +6622,13 @@ "eslint-visitor-keys": "^2.0.0" } }, + "@usgs-cdk/lib": { + "version": "1.4.1-cdk-2-110-0.1", + "resolved": "https://code.chs.usgs.gov/api/v4/projects/6739/packages/npm/@usgs-cdk/lib/-/@usgs-cdk/lib-1.4.1-cdk-2-110-0.1.tgz", + "integrity": "sha1-5RUuzw/zxV3HnMZuQ80BuO6reJ8=", + "dev": true, + "requires": {} + }, "abs-svg-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", @@ -6748,12 +6791,12 @@ "integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=" }, "aws-cdk-lib": { - "version": "2.95.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.95.0.tgz", - "integrity": "sha512-2G8QAldRI2Fa/ThaMyO04iLu9lER5AYKgrWshJ59L6JT4XraRTqh8sjti+ew4I6ADk6Zaprh2YcLRS2wTcICzA==", + "version": "2.110.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.110.0.tgz", + "integrity": "sha512-4IxjdtaoGjQPqtFyYXG6kOs9t/UTAh06tlGyCPpvhTZNoKNFUkku3H6MArlazpiKtm+dThdF+p5lQLB/kIu/qw==", "dev": true, "requires": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", @@ -6762,7 +6805,7 @@ "ignore": "^5.2.4", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -6915,7 +6958,7 @@ } }, "punycode": { - "version": "2.3.0", + "version": "2.3.1", "bundled": true, "dev": true }, @@ -6973,7 +7016,7 @@ } }, "universalify": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "dev": true }, diff --git a/package.json b/package.json index 2a82833564d1e99083df88cf92f946541d03054a..f7749dba2f6ddacbdb4324e5952ec1141dc76c69 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ }, "devDependencies": { "@types/node": "^18.11.9", + "@usgs-cdk/lib": "^1.4.1-cdk-2-110-0.1", "aws-cdk-lib": "^2.95.0", "constructs": "^10.3.0", "eslint-plugin-simple-import-sort": "^8.0.0",