From 19e45daee4adf5107e798fe567d42ae0fe5300db Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Wed, 7 Aug 2024 17:16:07 +0200 Subject: [PATCH 1/3] .gitignore .vs --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 378128c70..ef0553e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ test/userdir its/extdir* .DS_Store omnisharp +.vs From 38e58a302b12a3e592796bb0067b7e3b2042c0cc Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Wed, 7 Aug 2024 18:11:03 +0200 Subject: [PATCH 2/3] SLVSCODE-818 Add Jira integration --- .github/workflows/PullRequestClosed.yml | 26 +++++++++++++++++++++ .github/workflows/PullRequestCreated.yml | 29 ++++++++++++++++++++++++ .github/workflows/RequestReview.yml | 28 +++++++++++++++++++++++ .github/workflows/SubmitReview.yml | 27 ++++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 .github/workflows/PullRequestClosed.yml create mode 100644 .github/workflows/PullRequestCreated.yml create mode 100644 .github/workflows/RequestReview.yml create mode 100644 .github/workflows/SubmitReview.yml diff --git a/.github/workflows/PullRequestClosed.yml b/.github/workflows/PullRequestClosed.yml new file mode 100644 index 000000000..2957669b4 --- /dev/null +++ b/.github/workflows/PullRequestClosed.yml @@ -0,0 +1,26 @@ +name: Pull Request Closed + +on: + pull_request: + types: [closed] + +jobs: + PullRequestMerged_job: + name: Pull Request Merged + runs-on: ubuntu-latest + # For external PR, ticket should be moved manually + if: | + github.event.pull_request.head.repo.full_name == github.repository + && github.event.pull_request.merged + steps: + - id: secrets + uses: SonarSource/vault-action-wrapper@v3 + with: + secrets: | + development/kv/data/jira user | JIRA_USER; + development/kv/data/jira token | JIRA_TOKEN; + - uses: sonarsource/gh-action-lt-backlog/PullRequestClosed@v2 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} diff --git a/.github/workflows/PullRequestCreated.yml b/.github/workflows/PullRequestCreated.yml new file mode 100644 index 000000000..c33c1567e --- /dev/null +++ b/.github/workflows/PullRequestCreated.yml @@ -0,0 +1,29 @@ +name: Pull Request Created + +on: + pull_request: + types: ["opened"] + +jobs: + PullRequestCreated_job: + name: Pull Request Created + runs-on: ubuntu-latest + # For external PR, ticket should be created manually + if: | + github.event.pull_request.head.repo.full_name == github.repository + permissions: + id-token: write + steps: + - id: secrets + uses: SonarSource/vault-action-wrapper@v3 + with: + secrets: | + operations/team/re/kv/data/github/github-jira-integration token | GITHUB_TOKEN; + development/kv/data/jira user | JIRA_USER; + development/kv/data/jira token | JIRA_TOKEN; + - uses: sonarsource/gh-action-lt-backlog/PullRequestCreated@v2 + with: + github-token: ${{ fromJSON(steps.secrets.outputs.vault).GITHUB_TOKEN }} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} + jira-project: SLVSCODE diff --git a/.github/workflows/RequestReview.yml b/.github/workflows/RequestReview.yml new file mode 100644 index 000000000..f24c0331e --- /dev/null +++ b/.github/workflows/RequestReview.yml @@ -0,0 +1,28 @@ +name: Request review + +on: + pull_request: + types: ["review_requested"] + +jobs: + RequestReview_job: + name: Request review + runs-on: ubuntu-latest + # For external PR, ticket should be moved manually + if: | + github.event.pull_request.head.repo.full_name == github.repository + permissions: + id-token: write + steps: + - id: secrets + uses: SonarSource/vault-action-wrapper@v3 + with: + secrets: | + operations/team/re/kv/data/github/github-jira-integration token | GITHUB_TOKEN; + development/kv/data/jira user | JIRA_USER; + development/kv/data/jira token | JIRA_TOKEN; + - uses: sonarsource/gh-action-lt-backlog/RequestReview@v2 + with: + github-token: ${{ fromJSON(steps.secrets.outputs.vault).GITHUB_TOKEN }} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} diff --git a/.github/workflows/SubmitReview.yml b/.github/workflows/SubmitReview.yml new file mode 100644 index 000000000..02d639a72 --- /dev/null +++ b/.github/workflows/SubmitReview.yml @@ -0,0 +1,27 @@ +name: Submit Review + +on: + pull_request_review: + types: [submitted] + +jobs: + SubmitReview_job: + name: Submit Review + runs-on: ubuntu-latest + # For external PR, ticket should be moved manually + if: | + github.event.pull_request.head.repo.full_name == github.repository + && (github.event.review.state == 'changes_requested' + || github.event.review.state == 'approved') + steps: + - id: secrets + uses: SonarSource/vault-action-wrapper@v3 + with: + secrets: | + development/kv/data/jira user | JIRA_USER; + development/kv/data/jira token | JIRA_TOKEN; + - uses: sonarsource/gh-action-lt-backlog/SubmitReview@v2 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} From 60d9d9334a6ecf139fb972b48a860cf0571fee42 Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Wed, 21 Aug 2024 15:55:31 +0200 Subject: [PATCH 3/3] Fixes --- .github/workflows/PullRequestClosed.yml | 3 +++ .github/workflows/PullRequestCreated.yml | 4 ++-- .github/workflows/RequestReview.yml | 4 ++-- .github/workflows/SubmitReview.yml | 3 +++ docs/PULL_REQUEST_TEMPLATE.md | 7 +++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PullRequestClosed.yml b/.github/workflows/PullRequestClosed.yml index 2957669b4..b50896eba 100644 --- a/.github/workflows/PullRequestClosed.yml +++ b/.github/workflows/PullRequestClosed.yml @@ -8,6 +8,9 @@ jobs: PullRequestMerged_job: name: Pull Request Merged runs-on: ubuntu-latest + permissions: + id-token: write + pull-requests: read # For external PR, ticket should be moved manually if: | github.event.pull_request.head.repo.full_name == github.repository diff --git a/.github/workflows/PullRequestCreated.yml b/.github/workflows/PullRequestCreated.yml index c33c1567e..f2a934eae 100644 --- a/.github/workflows/PullRequestCreated.yml +++ b/.github/workflows/PullRequestCreated.yml @@ -8,11 +8,11 @@ jobs: PullRequestCreated_job: name: Pull Request Created runs-on: ubuntu-latest + permissions: + id-token: write # For external PR, ticket should be created manually if: | github.event.pull_request.head.repo.full_name == github.repository - permissions: - id-token: write steps: - id: secrets uses: SonarSource/vault-action-wrapper@v3 diff --git a/.github/workflows/RequestReview.yml b/.github/workflows/RequestReview.yml index f24c0331e..c891f3a1c 100644 --- a/.github/workflows/RequestReview.yml +++ b/.github/workflows/RequestReview.yml @@ -8,11 +8,11 @@ jobs: RequestReview_job: name: Request review runs-on: ubuntu-latest + permissions: + id-token: write # For external PR, ticket should be moved manually if: | github.event.pull_request.head.repo.full_name == github.repository - permissions: - id-token: write steps: - id: secrets uses: SonarSource/vault-action-wrapper@v3 diff --git a/.github/workflows/SubmitReview.yml b/.github/workflows/SubmitReview.yml index 02d639a72..d5f22e624 100644 --- a/.github/workflows/SubmitReview.yml +++ b/.github/workflows/SubmitReview.yml @@ -8,6 +8,9 @@ jobs: SubmitReview_job: name: Submit Review runs-on: ubuntu-latest + permissions: + id-token: write + pull-requests: read # For external PR, ticket should be moved manually if: | github.event.pull_request.head.repo.full_name == github.repository diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md index bf16e5779..143894528 100644 --- a/docs/PULL_REQUEST_TEMPLATE.md +++ b/docs/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,10 @@ +Part of + Please review our [contribution guidelines](https://github.com/SonarSource/sonarlint-vscode/blob/master/docs/contributing.md). And please ensure your pull request adheres to the following guidelines: