Skip to content
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

Migrate code to use AWS SDK for JavaScript (v3) #152 #157

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Migrate code to use AWS SDK for JavaScript (v3) #152 #157

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
596316a
Migrate code to use AWS SDK for JavaScript (v3) #152
akazakou Jul 2, 2024
63d408b
Fix Unit tests
akazakou Jul 2, 2024
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
10 changes: 5 additions & 5 deletions __tests__/src/codebuildjob/CodeBuildJob.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const mocks = {
loggerStop: jest.fn().mockName('Mock: "src/logger".Logger.stop()'),
};

jest.mock('aws-sdk', () => ({
jest.mock('@aws-sdk/client-codebuild', () => ({
CodeBuild: jest.fn(() => ({
startBuild: mocks.startBuild,
batchGetBuilds: mocks.batchGetBuilds,
Expand Down Expand Up @@ -54,10 +54,10 @@ jest.mock('../../../src/logger', () => ({
}));

import { CodeBuildJob } from '../../../src/codebuildjob';
import { StartBuildOutput, BatchGetBuildsOutput, StopBuildOutput } from 'aws-sdk/clients/codebuild';
import { StartBuildOutput, BatchGetBuildsOutput, StopBuildOutput } from '@aws-sdk/client-codebuild';

describe('CodeBuildJob class functionality', () => {
const createAWSResponse = (resolves: unknown) => ({ promise: () => Promise.resolve(resolves) });
const createAWSResponse = (resolves: unknown) => resolves;
const buildDesc = {
id: 'test:testStreamID',
logs: { cloudWatchLogs: { status: 'ENABLED' } },
Expand All @@ -84,7 +84,7 @@ describe('CodeBuildJob class functionality', () => {
});

afterAll(() => {
jest.unmock('aws-sdk');
jest.unmock('@aws-sdk/client-codebuild');
jest.unmock('@actions/core');
jest.unmock('../../../src/logger');
jest.useRealTimers();
Expand Down Expand Up @@ -327,4 +327,4 @@ describe('CodeBuildJob class functionality', () => {

await expect(() => job.startBuild()).rejects.toThrowError('Can\'t start test CodeBuild job. Empty response from AWS API Endpoint')
});
});
});
15 changes: 6 additions & 9 deletions __tests__/src/logger/CloudWatchLogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { AWSError } from 'aws-sdk';

const mocks = {
getLogEvents: jest.fn().mockName('Mock: "aws-sdk".CloudWatchLogs.prototype.getLogEvents()'),
actionsCoreInfo: jest.fn().mockName('Mock: "@actions/core".info()'),
Expand All @@ -9,7 +7,7 @@ const mocks = {
actionsCoreError: jest.fn().mockName('Mock: "@actions/core".error()'),
}

jest.mock("aws-sdk", () => ({
jest.mock("@aws-sdk/client-cloudwatch-logs", () => ({
CloudWatchLogs: jest.fn(() => ({
getLogEvents: mocks.getLogEvents,
})),
Expand All @@ -27,15 +25,14 @@ import { CloudWatchLogger } from '../../../src/logger';


describe('CloudWatchLogs Logger getEvents() method', () => {
const createAWSResponse = (resolves: unknown) => ({ promise: () => Promise.resolve(resolves) });
const createAWSReject = (reject: unknown) => ({ promise: () => Promise.reject(reject) });
const createAWSResponse = (resolves: unknown) => resolves;

beforeAll(() => {
jest.useFakeTimers();
});

afterAll(() => {
jest.unmock("aws-sdk");
jest.unmock("@aws-sdk/client-cloudwatch-logs");
jest.unmock("@actions/core");
jest.useRealTimers();
});
Expand Down Expand Up @@ -77,9 +74,9 @@ describe('CloudWatchLogs Logger getEvents() method', () => {
const error = {
message: 'test error',
code: 'AccessDeniedException',
} as AWSError;
} as Error & { code: string };

getLogEvents.mockReturnValue(createAWSReject(error));
getLogEvents.mockRejectedValue(error);
const logger = new CloudWatchLogger({ logGroupName: 'log_group_name', logStreamName: 'log_stream_name' }, { updateInterval: 5000 });
const stopListenSpy = jest.spyOn(logger, 'stopListen');

Expand Down Expand Up @@ -123,4 +120,4 @@ describe('CloudWatchLogs Logger Timers', () => {
jest.runOnlyPendingTimers();
expect(getEventsMock).toBeCalledTimes(1);
});
})
})
Loading
Loading