Skip to content

Commit 0ab35ea

Browse files
committed
chore: switch from userLogin to botUsername
Signed-off-by: djamaile <rdjamaile@gmail.com>
1 parent f901c22 commit 0ab35ea

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

changeset-feedback/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ async function main() {
1717
const marker = core.getInput('marker', { required: true });
1818
const diffRef = core.getInput('diffRef', { required: true });
1919
const issueNumberStr = core.getInput('issue-number', { required: true });
20-
const userLogin = core.getInput('userLogin', {required: true});
20+
const botUsername = core.getInput('botUsername', {required: true});
2121
const changedFiles = await listChangedFiles(diffRef);
2222
const packages = await listPackages();
2323
const changesets = await loadChangesets(changedFiles);
@@ -32,7 +32,7 @@ async function main() {
3232
issueNumberStr,
3333
marker,
3434
feedback,
35-
userLogin,
35+
botUsername,
3636
});
3737
}
3838

changeset-feedback/postFeedback.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const repoInfo = {
5252
owner: 'le-owner',
5353
repo: 'le-repo',
5454
};
55-
const userLogin = 'github-actions[bot]';
55+
const botUsername = 'github-actions[bot]';
5656
const log = jest.fn();
5757
const marker = 'changeset-feedback';
5858
const body = (feedback: string) =>
@@ -82,7 +82,7 @@ describe('changeset feedback', () => {
8282

8383
await postFeedback(
8484
client,
85-
{ ...repoInfo, issueNumberStr: '1', marker, feedback, userLogin },
85+
{ ...repoInfo, issueNumberStr: '1', marker, feedback, botUsername },
8686
log,
8787
);
8888
expect(mockClient.rest.issues.createComment).toHaveBeenCalledWith({
@@ -97,7 +97,7 @@ describe('changeset feedback', () => {
9797
mockClient.paginate.mockResolvedValue(commentsWithFeedBack);
9898
await postFeedback(
9999
client,
100-
{ ...repoInfo, issueNumberStr: '1', marker, feedback, userLogin },
100+
{ ...repoInfo, issueNumberStr: '1', marker, feedback, botUsername },
101101
log,
102102
);
103103
expect(mockClient.rest.issues.updateComment).not.toHaveBeenCalled();
@@ -110,7 +110,7 @@ describe('changeset feedback', () => {
110110
mockClient.paginate.mockResolvedValue(commentsWithFeedBack);
111111
await postFeedback(
112112
client,
113-
{ ...repoInfo, issueNumberStr: '1', marker, feedback: feedbackUpdated, userLogin },
113+
{ ...repoInfo, issueNumberStr: '1', marker, feedback: feedbackUpdated, botUsername },
114114
log,
115115
);
116116
expect(log).toHaveBeenCalledWith('updating existing comment in #1');
@@ -125,7 +125,7 @@ describe('changeset feedback', () => {
125125
mockClient.paginate.mockResolvedValue(commentsWithFeedBack);
126126
await postFeedback(
127127
client,
128-
{ ...repoInfo, issueNumberStr: '1', marker: '', feedback: '', userLogin },
128+
{ ...repoInfo, issueNumberStr: '1', marker: '', feedback: '', botUsername },
129129
log,
130130
);
131131
expect(mockClient.rest.issues.deleteComment).toHaveBeenCalledWith({

changeset-feedback/postFeedback.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ export async function postFeedback(
99
issueNumberStr: string;
1010
marker: string;
1111
feedback: string;
12-
userLogin: string;
12+
botUsername: string;
1313
},
1414
log = core.info,
1515
) {
16-
const { owner, repo, issueNumberStr, marker, feedback, userLogin } = options;
16+
const { owner, repo, issueNumberStr, marker, feedback, botUsername } = options;
1717
const issue_number = Number(issueNumberStr);
1818
const body = feedback.trim() ? feedback + marker : undefined;
1919

@@ -26,11 +26,8 @@ export async function postFeedback(
2626
},
2727
);
2828

29-
const { login } = await client.rest.users.user();
30-
log(`user: ${login}`);
31-
3229
const existingComment = existingComments.find(
33-
c => c.user?.login === userLogin && c.body?.includes(marker),
30+
c => c.user?.login === botUsername && c.body?.includes(marker),
3431
);
3532

3633
if (existingComment) {

0 commit comments

Comments
 (0)