docker
/
login-action
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmd output

This commit is contained in:
CrazyMax 2020-08-21 15:07:43 +02:00
parent 04f461cc60
commit 16d491f0ca
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/index.js generated vendored
View File

@ -4099,13 +4099,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
}); });
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.getRegion = exports.parseCLIVersion = exports.getCLIVersion = exports.getCLICmdOutput = exports.getCLI = exports.isECR = void 0; exports.parseCLIVersion = exports.getCLIVersion = exports.getCLICmdOutput = exports.getCLI = exports.getRegion = exports.isECR = void 0;
const semver = __importStar(__webpack_require__(383)); const semver = __importStar(__webpack_require__(383));
const io = __importStar(__webpack_require__(436)); const io = __importStar(__webpack_require__(436));
const execm = __importStar(__webpack_require__(757)); const execm = __importStar(__webpack_require__(757));
exports.isECR = (registry) => __awaiter(void 0, void 0, void 0, function* () { exports.isECR = (registry) => __awaiter(void 0, void 0, void 0, function* () {
return registry.includes('amazonaws'); return registry.includes('amazonaws');
}); });
exports.getRegion = (registry) => __awaiter(void 0, void 0, void 0, function* () {
return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
});
exports.getCLI = () => __awaiter(void 0, void 0, void 0, function* () { exports.getCLI = () => __awaiter(void 0, void 0, void 0, function* () {
return io.which('aws', true); return io.which('aws', true);
}); });
@ -4114,7 +4117,12 @@ exports.getCLICmdOutput = (args) => __awaiter(void 0, void 0, void 0, function*
if (res.stderr != '' && !res.success) { if (res.stderr != '' && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
return res.stdout; else if (res.stderr != '') {
return res.stderr.trim();
}
else {
return res.stdout.trim();
}
}); });
}); });
exports.getCLIVersion = () => __awaiter(void 0, void 0, void 0, function* () { exports.getCLIVersion = () => __awaiter(void 0, void 0, void 0, function* () {
@ -4127,9 +4135,6 @@ exports.parseCLIVersion = (stdout) => __awaiter(void 0, void 0, void 0, function
} }
return undefined; return undefined;
}); });
exports.getRegion = (registry) => __awaiter(void 0, void 0, void 0, function* () {
return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
});
//# sourceMappingURL=aws.js.map //# sourceMappingURL=aws.js.map
/***/ }) /***/ })

13
src/aws.ts
View File

@ -6,6 +6,10 @@ export const isECR = async (registry: string): Promise<boolean> => {
return registry.includes('amazonaws'); return registry.includes('amazonaws');
}; };
export const getRegion = async (registry: string): Promise<string> => {
return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
};
export const getCLI = async (): Promise<string> => { export const getCLI = async (): Promise<string> => {
return io.which('aws', true); return io.which('aws', true);
}; };
@ -14,8 +18,11 @@ export const getCLICmdOutput = async (args: string[]): Promise<string> => {
return execm.exec(await getCLI(), args, true).then(res => { return execm.exec(await getCLI(), args, true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr != '' && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} else if (res.stderr != '') {
return res.stderr.trim();
} else {
return res.stdout.trim();
} }
return res.stdout;
}); });
}; };
@ -30,7 +37,3 @@ export const parseCLIVersion = async (stdout: string): Promise<string | undefine
} }
return undefined; return undefined;
}; };
export const getRegion = async (registry: string): Promise<string> => {
return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
};