@onivoro/onix 20.5.11 → 20.5.13
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/deploy-s3-react/executor.js +4 -3
- package/src/executors/deploy-s3-react/executor.js.map +1 -1
- package/src/functions/deploy-lambda.function.js +2 -2
- package/src/functions/deploy-lambda.function.js.map +1 -1
- package/src/functions/push-image-to-ecr.function.js +1 -1
- package/src/functions/push-image-to-ecr.function.js.map +1 -1
- package/src/functions/resolve-aws-credentials.function.d.ts +4 -1
- package/src/functions/resolve-aws-credentials.function.js +25 -15
- package/src/functions/resolve-aws-credentials.function.js.map +1 -1
- package/src/functions/restart-ecs-service.function.js +1 -1
- package/src/functions/restart-ecs-service.function.js.map +1 -1
package/package.json
CHANGED
|
@@ -12,12 +12,13 @@ const fs_1 = require("fs");
|
|
|
12
12
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
13
13
|
const resolve_aws_credentials_function_1 = require("../../functions/resolve-aws-credentials.function");
|
|
14
14
|
const hashDelimiter = '-';
|
|
15
|
+
const assetsFolder = 'assets';
|
|
15
16
|
exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
const { region, bucket, omitAcl, version, profile } = options;
|
|
17
18
|
const [projectOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, context.projectName);
|
|
18
19
|
const app = context.projectName;
|
|
19
20
|
(0, pmx_function_1.pmxSpawn)(context, `nx build ${context.projectName}`);
|
|
20
|
-
const assetRoot = (0, path_1.resolve)(projectOutput,
|
|
21
|
+
const assetRoot = (0, path_1.resolve)(projectOutput, assetsFolder);
|
|
21
22
|
const jsAndCssAssets = yield getAssetListFromDirectory(assetRoot);
|
|
22
23
|
const indexHtml = yield getIndexHtmlContent(projectOutput);
|
|
23
24
|
const fileMappings = jsAndCssAssets.map(original => {
|
|
@@ -33,9 +34,9 @@ exports.default = (0, executor_factory_function_1.executorFactory)((options, con
|
|
|
33
34
|
contentType: (ext === '.js' ? 'text/javascript' : 'text/css')
|
|
34
35
|
};
|
|
35
36
|
});
|
|
36
|
-
let html = fileMappings.reduce((acc, { modified, original }) => acc.replace(original
|
|
37
|
+
let html = fileMappings.reduce((acc, { modified, original }) => acc.replace(`/${assetsFolder}/${original}`, modified), indexHtml);
|
|
37
38
|
const ACL = omitAcl ? undefined : 'public-read';
|
|
38
|
-
const s3Client = new client_s3_1.S3Client({ region, credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
39
|
+
const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
39
40
|
yield Promise.all(fileMappings.map((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ contentType, original, key }) {
|
|
40
41
|
return yield s3Client.send(new client_s3_1.PutObjectCommand({
|
|
41
42
|
Bucket: bucket,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-react/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAErD,mHAAoG;AACpG,+DAAwD;AACxD,yFAA4E;AAC5E,+BAAsC;AACtC,0CAAgD;AAChD,+EAAiE;AACjE,2BAAsC;AACtC,kDAAgE;AAChE,uGAAyF;AAEzF,MAAM,aAAa,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-react/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ const AdmZip = require("adm-zip");
|
|
|
8
8
|
const resolve_aws_credentials_function_1 = require("./resolve-aws-credentials.function");
|
|
9
9
|
function deployLambda(_a) {
|
|
10
10
|
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
|
-
const s3Client = new client_s3_1.S3Client({ region, credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
12
|
-
const lambdaClient = new client_lambda_1.LambdaClient({ region, credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
11
|
+
const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
12
|
+
const lambdaClient = new client_lambda_1.LambdaClient({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
|
|
13
13
|
const zip = new AdmZip();
|
|
14
14
|
zip.addLocalFolder(sourcePath);
|
|
15
15
|
const zipBuffer = zip.toBuffer();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-lambda.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/deploy-lambda.function.ts"],"names":[],"mappings":";;AA8BA,oCAgFC;;AA9GD,kDAAgE;AAChE,0DASgC;AAChC,kCAAkC;AAClC,yFAA2E;AAkB3E,SAAsB,YAAY;iEAAC,EAC/B,YAAY,EACZ,UAAU,EACV,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,GAAG,uBAAO,CAAC,SAAS,EAC3B,OAAO,GAAG,eAAe,EACzB,UAAU,GAAG,GAAG,EAChB,WAAW,EACX,OAAO,GAAG,IAAI,EACd,OAAO,GACU;QACjB,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-lambda.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/deploy-lambda.function.ts"],"names":[],"mappings":";;AA8BA,oCAgFC;;AA9GD,kDAAgE;AAChE,0DASgC;AAChC,kCAAkC;AAClC,yFAA2E;AAkB3E,SAAsB,YAAY;iEAAC,EAC/B,YAAY,EACZ,UAAU,EACV,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,GAAG,uBAAO,CAAC,SAAS,EAC3B,OAAO,GAAG,eAAe,EACzB,UAAU,GAAG,GAAG,EAChB,WAAW,EACX,OAAO,GAAG,IAAI,EACd,OAAO,GACU;QACjB,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAErG,MAAM,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAEjC,MAAM,GAAG,GAAG,GAAG,YAAY,MAAM,CAAC;QAClC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAgB,CAAC;YACrC,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,SAAS;SAClB,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAA4B,WAAW,CAAC,CAAC,CAAC;YACnD,SAAS,EAAE,WAAW;SACzB,CAAC,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,aAAgD,CAAC;QAErD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,kCAAkB,CAAC;gBAC5D,YAAY,EAAE,YAAY;aAC7B,CAAC,CAAC,CAAC;YACJ,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,IAAI,KAAK,2BAA2B,EAAE,CAAC;gBAC7C,cAAc,GAAG,KAAK,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACJ,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,qCAAqB,CAAC;gBAC9C,YAAY,EAAE,YAAY;gBAC1B,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE;oBACF,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,GAAG;iBACb;gBACD,UAAU,EAAE,UAAU;gBACtB,WAAW,EAAE,OAAO;aACvB,CAAC,CAAC,CAAC;QACR,CAAC;aAAM,CAAC;YACJ,IAAI,cAAc,GAAG,OAAO,CAAC;YAE7B,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,kDAAkC,CAAC;gBAC3D,YAAY,EAAE,YAAY;gBAC1B,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,UAAU;gBACtB,WAAW,EAAE,cAAc;aAC9B,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YAE3D,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,yCAAyB,CAAC;gBAClD,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,GAAG;aACb,CAAC,CAAC,CAAC;QACR,CAAC;IACL,CAAC;CAAA"}
|
|
@@ -10,7 +10,7 @@ function pushImageToECR(_a) {
|
|
|
10
10
|
return tslib_1.__awaiter(this, arguments, void 0, function* ({ region, ecr, registryId, profile }) {
|
|
11
11
|
var _b, _c;
|
|
12
12
|
try {
|
|
13
|
-
const config = { region, credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) };
|
|
13
|
+
const config = { region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) };
|
|
14
14
|
const ecrClient = new client_ecr_1.ECRClient(config);
|
|
15
15
|
const authCommand = new client_ecr_1.GetAuthorizationTokenCommand({
|
|
16
16
|
registryIds: registryId ? [registryId] : undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-image-to-ecr.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/push-image-to-ecr.function.ts"],"names":[],"mappings":";;AAaA,wCAsEC;;AAnFD,oDAA+F;AAE/F,uCAAoC;AACpC,iDAAyC;AACzC,yFAA2E;AAS3E,SAAsB,cAAc;iEAAC,EACnC,MAAM,EACN,GAAG,EACH,UAAU,EACV,OAAO,EACS;;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAoB,EAAE,MAAM,EAAE,WAAW,EAAE,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"push-image-to-ecr.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/push-image-to-ecr.function.ts"],"names":[],"mappings":";;AAaA,wCAsEC;;AAnFD,oDAA+F;AAE/F,uCAAoC;AACpC,iDAAyC;AACzC,yFAA2E;AAS3E,SAAsB,cAAc;iEAAC,EACnC,MAAM,EACN,GAAG,EACH,UAAU,EACV,OAAO,EACS;;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAoB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC;YAC9F,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAC;YAExC,MAAM,WAAW,GAAG,IAAI,yCAA4B,CAAC;gBACnD,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;aACnD,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEvD,IAAI,CAAC,CAAA,MAAA,MAAA,YAAY,CAAC,iBAAiB,0CAAG,CAAC,CAAC,0CAAE,kBAAkB,CAAA,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YAED,IAAI,QAAgB,CAAC;YACrB,IAAI,QAAgB,CAAC;YACrB,IAAI,gBAAwB,CAAC;YAE7B,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAC3B,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB,EACpD,QAAQ,CACT,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEpC,QAAQ,GAAG,CAAC,CAAC;gBACb,QAAQ,GAAG,CAAC,CAAC;gBAEb,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAEnE,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;gBACrE,MAAM,KAAK,CAAC;YACd,CAAC;YAED,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,eAAe;oBACtB,MAAM,QAAQ,GAAG;oBACjB,MAAM,QAAQ,GAAG;oBACjB,gBAAgB,EAChB,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,GAAG,CAAC,CAAC;YACrE,CAAC;YAED,MAAM,WAAW,GAAG,eAAe,GAAG,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,WAAW,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC;YACd,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC5C,eAAM,CAAC,KAAK,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC;YAE7B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CAAA"}
|
|
@@ -1 +1,4 @@
|
|
|
1
|
-
export declare function resolveAwsCredentials(profile?: string | undefined):
|
|
1
|
+
export declare function resolveAwsCredentials(profile?: string | undefined): Promise<{
|
|
2
|
+
accessKeyId: string;
|
|
3
|
+
secretAccessKey: string;
|
|
4
|
+
}>;
|
|
@@ -1,27 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveAwsCredentials = resolveAwsCredentials;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const credential_providers_1 = require("@aws-sdk/credential-providers");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
6
7
|
const AWS_ACCESS_KEY_ID = 'AWS_ACCESS_KEY_ID';
|
|
7
8
|
const AWS_SECRET_ACCESS_KEY = 'AWS_SECRET_ACCESS_KEY';
|
|
8
9
|
function resolveAwsCredentials(profile) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return
|
|
10
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
if (profile) {
|
|
12
|
+
try {
|
|
13
|
+
devkit_1.logger.warn(`attempting to use AWS profile "${profile}" for AWS authentication`);
|
|
14
|
+
const credentialResolver = (0, credential_providers_1.fromIni)({ profile });
|
|
15
|
+
return yield credentialResolver();
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
devkit_1.logger.warn(`failed to load AWS profile "${profile}"... ensure that ${[AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY].map(_ => `"${_.toLowerCase()}"`).join(' and ')} are lowercase in your ~/.aws/credentials file`);
|
|
19
|
+
if ((process.env[AWS_ACCESS_KEY_ID] && process.env[AWS_SECRET_ACCESS_KEY])) {
|
|
20
|
+
devkit_1.logger.log(`using UPPERCASE AWS_* environment variables for AWS authentication`);
|
|
21
|
+
return {
|
|
22
|
+
accessKeyId: process.env[AWS_ACCESS_KEY_ID],
|
|
23
|
+
secretAccessKey: process.env[AWS_SECRET_ACCESS_KEY],
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
if ((process.env[AWS_ACCESS_KEY_ID.toLowerCase()] && process.env[AWS_SECRET_ACCESS_KEY.toLowerCase()])) {
|
|
27
|
+
devkit_1.logger.log(`using lowercase aws_* environment variables for AWS authentication`);
|
|
28
|
+
return {
|
|
29
|
+
accessKeyId: process.env[AWS_ACCESS_KEY_ID.toLowerCase()],
|
|
30
|
+
secretAccessKey: process.env[AWS_SECRET_ACCESS_KEY.toLowerCase()],
|
|
31
|
+
};
|
|
32
|
+
}
|
|
15
33
|
}
|
|
16
34
|
}
|
|
17
|
-
|
|
18
|
-
devkit_1.logger.warn(`failed to load AWS profile "${profile}"... ensure that ${[AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY].map(_ => `"${_.toLowerCase()}"`).join(' and ')} are lowercase in your ~/.aws/credentials file`);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
if ((process.env[AWS_ACCESS_KEY_ID] && process.env[AWS_SECRET_ACCESS_KEY])
|
|
22
|
-
||
|
|
23
|
-
(process.env[AWS_ACCESS_KEY_ID.toLowerCase()] && process.env[AWS_SECRET_ACCESS_KEY.toLowerCase()])) {
|
|
24
|
-
return undefined;
|
|
25
|
-
}
|
|
35
|
+
});
|
|
26
36
|
}
|
|
27
37
|
//# sourceMappingURL=resolve-aws-credentials.function.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-aws-credentials.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/resolve-aws-credentials.function.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"resolve-aws-credentials.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/resolve-aws-credentials.function.ts"],"names":[],"mappings":";;AAMA,sDAkCC;;AAxCD,wEAAwD;AACxD,uCAAoC;AAEpC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAC9C,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,SAAsB,qBAAqB,CAAC,OAA4B;;QACpE,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC;gBACD,eAAM,CAAC,IAAI,CAAC,kCAAkC,OAAO,0BAA0B,CAAC,CAAC;gBAEjF,MAAM,kBAAkB,GAAG,IAAA,8BAAO,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEhD,OAAO,MAAM,kBAAkB,EAAE,CAAC;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,eAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gDAAgD,CAAC,CAAC;gBAEjN,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,EACxE,CAAC;oBACC,eAAM,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;oBAEjF,OAAO;wBACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;wBAC3C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;qBACtD,CAAC;gBACN,CAAC;gBAED,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,EACpG,CAAC;oBACC,eAAM,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;oBAEjF,OAAO;wBACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;wBACzD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC;qBACpE,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;CAAA"}
|
|
@@ -12,7 +12,7 @@ function updateEcsService(_) {
|
|
|
12
12
|
try {
|
|
13
13
|
const client = new client_ecs_1.ECSClient({
|
|
14
14
|
region,
|
|
15
|
-
credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile)
|
|
15
|
+
credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile)
|
|
16
16
|
});
|
|
17
17
|
const response = yield client.send(new client_ecs_1.UpdateServiceCommand({
|
|
18
18
|
cluster,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart-ecs-service.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/restart-ecs-service.function.ts"],"names":[],"mappings":";;AAIA,4CA2BC;;AA/BD,oDAAsE;AACtE,uCAAoC;AACpC,yFAA2E;AAE3E,SAAsB,gBAAgB,CAAC,CAAwE;;;QAC3G,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC;gBACzB,MAAM;gBACN,WAAW,EAAE,IAAA,wDAAqB,EAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"restart-ecs-service.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/restart-ecs-service.function.ts"],"names":[],"mappings":";;AAIA,4CA2BC;;AA/BD,oDAAsE;AACtE,uCAAoC;AACpC,yFAA2E;AAE3E,SAAsB,gBAAgB,CAAC,CAAwE;;;QAC3G,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC;gBACzB,MAAM;gBACN,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC;aACpD,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,iCAAoB,CAAC;gBACxD,OAAO;gBACP,OAAO;gBACP,kBAAkB,EAAE,IAAI;aAC3B,CAAC,CAAC,CAAC;YAEJ,eAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAErD,IAAI,MAAA,QAAQ,CAAC,OAAO,0CAAE,UAAU,EAAE,CAAC;gBAC/B,eAAM,CAAC,IAAI,CAAC,iBAAiB,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;YACjE,CAAC;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,eAAM,CAAC,KAAK,CAAC,+BAA+B,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,KAAK,EAAE,CAAC,CAAC;YAEvE,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CAAA"}
|