Skip to content

Commit

Permalink
Added tests and prettier formatting
Browse files Browse the repository at this point in the history
Signed-off-by: Brandon Shien <[email protected]>
  • Loading branch information
bshien committed Oct 4, 2024
1 parent 3c13384 commit a4af115
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 8 deletions.
7 changes: 4 additions & 3 deletions configs/operations/github-activity-events-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ events:
- issues.transferred
- issues.assigned
- issue_comment.created
- push
- pull_request.closed
- pull_request.opened
- pull_request.labeled
- pull_request.unlabeled
- pull_request.assigned
- pull_request_review.submitted
- pull_request_review_comment.created
- gollum
- release.released
- project.edited
# - push
# - release.released
# - project.edited

tasks:
- name: Activity Events Monitor Operation
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opensearch-automation-app",
"version": "0.1.7",
"version": "0.1.8",
"description": "An Automation App that handles all your GitHub Repository Activities",
"author": "Peter Zhu",
"homepage": "https://github.com/opensearch-project/automation-app",
Expand Down
8 changes: 4 additions & 4 deletions src/call/github-activity-events-monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default async function githubActivityEventsMonitor(app: Probot, context:
const repoName = context.payload.repository?.name;
const orgName = context.payload.organization?.login || context.payload.repository?.owner?.login;

const logData = {
const event = {
id: context.id,
organization: orgName,
repository: repoName,
Expand All @@ -38,10 +38,10 @@ export default async function githubActivityEventsMonitor(app: Probot, context:
try {
await client.index({
index: `github-activity-events-${month}-${year}`,
body: logData,
body: event,
});
app.log.info('Log data indexed successfully.');
app.log.info('Event indexed successfully.');
} catch (error) {
app.log.error(`Error indexing log data: ${error}`);
app.log.error(`Error indexing event: ${error}`);
}
}
87 changes: 87 additions & 0 deletions test/call/github-activity-events-monitor.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

import { Logger, Probot } from 'probot';
import { OpensearchClient } from '../../src/utility/opensearch/opensearch-client';
import githubActivityEventsMonitor from '../../src/call/github-activity-events-monitor';

jest.mock('../../src/utility/opensearch/opensearch-client');

describe('githubActivityEventsMonitor', () => {
let app: Probot;
let context: any;
let resource: any;

beforeEach(() => {
app = new Probot({ appId: 1, secret: 'test', privateKey: 'test' });
app.log = {
info: jest.fn(),
error: jest.fn(),
} as unknown as Logger;
context = {
name: 'eventType',
id: 'id',
payload: {
repository: {
name: 'repo',
owner: { login: 'org' },
},
action: 'action',
sender: {
login: 'sender',
},
},
};
resource = {
organizations: new Map([
[
'org',
{
repositories: new Map([['repo', 'repo object']]),
},
],
]),
};
});

it('should index events', async () => {
const mockClient = {
index: jest.fn().mockResolvedValue({}),
};
(OpensearchClient as jest.Mock).mockImplementation(() => {
return { getClient: jest.fn().mockResolvedValue(mockClient) };
});
jest.spyOn(Date.prototype, 'toISOString').mockReturnValue('2024-10-04T21:00:06.875Z');
await githubActivityEventsMonitor(app, context, resource);
expect(mockClient.index).toHaveBeenCalledWith({
index: expect.stringMatching(/^github-activity-events-\d{2}-\d{4}$/),
body: expect.objectContaining({
id: 'id',
organization: 'org',
repository: 'repo',
type: 'eventType',
action: 'action',
sender: 'sender',
created_at: '2024-10-04T21:00:06.875Z',
}),
});
expect(app.log.info).toHaveBeenCalledWith('Event indexed successfully.');
});

it('should log an error if indexing fails', async () => {
const mockClient = {
index: jest.fn().mockRejectedValue(new Error('Indexing failed')),
};
(OpensearchClient as jest.Mock).mockImplementation(() => {
return { getClient: jest.fn().mockResolvedValue(mockClient) };
});
await githubActivityEventsMonitor(app, context, resource);
expect(app.log.error).toHaveBeenCalledWith('Error indexing event: Error: Indexing failed');
});
});

0 comments on commit a4af115

Please sign in to comment.