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

Jump to bottom

[New] catch errors from runQuery #50

Merged
merged 1 commit into from
Jan 28, 2022
Merged

[New] catch errors from runQuery #50

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 bin/can-merge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,11 @@ https.request(options, (response) => {
watch(args.retryDelay, () => runQuery(params)).then((res) => {
console.clear();
outputStatus(res);
});
}).catch((error) => { console.log(chalk.red(error)); });
} else {
runQuery(params).then((res) => {
outputStatus(res);
});
}).catch((error) => { console.log(chalk.red(error)); });
}
}).on('error', (err) => {
console.error(err);
Expand Down
16 changes: 10 additions & 6 deletions utils/runQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
'use strict';

const { graphql } = require('@octokit/graphql');

const buildQuery = require('./buildQuery');

module.exports = async function runQuery({ repo, pr, sha, token }) {
const [owner, name] = repo.split('/');
const response = await graphql(buildQuery({ name, owner, pr, sha }), {
headers: {
authorization: `token ${token}`,
},
});
let response = null;
try {
response = await graphql(buildQuery({ name, owner, pr, sha }), {
headers: {
authorization: `token ${token}`,
},
});
} catch (err) {
throw err.message;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line might need some work to cover the token being included in the output (#51). want to do that in this PR, or in a followup?

Copy link
Collaborator Author

@Green-Ranger11 Green-Ranger11 Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I will work on the rate limit issues in another PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow up question was #51 run on this branch? Currently the only output should be the message and I'm recreating graphql errors and no tokens are being displayed in this PR

Copy link
Owner

@ljharb ljharb Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the message contained the token, because it contained the request that was rate-limited.

Copy link
Collaborator Author

@Green-Ranger11 Green-Ranger11 Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case of a GraphQL error, error.message is set to a combined message describing all errors returned by the endpoint. All errors can be accessed at error.errors. error.request has the request options such as query, variables and headers set for easier debugging.

So I would expect the rate limit to return just the message but anyhow I'll try and rate limit myself to test it out.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohhhhh so maybe it was dumping the error.request contents. you're probably right! but good to verify.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep its the following:
image
If there's anything else should we land this and i get started asap on the other action items for the rate limits.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.

}
return response;
};