Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: Remove old scale down mechanism (< 0.19.0) #2519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2022
Merged

feat: Remove old scale down mechanism (< 0.19.0) #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/runners/lambdas/runners/src/scale-runners/scale-down.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ describe('scaleDown', () => {

expect(mockOctokit.apps.getRepoInstallation).toBeCalledTimes(2);
expect(mockOctokit.apps.getOrgInstallation).toBeCalledTimes(1);
expect(terminateRunner).toBeCalledTimes(8);
expect(terminateRunner).toBeCalledTimes(7);
for (const toTerminate of RUNNERS_ALL_REMOVED) {
expect(terminateRunner).toHaveBeenCalledWith(toTerminate.instanceId);
}
Expand Down Expand Up @@ -558,7 +558,7 @@ describe('scaleDown', () => {

expect(mockOctokit.apps.getRepoInstallation).toBeCalledTimes(2);
expect(mockOctokit.apps.getOrgInstallation).toBeCalledTimes(1);
expect(terminateRunner).toBeCalledTimes(8);
expect(terminateRunner).toBeCalledTimes(7);
for (const toTerminate of RUNNERS_ALL_REMOVED) {
expect(terminateRunner).toHaveBeenCalledWith(toTerminate.instanceId);
}
Expand Down
20 changes: 1 addition & 19 deletions modules/runners/lambdas/runners/src/scale-runners/scale-down.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,21 +220,6 @@ async function listAndSortRunners(environment: string) {
});
}

/**
* We are moving to a new strategy to find and remove runners, this function will ensure
* during migration runners tagged in the old way are removed.
*/
function filterLegacyRunners(ec2runners: RunnerList[]): RunnerInfo[] {
return ec2runners
.filter((ec2Runner) => ec2Runner.repo || ec2Runner.org)
.map((ec2Runner) => ({
instanceId: ec2Runner.instanceId,
launchTime: ec2Runner.launchTime,
type: ec2Runner.org ? 'Org' : 'Repo',
owner: ec2Runner.org ? (ec2Runner.org as string) : (ec2Runner.repo as string),
}));
}

function filterRunners(ec2runners: RunnerList[]): RunnerInfo[] {
return ec2runners.filter((ec2Runner) => ec2Runner.type) as RunnerInfo[];
}
Expand All @@ -256,12 +241,9 @@ export async function scaleDown(): Promise<void> {
logger.debug(`No active runners found for environment: '${environment}'`, LogFields.print());
return;
}
const legacyRunners = filterLegacyRunners(ec2Runners);
logger.debug(JSON.stringify(legacyRunners), LogFields.print());
const runners = filterRunners(ec2Runners);

const runners = filterRunners(ec2Runners);
await evaluateAndRemoveRunners(runners, scaleDownConfigs);
await evaluateAndRemoveRunners(legacyRunners, scaleDownConfigs);

const activeEc2RunnersCountAfter = (await listAndSortRunners(environment)).length;
logger.info(
Expand Down