Handle AWS CLI v2

This commit is contained in:
CrazyMax 2020-08-21 15:27:22 +02:00
parent 16d491f0ca
commit d833f7c2ad
No known key found for this signature in database
GPG key ID: 3248E46B6BB8C7F7
5 changed files with 58 additions and 30 deletions

View file

@ -26,14 +26,26 @@ export const getCLICmdOutput = async (args: string[]): Promise<string> => {
});
};
export const getCLIVersion = async (): Promise<string | undefined> => {
export const getCLIVersion = async (): Promise<string> => {
return parseCLIVersion(await getCLICmdOutput(['--version']));
};
export const parseCLIVersion = async (stdout: string): Promise<string | undefined> => {
export const parseCLIVersion = async (stdout: string): Promise<string> => {
const matches = /aws-cli\/([0-9.]+)/.exec(stdout);
if (matches) {
return semver.clean(matches[1]);
if (!matches) {
throw new Error(`Cannot parse AWS CLI version`);
}
return semver.clean(matches[1]);
};
export const getECRLoginCmd = async (cliVersion: string, registry: string, region: string): Promise<string> => {
if (semver.satisfies(cliVersion, '>=2.0.0')) {
return getCLICmdOutput(['ecr', 'get-login-password', '--region', region]).then(pwd => {
return `docker login --username AWS --password ${pwd} ${registry}`;
});
} else {
return getCLICmdOutput(['ecr', 'get-login', '--region', region, '--no-include-email']).then(dockerLoginCmd => {
return dockerLoginCmd;
});
}
return undefined;
};

View file

@ -42,20 +42,20 @@ export async function loginStandard(registry: string, username: string, password
export async function loginECR(registry: string, username: string, password: string): Promise<void> {
const cliPath = await aws.getCLI();
const cliVersion = await aws.getCLIVersion();
const ecrRegion = await aws.getRegion(registry);
core.info(`💡 AWS ECR registry detected with ${ecrRegion} region`);
const region = await aws.getRegion(registry);
core.info(`💡 AWS ECR registry detected with ${region} region`);
process.env.AWS_ACCESS_KEY_ID = username;
process.env.AWS_SECRET_ACCESS_KEY = password;
core.info(`⬇️ Retrieving docker login command through AWS CLI ${cliVersion} (${cliPath})...`);
aws.getCLICmdOutput(['ecr', 'get-login', '--region', ecrRegion, '--no-include-email']).then(stdout => {
core.info(`🔑 Logging into ${registry}...`);
execm.exec(stdout, [], true).then(res => {
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
core.info('🎉 Login Succeeded!');
});
const loginCmd = await aws.getECRLoginCmd(cliVersion, registry, region);
core.info(`🔑 Logging into ${registry}...`);
execm.exec(loginCmd, [], true).then(res => {
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
core.info('🎉 Login Succeeded!');
});
}