actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better aws commands

pull/387/head
Frostebite 2022-04-21 02:50:23 +01:00
parent fa7bd794ae
commit 261397221a
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js vendored
View File

@ -2071,17 +2071,16 @@ class AwsCliCommands {
} }
static garbageCollectAwsAllOlderThanOneDay() { static garbageCollectAwsAllOlderThanOneDay() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
yield AwsCliCommands.cleanup(true, 24); yield AwsCliCommands.cleanup(true);
}); });
} }
static cleanup(deleteResources = false, olderThanAgeInHours = 0) { static cleanup(deleteResources = false) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
process.env.AWS_REGION = input_1.default.region; process.env.AWS_REGION = input_1.default.region;
const CF = new aws_sdk_1.default.CloudFormation(); const CF = new aws_sdk_1.default.CloudFormation();
const ecs = new aws_sdk_1.default.ECS(); const ecs = new aws_sdk_1.default.ECS();
AwsCliCommands.awsListStacks((element) => __awaiter(this, void 0, void 0, function* () { yield AwsCliCommands.awsListStacks((element) => __awaiter(this, void 0, void 0, function* () {
if (deleteResources && if (deleteResources) {
new Date(Date.now()).getUTCMilliseconds() - element.CreationTime.getUTCMilliseconds() > olderThanAgeInHours) {
if (element.StackName === 'game-ci' || element.TemplateDescription === 'Game-CI base stack') { if (element.StackName === 'game-ci' || element.TemplateDescription === 'Game-CI base stack') {
cloud_runner_logger_1.default.log(`Skipping ${element.StackName} ignore list`); cloud_runner_logger_1.default.log(`Skipping ${element.StackName} ignore list`);
return; return;
@ -2090,9 +2089,8 @@ class AwsCliCommands {
yield CF.deleteStack(deleteStackInput).promise(); yield CF.deleteStack(deleteStackInput).promise();
} }
})); }));
AwsCliCommands.awsListTasks((taskElement, element) => __awaiter(this, void 0, void 0, function* () { yield AwsCliCommands.awsListTasks((taskElement, element) => __awaiter(this, void 0, void 0, function* () {
if (deleteResources && if (deleteResources) {
new Date(Date.now()).getUTCMilliseconds() - taskElement.createdAt.getUTCMilliseconds() > olderThanAgeInHours) {
yield ecs.stopTask({ task: taskElement.taskArn || '', cluster: element }).promise(); yield ecs.stopTask({ task: taskElement.taskArn || '', cluster: element }).promise();
} }
})); }));

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

18
src/model/cloud-runner/providers/aws/commands/aws-cli-commands.ts
View File

@ -65,18 +65,15 @@ export class AwsCliCommands {
} }
@CliFunction(`aws-garbage-collect-all-1d-older`, `garbage collect aws`) @CliFunction(`aws-garbage-collect-all-1d-older`, `garbage collect aws`)
static async garbageCollectAwsAllOlderThanOneDay() { static async garbageCollectAwsAllOlderThanOneDay() {
await AwsCliCommands.cleanup(true, 24); await AwsCliCommands.cleanup(true);
} }
private static async cleanup(deleteResources = false, olderThanAgeInHours = 0) { private static async cleanup(deleteResources = false) {
process.env.AWS_REGION = Input.region; process.env.AWS_REGION = Input.region;
const CF = new AWS.CloudFormation(); const CF = new AWS.CloudFormation();
const ecs = new AWS.ECS(); const ecs = new AWS.ECS();
AwsCliCommands.awsListStacks(async (element) => { await AwsCliCommands.awsListStacks(async (element) => {
if ( if (deleteResources) {
deleteResources &&
new Date(Date.now()).getUTCMilliseconds() - element.CreationTime.getUTCMilliseconds() > olderThanAgeInHours
) {
if (element.StackName === 'game-ci' || element.TemplateDescription === 'Game-CI base stack') { if (element.StackName === 'game-ci' || element.TemplateDescription === 'Game-CI base stack') {
CloudRunnerLogger.log(`Skipping ${element.StackName} ignore list`); CloudRunnerLogger.log(`Skipping ${element.StackName} ignore list`);
@ -86,11 +83,8 @@ export class AwsCliCommands {
await CF.deleteStack(deleteStackInput).promise(); await CF.deleteStack(deleteStackInput).promise();
} }
}); });
AwsCliCommands.awsListTasks(async (taskElement, element) => { await AwsCliCommands.awsListTasks(async (taskElement, element) => {
if ( if (deleteResources) {
deleteResources &&
new Date(Date.now()).getUTCMilliseconds() - taskElement.createdAt.getUTCMilliseconds() > olderThanAgeInHours
) {
await ecs.stopTask({ task: taskElement.taskArn || '', cluster: element }).promise(); await ecs.stopTask({ task: taskElement.taskArn || '', cluster: element }).promise();
} }
}); });