Skip to content

refactor(storage): route lambda access through storage providers #5449

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

Open
edersonbrilhante wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(storage): route lambda access through storage providers #5449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db70dc
refactor(storage): route lambda access through storage providers
edersonbrilhante Sep 18, 2026
02f0018
style: fix formatting issues
edersonbrilhante Sep 18, 2026
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
1 change: 0 additions & 1 deletion lambdas/functions/control-plane/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
},
"dependencies": {
"@aws-github-runner/aws-powertools-util": "*",
"@aws-github-runner/aws-ssm-util": "*",
"@aws-github-runner/compute-providers": "*",
"@aws-github-runner/storage-providers": "*",
"@aws-lambda-powertools/parameters": "^2.31.0",
Expand Down
251 changes: 49 additions & 202 deletions lambdas/functions/control-plane/src/github/auth.test.ts
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions lambdas/functions/control-plane/src/lambda.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ import { captureLambdaHandler, logger } from '@aws-github-runner/aws-powertools-
import { createRunnerConfigHousekeeper } from '@aws-github-runner/storage-providers';
import { Context, SQSEvent, SQSRecord } from 'aws-lambda';

import { addMiddleware, adjustPool, scaleDownHandler, scaleUpHandler, ssmHousekeeper, jobRetryCheck } from './lambda';
import {
addMiddleware,
adjustPool,
scaleDownHandler,
scaleUpHandler,
runnerConfigHousekeeper,
jobRetryCheck,
} from './lambda';
import { adjust } from './pool/pool';
import { scaleDown } from './scale-runners/scale-down';
import { scaleUp } from './scale-runners/scale-up';
Expand Down Expand Up @@ -66,7 +73,6 @@ vi.mock('./scale-runners/scale-down');
vi.mock('./scale-runners/scale-up');
vi.mock('./scale-runners/job-retry');
vi.mock('@aws-github-runner/aws-powertools-util');
vi.mock('@aws-github-runner/aws-ssm-util');
vi.mock('@aws-github-runner/storage-providers', () => ({
createRunnerConfigHousekeeper: vi.fn(),
}));
Expand Down Expand Up @@ -300,18 +306,18 @@ describe('Test middleware', () => {
});
});

describe('Test ssm housekeeper lambda wrapper.', () => {
describe('Test runnerConfigHousekeeper lambda wrapper.', () => {
it('Invoke without errors.', async () => {
const houseKeeper = vi.fn().mockResolvedValue();
mockedCreateRunnerConfigHousekeeper.mockReturnValue({ houseKeeper });

await expect(ssmHousekeeper({}, context)).resolves.not.toThrow();
await expect(runnerConfigHousekeeper({}, context)).resolves.not.toThrow();
expect(houseKeeper).toHaveBeenCalledOnce();
});

it('Errors not throws.', async () => {
mockedCreateRunnerConfigHousekeeper.mockReturnValue({ houseKeeper: vi.fn().mockRejectedValue(new Error()) });
await expect(ssmHousekeeper({}, context)).resolves.not.toThrow();
await expect(runnerConfigHousekeeper({}, context)).resolves.not.toThrow();
});
});

Expand Down
15 changes: 0 additions & 15 deletions lambdas/functions/control-plane/src/local-ssm-housekeeper.ts
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions lambdas/functions/control-plane/src/modules.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,15 @@ declare namespace NodeJS {
export interface ProcessEnv {
AWS_REGION: string;
ENABLE_METRIC_GITHUB_APP_RATE_LIMIT: string;
ENABLE_ON_DEMAND_FAILOVER_FOR_ERRORS: string;
SCALE_ERRORS: string;
ENVIRONMENT: string;
GHES_URL: string;
JOB_RETRY_CONFIG: string;
LAUNCH_TEMPLATE_NAME: string;
LOG_LEVEL: 'silly' | 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
LOG_TYPE: 'json' | 'pretty' | 'hidden';
MINIMUM_RUNNING_TIME_IN_MINUTES: string;
SCALE_DOWN_IDLE_CONFIRMATION_SECONDS?: string;
PARAMETER_GITHUB_APP_CLIENT_ID_NAME: string;
PARAMETER_GITHUB_APP_CLIENT_SECRET_NAME: string;
PARAMETER_GITHUB_APP_ID_NAME: string;
PARAMETER_GITHUB_APP_KEY_BASE64_NAME: string;
PARAMETER_GITHUB_APPS_MANIFEST_NAME?: string;
RUNNER_OWNER: string;
COMPUTE_PROVIDER_TYPE?: string;
SCALE_DOWN_CONFIG: string;
SSM_CLEANUP_CONFIG: string;
SUBNET_IDS: string;
INSTANCE_TYPES: string;
INSTANCE_TARGET_CAPACITY_TYPE: 'on-demand' | 'spot';
INSTANCE_MAX_SPOT_PRICE: string | undefined;
INSTANCE_ALLOCATION_STRATEGY:
| 'lowest-price'
| 'price-capacity-optimized'
| 'diversified'
| 'capacity-optimized'
| 'capacity-optimized-prioritized'
| 'prioritized';
}
}
Loading
Loading