photowall/pwcli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add maxmind license key (#12)"

Browse Source 
This reverts commit 02beda5a40.
This commit is contained in:
Arwid Thornström
2022-12-06 13:33:30 +01:00
parent 320d3031bc
commit c7090fc1f3
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands/deployment/testservers/create/create.ts
+10 -12
View File
@@ -36,7 +36,7 @@ const getDownloadFileFromRepoCommand = (token: string, org: string, repo: string
return `curl -o /tmp/${file} -H 'Authorization: token ${token} ' -H 'Accept: application/vnd.github.v3.raw' -O -L https://api.github.com/repos/${org}/${repo}/contents/${path}`;
}
const getCreateStackCommand = (stackName: string, branch: string, templateFile: string, dockerImage: string, githubToken: string, composerAuth: string, maxmindLicenseKey: string) => {
const getCreateStackCommand = (stackName: string, branch: string, templateFile: string, dockerImage: string, githubToken: string, composerAuth: string) => {
const stackDomain = stackName.replace('photowall-', '');
const cmd = [
`aws cloudformation create-stack --stack-name ${stackName}`,
@@ -62,7 +62,6 @@ const getCreateStackCommand = (stackName: string, branch: string, templateFile:
`ParameterKey=StaticCdnCertificateArn,ParameterValue=${STACK_DEFAULTS.STATIC_CDN_CERTIFICATE_ARN}`,
`ParameterKey=AwsAccessKeyParamNameEnvironment,ParameterValue=${STACK_DEFAULTS.AWS_KEY_ENVIRONMENT}`,
`ParameterKey=DatabaseSecurityGroup,ParameterValue=${STACK_DEFAULTS.DB_SECURITY_GROUP_ID}`,
`ParameterKey=MaxMindLicenseKey,ParameterValue=${maxmindLicenseKey}`,
];
return cmd.join(' ');
@@ -90,17 +89,17 @@ module.exports = {
hidden: false,
run: async (toolbox: GluegunMenuToolbox) => {
const { system, strings, print, filesystem } = toolbox;
// Load settings
const config = await getSettings(toolbox);
if (!config) {
await toolbox.menu.showMenu('setup', defaultMenuSettings);
return;
}
const branches = await getRepoBranches(toolbox, config.gh_token, 'Photowall', 'photowall');
const branchOptions = branches.map(item => item.name);
const promptBranch = new AutoComplete({
name: 'branchName',
message: 'Select a branch',
@@ -153,7 +152,7 @@ module.exports = {
const options = curratedStacks.map(item => {
return item.name;
});
const input = new Input({
type: 'input',
name: 'stack',
@@ -164,9 +163,9 @@ module.exports = {
if (options.includes(stackName)) {
print.error(`
The stack ${chalk.yellow(stackName)} is already taken, try the update command instead.
`);
if (toolbox.fromMenu()) {
await toolbox.menu.showMenu('deployment testservers');
@@ -181,8 +180,8 @@ module.exports = {
await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings);
}
}
try {
const shouldRun = await getConfirmation(branchName, stackName);
@@ -195,7 +194,6 @@ module.exports = {
const awsAccountId = strings.trim(await system.run(`aws sts get-caller-identity --query Account --output text`));
const awsRegion = strings.trim(await system.run(`aws configure get region`));
const githubToken = strings.trim(await system.run(`aws ssm get-parameter --with-decryption --name /github/CODE_PIPELINE_TOKEN --output text --query Parameter.Value`));
const maxmindLicenseKey = strings.trim(await system.run(`aws ssm get-parameter --with-decryption --name /maxmind/MAXMIND_LICENSE_KEY --output text --query Parameter.Value`));
print.fancy(await system.run(`aws ecr create-repository --repository ${stackName}`));
print.fancy(await system.run(`aws ecr get-login-password --region ${awsRegion} | docker login --username AWS --password-stdin ${awsAccountId}.dkr.ecr.${awsRegion}.amazonaws.com`));
@@ -208,7 +206,7 @@ module.exports = {
composerAuthToken = composerAuthToken.replace('\n', '');
const composerAuth = `'{\\\"github-oauth\\\":{\\\"github.com\\\":\\\"${composerAuthToken}\\\"}}'`;
const createCommand = getCreateStackCommand(stackName, branchName, 'file://ecs-service.yaml', dockerImage, githubToken, composerAuth, maxmindLicenseKey);
const createCommand = getCreateStackCommand(stackName, branchName, 'file://ecs-service.yaml', dockerImage, githubToken, composerAuth);
print.fancy(await system.run(createCommand, {cwd: '/tmp/', trim: true}));
}
} catch (e) {
src/commands/deployment/testservers/status/status.ts
+7 -7
View File
@@ -17,7 +17,7 @@ module.exports = {
description: 'Show status for available testservers (s)',
hidden: false,
run: async (toolbox: GluegunMenuToolbox) => {
const { system, strings } = toolbox
const stacks = JSON.parse(strings.trim(await system.run(`aws cloudformation list-stacks`)));
@@ -45,14 +45,14 @@ module.exports = {
updated: '',
}
}
}
return Promise.resolve(null);
}));
const curratedStacks: Stack[] = teststacks.filter(Boolean);
const status = (status: string) => {
const status = (status: string) => {
switch(status) {
case 'NO_STATUS':
return `(${chalk.red.bold('?')})`;
@@ -78,10 +78,10 @@ module.exports = {
const timeSince = (date: number) => {
const now = Date.now();
let seconds = Math.floor((now - date) / 1000);
let interval = seconds / 31536000;
var seconds = Math.floor((now - date) / 1000);
var interval = seconds / 31536000;
if (interval > 1) {
return Math.floor(interval) + " years";
}
src/commands/deployment/testservers/update/update.ts
+7 -10
View File
@@ -39,7 +39,7 @@ const getLifeCyclePolicyCommand = (stackName: string, policyFile: string) => {
return `aws ecr put-lifecycle-policy --repository-name ${stackName} --lifecycle-policy-text "${policyFile}"`;
}
const getUpdateStackCommand = (stackName: string, branch: string, templateFile: string, maxmindLicenseKey: string) => {
const getUpdateStackCommand = (stackName: string, branch: string, templateFile: string) => {
const cmd = [
`aws cloudformation update-stack --stack-name ${stackName}`,
`--template-body ${templateFile}`,
@@ -63,8 +63,7 @@ const getUpdateStackCommand = (stackName: string, branch: string, templateFile:
`ParameterKey=StaticCdnHostName,ParameterValue=${STACK_DEFAULTS.STATIC_CDN_HOSTNAME}`,
`ParameterKey=StaticCdnCertificateArn,ParameterValue=${STACK_DEFAULTS.STATIC_CDN_CERTIFICATE_ARN}`,
`ParameterKey=AwsAccessKeyParamNameEnvironment,ParameterValue=${STACK_DEFAULTS.AWS_KEY_ENVIRONMENT}`,
`ParameterKey=DatabaseSecurityGroup,ParameterValue=${STACK_DEFAULTS.DB_SECURITY_GROUP_ID}`,
`ParameterKey=MaxMindLicenseKey,ParameterValue=${maxmindLicenseKey}`,
`ParameterKey=DatabaseSecurityGroup,ParameterValue=${STACK_DEFAULTS.DB_SECURITY_GROUP_ID}`
];
return cmd.join(' ');
}
@@ -119,7 +118,7 @@ module.exports = {
hidden: false,
run: async (toolbox: GluegunMenuToolbox) => {
const { system, strings, print } = toolbox;
// Load settings
const config = await getSettings(toolbox);
if (!config) {
@@ -175,7 +174,7 @@ module.exports = {
const options = curratedStacks.map(item => {
return item.name;
});
const prompt = new AutoComplete({
name: 'testserver',
message: 'Choose a server',
@@ -191,18 +190,16 @@ module.exports = {
await system.run(getDownloadFileFromRepoCommand(config.gh_token, 'Photowall', 'photowall', 'cloudformation/ecs-service.yaml'));
const stackName = await prompt.run();
const maxmindLicenseKey = strings.trim(await system.run(`aws ssm get-parameter --with-decryption --name /maxmind/MAXMIND_LICENSE_KEY --output text --query Parameter.Value`));
const lifeCycleCommand = getLifeCyclePolicyCommand(stackName, `file://ecr-lifecycle-policy.json`);
const updateStackCommand = getUpdateStackCommand(stackName, branchName, `file://ecs-service.yaml`, maxmindLicenseKey);
const updateStackCommand = getUpdateStackCommand(stackName, branchName, `file://ecs-service.yaml`);
const shouldRun = await getConfirmation(branchName, stackName);
if (shouldRun) {
let output = await system.run(lifeCycleCommand, {cwd: '/tmp/', trim: true});
print.fancy(output);
output = await system.run(updateStackCommand, {cwd: '/tmp/', trim: true});
output = await system.run(updateStackCommand, {cwd: '/tmp/', trim: true});
print.fancy(output);
}