From ca9b11c4133bb16a3c7fcdceef7038449ee4e617 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Wed, 24 Jul 2024 10:28:48 +0500 Subject: [PATCH 1/3] CR 1 --- .github/workflows/ai-pr-reviewer.yml | 30 ++++++++++++ .github/workflows/pr-review.yml | 71 ---------------------------- 2 files changed, 30 insertions(+), 71 deletions(-) create mode 100644 .github/workflows/ai-pr-reviewer.yml delete mode 100644 .github/workflows/pr-review.yml diff --git a/.github/workflows/ai-pr-reviewer.yml b/.github/workflows/ai-pr-reviewer.yml new file mode 100644 index 0000000..55034cc --- /dev/null +++ b/.github/workflows/ai-pr-reviewer.yml @@ -0,0 +1,30 @@ +name: Code Review + +permissions: + contents: read + pull-requests: write + +on: + pull_request: + pull_request_review_comment: + types: [created] + +concurrency: + group: + ${{ github.repository }}-${{ github.event.number || github.head_ref || + github.sha }}-${{ github.workflow }}-${{ github.event_name == + 'pull_request_review_comment' && 'pr_comment' || 'pr' }} + cancel-in-progress: ${{ github.event_name != 'pull_request_review_comment' }} + +jobs: + review: + runs-on: ubuntu-latest + steps: + - uses: coderabbitai/ai-pr-reviewer@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }} + with: + debug: false + review_simple_changes: false + review_comment_lgtm: false \ No newline at end of file diff --git a/.github/workflows/pr-review.yml b/.github/workflows/pr-review.yml deleted file mode 100644 index 218082c..0000000 --- a/.github/workflows/pr-review.yml +++ /dev/null @@ -1,71 +0,0 @@ -name: Auto PR Review - -on: - pull_request: - types: [opened, synchronize] - pull_request_review_comment: - types: [created] - -jobs: - review: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-docker-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-docker- - - - name: Pull Docker image - run: | - docker buildx create --use - docker pull arshikjaved/pr-review:v1.0 || true - docker buildx build --cache-from=type=local,src=/tmp/.buildx-cache \ - --cache-to=type=local,dest=/tmp/.buildx-cache-new \ - -t arshikjaved/pr-review:v1.0 . - - - name: Update Docker cache - if: success() - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - - name: Set script name - id: script_name - run: | - if [ "${{ github.event_name }}" == "pull_request" ]; then - echo "::set-output name=script::generate_response.py" - else - echo "::set-output name=script::reply_thread.py" - fi - - - name: Analyze code - if: github.event_name == 'pull_request' || (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@CodeHawk')) - env: - EVENT_NAME: ${{ github.event_name }} - COMMENT_BODY: ${{ github.event.comment.body }} - ACTION: ${{ github.event.action }} - COMMENT_ID: ${{ github.event.comment.id }} - FILE_PATH: ${{ github.event.comment.path }} - LINE_NUMBER: ${{ github.event.comment.line }} - REPOSITORY_OWNER: ${{ github.repository_owner }} - REPOSITORY_NAME: ${{ github.event.repository.name }} - SCRIPT: ${{ steps.script_name.outputs.script }} - COMMIT_SHA: ${{ github.event.pull_request.head.sha }} - PR_NUMBER: ${{ github.event.pull_request.number }} - - run: | - if [ "${{ env.SCRIPT }}" == "generate_response.py" ]; then - docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e ACTION="${{env.ACTION}}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/generate_response.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --action '${{ env.ACTION }}'" - else - docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/reply_thread.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --comment-body '${{ env.COMMENT_BODY }}' --comment-id '${{ env.COMMENT_ID }}' --file-path '${{ env.FILE_PATH }}' --line-number '${{ env.LINE_NUMBER }}'" - fi From e550f67da1ce9e53da6bfef173a7ffebe867a826 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Wed, 24 Jul 2024 10:29:33 +0500 Subject: [PATCH 2/3] CR 1 --- mern-ecommerce/controllers/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mern-ecommerce/controllers/auth.js b/mern-ecommerce/controllers/auth.js index c48bedf..0846e28 100644 --- a/mern-ecommerce/controllers/auth.js +++ b/mern-ecommerce/controllers/auth.js @@ -17,7 +17,7 @@ exports.signup = (req, res) => { user.salt = undefined; user.hashed_password = undefined; res.json({ - user, + User, }); }); }; From d8cb2cba662a7dd8cb54bd57727cb17c313a9a06 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Wed, 24 Jul 2024 10:34:31 +0500 Subject: [PATCH 3/3] CR 1 --- .github/workflows/ai-pr-reviewer.yml | 2 +- mern-ecommerce/controllers/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ai-pr-reviewer.yml b/.github/workflows/ai-pr-reviewer.yml index 55034cc..bbd0770 100644 --- a/.github/workflows/ai-pr-reviewer.yml +++ b/.github/workflows/ai-pr-reviewer.yml @@ -23,7 +23,7 @@ jobs: - uses: coderabbitai/ai-pr-reviewer@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }} + OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} with: debug: false review_simple_changes: false diff --git a/mern-ecommerce/controllers/user.js b/mern-ecommerce/controllers/user.js index f27742c..c63da53 100644 --- a/mern-ecommerce/controllers/user.js +++ b/mern-ecommerce/controllers/user.js @@ -14,7 +14,7 @@ exports.userById = (req, res, next, id) => { }); }; -exports.read = (req, res) => { +exports.reads = (req, res) => { req.profile.hashed_password = undefined; req.profile.salt = undefined; return res.json(req.profile);