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.

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

Update PR template with CodeQL instructions #7616

Merged

Conversation

santisecco
Copy link
Member

Fixes #5196

What changes did you make?

Why did you make the changes (we will use this info to test)?

  • We need developers to check the PR for annotations/comments resulting from CodeQL scanning. This will ensure better Security and Code Quality and give the chance of fixing changes before they are merged.

Screenshots of Proposed Changes To The Website (if any, please do not include screenshots of code changes)

No visual changes to the website itself.
Even though, the following links are there to preview the changes to the Pull Request template.

Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!


From your project repository, check out a new branch and test the changes.

git checkout -b santisecco-update-pr-template-codeql-5196 gh-pages
git pull https://github.com/santisecco/website.git update-pr-template-codeql-5196

@github-actions github-actions bot added role: front end Tasks for front end developers role: back end/devOps Tasks for back-end developers Complexity: Medium size: 0.5pt Can be done in 3 hours or less Feature: Code Alerts labels Oct 21, 2024
@santisecco santisecco changed the title Update pr template codeql 5196 Update PR template CodeQL Oct 21, 2024
@santisecco santisecco changed the title Update PR template CodeQL Update PR template with CodeQL instructions Oct 21, 2024
@pluto-bell pluto-bell self-requested a review October 21, 2024 19:13
pluto-bell
pluto-bell previously approved these changes Oct 21, 2024
Copy link
Member

@pluto-bell pluto-bell left a comment

Choose a reason for hiding this comment

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

Thank you for the descriptive PR, in which you indicated why there are additional changes made that are not found in the original issue. I also appreciate the before and after links to the template files.

Overall, great work on this PR.

@FamousHero
Copy link
Member

Availability: 5-7pm, Mon-Fri
ETA: EOD Tues, Oct 21

@Thinking-Panda
Copy link
Member

@santisecco Were these suggestions from you approved by any of the dev leads?
#5196 (comment)

@santisecco
Copy link
Member Author

santisecco commented Oct 22, 2024

@santisecco Were these suggestions from you approved by any of the dev leads? #5196 (comment)

Yes

@k-cardon k-cardon self-requested a review October 23, 2024 20:52
@k-cardon
Copy link
Member

Availability: evenings / weekends
ETA: EOD Thursday

@codyyjxn codyyjxn self-requested a review October 24, 2024 20:06
codyyjxn
codyyjxn previously approved these changes Oct 24, 2024
Copy link
Member

@codyyjxn codyyjxn left a comment

Choose a reason for hiding this comment

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

@santisecco Great Job! Thank you for taking on this issue .

  • The branch name is correct
  • The issue is linked correctly
  • The description is clear and concise.

Thank you for your contribution! Keep it up

Copy link
Member

@k-cardon k-cardon left a comment

Choose a reason for hiding this comment

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

Branch, PR description, and code all look correct; screenshots of before and after template are helpful, thanks! I am requesting changes because the syntax of the added text is confusing--I know that's language from the original issue, but I think it would be helpful to fix at this stage before merging. I'll mark inline the changes I'm requesting.

Copy link
Member

@k-cardon k-cardon left a comment

Choose a reason for hiding this comment

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

1/2 changes requested (clarify complexity)

.github/pull_request_template.md Outdated Show resolved Hide resolved
FamousHero
FamousHero previously approved these changes Oct 25, 2024
Copy link
Member

@FamousHero FamousHero left a comment

Choose a reason for hiding this comment

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

LGTM
Things you did well:

  • Description clear
  • Issue # in PR and branch name
  • Reasoning for going deviating from Actionable Items
  • Providing before and after

Things to work on:

  • N/A

Keep up the good work!

@santisecco
Copy link
Member Author

santisecco commented Oct 27, 2024

Fixes #replace_this_text_with_the_issue_number

What changes did you make?

Why did you make the changes (we will use this info to test)?

CodeQL Alerts

After the PR has been submitted and the resulting GitHub actions/checks have been completed, developers should check the PR for CodeQL alert annotations.

Check the PR's comments. If present on your PR, the CodeQL alert looks similar as shown

Screenshot 2024-10-15 153738

Please let us know that you have checked for CodeQL alerts. Please do not dismiss alerts.

  • I have checked this PR for CodeQL alerts and none were found.
  • I found CodeQL alert(s), and (select one):
    • I have resolved the CodeQL alert(s) as noted
    • I believe the CodeQL alert(s) is a false positive (Merge Team will evaluate)
    • I have followed the Instructions below, but I am still stuck (Merge Team will evaluate)
Instructions for resolving CodeQL alerts

If CodeQL alert/annotations appear, refer to How to Resolve CodeQL alerts.

In general, CodeQL alerts should be resolved prior to PR reviews and merging

Screenshots of Proposed Changes To The Website (if any, please do not include screenshots of code changes)

Visuals before changes are applied

image

Visuals after changes are applied

image

@k-cardon
Copy link
Member

This looks great @santisecco! Could you update the branch and I'll approve it?

@santisecco
Copy link
Member Author

@FamousHero @pluto-bell @codyyjxn I requested again your reviews. I don't know if that could have been skipped had I changed the code differently.

Basically I added what @t-will-gillis and @k-cardon suggested and a new screenshot showing one alert instead of two which was asked by Bonnie in the meeting.

Copy link
Member

@t-will-gillis t-will-gillis left a comment

Choose a reason for hiding this comment

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

Hey @santisecco This looks great- thanks for asking the questions and working with everyone to improve this issue!

Copy link
Member

@k-cardon k-cardon left a comment

Choose a reason for hiding this comment

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

Looks great, very clear now, thanks!

@t-will-gillis
Copy link
Member

@FamousHero @pluto-bell @codyyjxn FYI I will merge this since you previously Approved this PR

@t-will-gillis t-will-gillis merged commit 3e06d99 into hackforla:gh-pages Oct 29, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Complexity: Medium Feature: Code Alerts role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less
Projects
Development

Successfully merging this pull request may close these issues.

Update PR template with instructions regarding CodeQL annotations
7 participants