@onivoro/onix 20.5.57 → 20.5.59
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.
- package/package.json +1 -1
- package/src/executors/typeorm-db-client/executor.js +10 -13
- package/src/executors/typeorm-db-client/executor.js.map +1 -1
- package/src/functions/deploy-lambda.function.js +5 -5
- package/src/functions/deploy-lambda.function.js.map +1 -1
- package/src/functions/interpolate-environment-expression.function.d.ts +1 -0
- package/src/functions/interpolate-environment-expression.function.js +10 -0
- package/src/functions/interpolate-environment-expression.function.js.map +1 -0
- package/src/functions/interpolate-environment-object.function.d.ts +3 -0
- package/src/functions/interpolate-environment-object.function.js +13 -0
- package/src/functions/interpolate-environment-object.function.js.map +1 -0
- package/src/index.d.ts +2 -0
- package/src/index.js +2 -0
- package/src/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -5,29 +5,26 @@ const load_env_file_function_1 = require("../../functions/load-env-file.function
|
|
|
5
5
|
const executor_factory_function_1 = require("../../functions/executor-factory.function");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
7
|
const os_1 = require("os");
|
|
8
|
+
const interpolate_environment_expression_function_1 = require("../../functions/interpolate-environment-expression.function");
|
|
8
9
|
exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
9
10
|
const { envFile, host, db, password, port, user, type, httpPort } = options || {};
|
|
10
11
|
if (envFile) {
|
|
11
12
|
(0, load_env_file_function_1.loadEnvFile)(envFile);
|
|
12
13
|
}
|
|
13
|
-
const http =
|
|
14
|
+
const http = (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(httpPort);
|
|
15
|
+
const literalHost = (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(host);
|
|
16
|
+
const resolvedHost = ['localhost', '127.0.0.1'].includes(literalHost) ? 'host.docker.internal' : literalHost;
|
|
14
17
|
(0, child_process_1.execSync)(`docker` + ' ' + [
|
|
15
18
|
'run',
|
|
16
19
|
`-p ${http}:${http}`,
|
|
17
|
-
`--env="DV_HOST=${
|
|
18
|
-
`--env="DV_DB=${
|
|
19
|
-
`--env="DV_PASSWORD=${
|
|
20
|
-
`--env="DV_PORT=${
|
|
21
|
-
`--env="DV_USER=${
|
|
22
|
-
`--env="DV_TYPE=${
|
|
20
|
+
`--env="DV_HOST=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(resolvedHost)}"`,
|
|
21
|
+
`--env="DV_DB=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(db)}"`,
|
|
22
|
+
`--env="DV_PASSWORD=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(password)}"`,
|
|
23
|
+
`--env="DV_PORT=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(port)}"`,
|
|
24
|
+
`--env="DV_USER=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(user)}"`,
|
|
25
|
+
`--env="DV_TYPE=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(type)}"`,
|
|
23
26
|
`--env="PORT=${http}"`,
|
|
24
27
|
`icedlee337/datavore:${((0, os_1.arch)() === 'arm64') ? 'arm64v8' : 'amd64'}`
|
|
25
28
|
].join(' '));
|
|
26
29
|
}));
|
|
27
|
-
function env(value) {
|
|
28
|
-
if (!value || !value.toString().includes('process.env')) {
|
|
29
|
-
return value;
|
|
30
|
-
}
|
|
31
|
-
return eval(value);
|
|
32
|
-
}
|
|
33
30
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":";;;AAEA,mFAAqE;AACrE,yFAA4E;AAC5E,iDAAyC;AACzC,2BAA0B;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":";;;AAEA,mFAAqE;AACrE,yFAA4E;AAC5E,iDAAyC;AACzC,2BAA0B;AAC1B,6HAA+G;AAE/G,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,EACT,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,IAAI,OAAO,EAAE,CAAC;QACZ,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,8EAAgC,EAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,8EAAgC,EAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC;IAE7G,IAAA,wBAAQ,EAAC,QAAQ,GAAG,GAAG,GAAG;QACxB,KAAK;QACL,MAAM,IAAI,IAAI,IAAI,EAAE;QACpB,kBAAkB,IAAA,8EAAgC,EAAC,YAAY,CAAC,GAAG;QACnE,gBAAgB,IAAA,8EAAgC,EAAC,EAAE,CAAC,GAAG;QACvD,sBAAsB,IAAA,8EAAgC,EAAC,QAAQ,CAAC,GAAG;QACnE,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,eAAe,IAAI,GAAG;QACtB,uBAAuB,CAAC,IAAA,SAAI,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE;KACpE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEf,CAAC,CAAA,CAAC,CAAC"}
|
|
@@ -6,6 +6,7 @@ const client_s3_1 = require("@aws-sdk/client-s3");
|
|
|
6
6
|
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
7
7
|
const AdmZip = require("adm-zip");
|
|
8
8
|
const resolve_aws_credentials_function_1 = require("./resolve-aws-credentials.function");
|
|
9
|
+
const interpolate_environment_object_function_1 = require("./interpolate-environment-object.function");
|
|
9
10
|
function deployLambda(_a) {
|
|
10
11
|
return tslib_1.__awaiter(this, arguments, void 0, function* ({ functionName, sourcePath, region, bucket, roleArn, runtime = client_lambda_1.Runtime.nodejs22x, handler = 'index.handler', memorySize = 128, environment, delayMs = 5000, profile, }) {
|
|
11
12
|
const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
@@ -19,8 +20,8 @@ function deployLambda(_a) {
|
|
|
19
20
|
Key: key,
|
|
20
21
|
Body: zipBuffer
|
|
21
22
|
}));
|
|
22
|
-
const
|
|
23
|
-
Variables: environment
|
|
23
|
+
const Environment = environment ? {
|
|
24
|
+
Variables: (0, interpolate_environment_object_function_1.interpolateEnvironmentObject)(environment)
|
|
24
25
|
} : undefined;
|
|
25
26
|
let functionExists = true;
|
|
26
27
|
let currentConfig;
|
|
@@ -49,18 +50,17 @@ function deployLambda(_a) {
|
|
|
49
50
|
S3Key: key
|
|
50
51
|
},
|
|
51
52
|
MemorySize: memorySize,
|
|
52
|
-
Environment
|
|
53
|
+
Environment
|
|
53
54
|
}));
|
|
54
55
|
}
|
|
55
56
|
else {
|
|
56
|
-
let updatedEnvVars = envVars;
|
|
57
57
|
yield lambdaClient.send(new client_lambda_1.UpdateFunctionConfigurationCommand({
|
|
58
58
|
FunctionName: functionName,
|
|
59
59
|
Role: roleArn,
|
|
60
60
|
Handler: handler,
|
|
61
61
|
Runtime: runtime,
|
|
62
62
|
MemorySize: memorySize,
|
|
63
|
-
Environment
|
|
63
|
+
Environment,
|
|
64
64
|
}));
|
|
65
65
|
yield new Promise(resolve => setTimeout(resolve, delayMs));
|
|
66
66
|
yield lambdaClient.send(new client_lambda_1.UpdateFunctionCodeCommand({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-lambda.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/deploy-lambda.function.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy-lambda.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/deploy-lambda.function.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function interpolateEnvironmentExpression(value: string): any;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.interpolateEnvironmentExpression = interpolateEnvironmentExpression;
|
|
4
|
+
function interpolateEnvironmentExpression(value) {
|
|
5
|
+
if (!value || !value.toString().includes('process.env')) {
|
|
6
|
+
return value;
|
|
7
|
+
}
|
|
8
|
+
return eval(value);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=interpolate-environment-expression.function.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interpolate-environment-expression.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/interpolate-environment-expression.function.ts"],"names":[],"mappings":";;AAAA,4EAMC;AAND,SAAgB,gCAAgC,CAAC,KAAa;IAC1D,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.interpolateEnvironmentObject = interpolateEnvironmentObject;
|
|
4
|
+
const interpolate_environment_expression_function_1 = require("./interpolate-environment-expression.function");
|
|
5
|
+
function interpolateEnvironmentObject(environment) {
|
|
6
|
+
return Object.entries(environment)
|
|
7
|
+
.map(([key, value]) => [key, (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(value)])
|
|
8
|
+
.reduce((_, [key, value]) => {
|
|
9
|
+
_[key] = value;
|
|
10
|
+
return _;
|
|
11
|
+
}, {});
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=interpolate-environment-object.function.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interpolate-environment-object.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/interpolate-environment-object.function.ts"],"names":[],"mappings":";;AAEA,oEAOC;AATD,+GAAiG;AAEjG,SAAgB,4BAA4B,CAAC,WAAuC;IAChF,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;SAC7B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,8EAAgC,EAAC,KAAK,CAAC,CAAC,CAAC;SACrE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACxB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,EAAE,EAAS,CAAC,CAAC;AACtB,CAAC"}
|
package/src/index.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ export * from './plugins/plugin';
|
|
|
6
6
|
export * from './functions/object-to-env-exports.function';
|
|
7
7
|
export * from './functions/as-s3-app-key.function';
|
|
8
8
|
export * from './functions/copy-from-s3.function';
|
|
9
|
+
export * from './functions/interpolate-environment-expression.function';
|
|
10
|
+
export * from './functions/interpolate-environment-object.function';
|
|
9
11
|
export * from './functions/executor-factory.function';
|
|
10
12
|
export * from './functions/extract-project-build-outputs.function';
|
|
11
13
|
export * from './functions/extract-project-configuration.function';
|
package/src/index.js
CHANGED
|
@@ -9,6 +9,8 @@ tslib_1.__exportStar(require("./plugins/plugin"), exports);
|
|
|
9
9
|
tslib_1.__exportStar(require("./functions/object-to-env-exports.function"), exports);
|
|
10
10
|
tslib_1.__exportStar(require("./functions/as-s3-app-key.function"), exports);
|
|
11
11
|
tslib_1.__exportStar(require("./functions/copy-from-s3.function"), exports);
|
|
12
|
+
tslib_1.__exportStar(require("./functions/interpolate-environment-expression.function"), exports);
|
|
13
|
+
tslib_1.__exportStar(require("./functions/interpolate-environment-object.function"), exports);
|
|
12
14
|
tslib_1.__exportStar(require("./functions/executor-factory.function"), exports);
|
|
13
15
|
tslib_1.__exportStar(require("./functions/extract-project-build-outputs.function"), exports);
|
|
14
16
|
tslib_1.__exportStar(require("./functions/extract-project-configuration.function"), exports);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,qFAA2D;AAC3D,6EAAmD;AACnD,4EAAkD;AAClD,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,iFAAuD;AACvD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,qFAA2D;AAC3D,6EAAmD;AACnD,4EAAkD;AAClD,kGAAwE;AACxE,8FAAoE;AACpE,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,iFAAuD;AACvD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}
|