Merge pull request hashicorp#40240 from hashicorp/b-slack-url

.github/workflows: fix slack notification actions
opentofu · Nov 21, 2024 · 6ea8ba3 · 6ea8ba3
2 parents fb91a38 + d8cda59
commit 6ea8ba3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/comments-feed.yml b/.github/workflows/comments-feed.yml
@@ -35,7 +35,7 @@ jobs:
           ISSUE_URL: ${{ github.event.issue.html_url }}
           ISSUE_TITLE: ${{ github.event.issue.title }}
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {

diff --git a/.github/workflows/label-notifications.yml b/.github/workflows/label-notifications.yml
@@ -24,13 +24,12 @@ jobs:
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         env:
           ISSUE_TITLE: ${{ toJSON(github.event.issue.title || github.event.pull_request.title) }}
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         with:
-          channel-id: ${{ secrets.SLACK_CHANNEL }}
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
-          webhook-type: incoming-webhook
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
+              "channel" : "${{ secrets.SLACK_CHANNEL }}",
               "blocks": [
                 {
                   "type": "section",

diff --git a/.github/workflows/post_publish.yml b/.github/workflows/post_publish.yml
@@ -107,14 +107,12 @@ jobs:
       - name: Send Slack Notification Upon Failure
         if: ${{ failure() }}
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
         with:
-          channel-id: ${{ secrets.SLACK_CHANNEL }}
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
-          webhook-type: incoming-webhook
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
+              "channel" : "${{ secrets.SLACK_CHANNEL }}",
               "blocks": [
                 {
                   "type": "section",

diff --git a/.github/workflows/pull_request_feed.yml b/.github/workflows/pull_request_feed.yml
@@ -36,7 +36,7 @@ jobs:
           MERGED_BY_URL: ${{ github.event.pull_request.merged_by.html_url }}
           MERGED_BY_LOGIN: ${{ github.event.pull_request.merged_by.login }}
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {
@@ -61,7 +61,7 @@ jobs:
           PR_AUTHOR_URL: ${{ github.event.pull_request.user.html_url }}
           PR_AUTHOR_LOGIN: ${{ github.event.pull_request.user.login }}
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {
@@ -85,7 +85,7 @@ jobs:
           PR_AUTHOR_URL: ${{ github.event.pull_request.user.html_url }}
           PR_AUTHOR_LOGIN: ${{ github.event.pull_request.user.login }}
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {

diff --git a/.github/workflows/pull_request_review.yml b/.github/workflows/pull_request_review.yml
@@ -35,7 +35,7 @@ jobs:
           PR_HTML_URL: ${{ github.event.pull_request.html_url }}
           PR_TITLE: ${{ github.event.pull_request.title }}
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {

diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
@@ -11,7 +11,7 @@ jobs:
         id: slack
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook: ${{ secrets.FEED_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
             {