@goldstack/template-lambda-api-cli 0.6.54 → 0.6.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateLambdaApiCli.d.ts","sourceRoot":"","sources":["../../src/templateLambdaApiCli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"templateLambdaApiCli.d.ts","sourceRoot":"","sources":["../../src/templateLambdaApiCli.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,GAAG,SAAgB,MAAM,EAAE,KAAG,OAAO,CAAC,IAAI,CAgHtD,CAAC"}
|
|
@@ -14,7 +14,9 @@ const yargs_1 = __importDefault(require("yargs"));
|
|
|
14
14
|
const fs_1 = __importDefault(require("fs"));
|
|
15
15
|
const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
|
|
16
16
|
const templateLambdaConsts_1 = require("./templateLambdaConsts");
|
|
17
|
+
const outmatch_1 = __importDefault(require("outmatch"));
|
|
17
18
|
const utils_sh_1 = require("@goldstack/utils-sh");
|
|
19
|
+
const utils_log_1 = require("@goldstack/utils-log");
|
|
18
20
|
const run = async (args) => {
|
|
19
21
|
await (0, utils_cli_1.wrapCli)(async () => {
|
|
20
22
|
const argv = await (0, utils_package_1.buildCli)({
|
|
@@ -40,8 +42,9 @@ const run = async (args) => {
|
|
|
40
42
|
throw new Error(`Please specify lambda function handlers in ${templateLambdaConsts_1.defaultRoutesPath} so that API Gateway route configuration can be generated.`);
|
|
41
43
|
}
|
|
42
44
|
const lambdaRoutes = (0, utils_aws_lambda_1.readLambdaConfig)(templateLambdaConsts_1.defaultRoutesPath);
|
|
45
|
+
let filteredLambdaRoutes = lambdaRoutes;
|
|
43
46
|
config.deployments = config.deployments.map((e) => {
|
|
44
|
-
const lambdasConfigs = (0, utils_aws_lambda_1.generateLambdaConfig)(e.configuration,
|
|
47
|
+
const lambdasConfigs = (0, utils_aws_lambda_1.generateLambdaConfig)(e.configuration, filteredLambdaRoutes);
|
|
45
48
|
e.configuration.lambdas = lambdasConfigs;
|
|
46
49
|
(0, utils_aws_lambda_1.validateDeployment)(e.configuration.lambdas);
|
|
47
50
|
return e;
|
|
@@ -49,6 +52,22 @@ const run = async (args) => {
|
|
|
49
52
|
(0, utils_package_2.writePackageConfig)(config);
|
|
50
53
|
const command = argv._[0];
|
|
51
54
|
const [, , , ...opArgs] = args;
|
|
55
|
+
if (command === 'build' || command === 'deploy') {
|
|
56
|
+
console.log(opArgs[1]);
|
|
57
|
+
if (opArgs.length === 2) {
|
|
58
|
+
filteredLambdaRoutes = filteredLambdaRoutes.filter((el) => {
|
|
59
|
+
const result = (0, outmatch_1.default)(`**/*${opArgs[1]}*`)(el.relativeFilePath) ||
|
|
60
|
+
(0, outmatch_1.default)(`**/*${opArgs[1]}*/*`)(el.relativeFilePath);
|
|
61
|
+
(0, utils_log_1.debug)(`Filtering lambdas. Testing: ${el.relativeFilePath} to match ${`*${opArgs[1]}*`}. Result: ${result}`);
|
|
62
|
+
return result;
|
|
63
|
+
});
|
|
64
|
+
if (filteredLambdaRoutes.length === 0) {
|
|
65
|
+
(0, utils_log_1.warn)(`Cannot perform command '${command}'. No routes match supplied filter ${opArgs[1]}.`);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
// console.log(filteredLambdaRoutes);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
52
71
|
if (command === 'infra') {
|
|
53
72
|
await (0, utils_terraform_aws_1.terraformAwsCli)(opArgs, {
|
|
54
73
|
// temporary workaround for https://github.com/goldstack/goldstack/issues/40
|
|
@@ -58,11 +77,16 @@ const run = async (args) => {
|
|
|
58
77
|
}
|
|
59
78
|
if (command === 'build') {
|
|
60
79
|
const deployment = packageConfig.getDeployment(opArgs[0]);
|
|
80
|
+
let routeFilter = undefined;
|
|
81
|
+
if (opArgs.length === 2) {
|
|
82
|
+
routeFilter = `*${opArgs[1]}*`;
|
|
83
|
+
}
|
|
61
84
|
await (0, utils_aws_lambda_1.buildFunctions)({
|
|
62
85
|
routesDir: templateLambdaConsts_1.defaultRoutesPath,
|
|
63
86
|
buildOptions: (0, utils_aws_lambda_1.defaultBuildOptions)(),
|
|
64
87
|
deploymentName: deployment.name,
|
|
65
|
-
configs:
|
|
88
|
+
configs: filteredLambdaRoutes,
|
|
89
|
+
routeFilter,
|
|
66
90
|
lambdaNamePrefix: deployment.configuration.lambdaNamePrefix || '',
|
|
67
91
|
packageRootDir: (0, utils_sh_1.pwd)(),
|
|
68
92
|
});
|
|
@@ -73,7 +97,7 @@ const run = async (args) => {
|
|
|
73
97
|
routesPath: templateLambdaConsts_1.defaultRoutesPath,
|
|
74
98
|
configuration: packageConfig.getDeployment(opArgs[0]).configuration,
|
|
75
99
|
deployment: packageConfig.getDeployment(opArgs[0]),
|
|
76
|
-
config:
|
|
100
|
+
config: filteredLambdaRoutes,
|
|
77
101
|
packageRootFolder: (0, utils_sh_1.pwd)(),
|
|
78
102
|
});
|
|
79
103
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateLambdaApiCli.js","sourceRoot":"","sources":["../../src/templateLambdaApiCli.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAyE;AACzE,oDAA+C;AAC/C,gEAA2D;AAC3D,wEAAiE;AACjE,0EAAgE;AAChE,4DAA8D;AAC9D,kDAA0B;AAC1B,4CAAoB;AAKpB,kEAOqC;AACrC,iEAA2D;AAC3D,kDAA0C;
|
|
1
|
+
{"version":3,"file":"templateLambdaApiCli.js","sourceRoot":"","sources":["../../src/templateLambdaApiCli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goldstack/template-lambda-api-cli",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.55",
|
|
4
4
|
"description": "Companion for project templates for deploying Lambdas as a REST API",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"goldstack",
|
|
@@ -60,6 +60,7 @@
|
|
|
60
60
|
"@goldstack/utils-template": "0.4.22",
|
|
61
61
|
"@goldstack/utils-terraform": "0.4.42",
|
|
62
62
|
"@goldstack/utils-terraform-aws": "0.4.45",
|
|
63
|
+
"outmatch": "^1.0.0",
|
|
63
64
|
"source-map-support": "^0.5.21",
|
|
64
65
|
"yargs": "^17.5.1"
|
|
65
66
|
},
|