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

Repo sync #34611

Merged
merged 4 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions .github/actions/slack-alert/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ inputs:
slack_token:
description: Slack token
required: true
message:
description: The message to send to Slack
default: The last '${{ github.workflow }}' run failed. See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
required: false
color:
description: The color of the Slack message
default: failure
required: false

runs:
using: composite
Expand All @@ -17,5 +25,5 @@ runs:
with:
channel: ${{ inputs.slack_channel_id }}
bot-token: ${{ inputs.slack_token }}
color: failure
text: The last '${{ github.workflow }}' run failed. See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
color: ${{ inputs.color }}
text: ${{ inputs.message }}
13 changes: 11 additions & 2 deletions .github/workflows/alert-changed-branch-protections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,19 @@ jobs:
id: compare
run: |
# Compare the fetched branch protections with the committed ones
git diff --no-index .github/branch_protection_settings/${{ matrix.branch }}.json ${{ matrix.branch }}-actual.json
git diff --no-index .github/branch_protection_settings/${{ matrix.branch }}.json ${{ matrix.branch }}-actual.json || echo "diff_failed=true" >> $GITHUB_ENV

- name: Set failure message
if: env.diff_failed == 'true'
run: |
message="Alert due to changes in branch protections for ${{ matrix.branch }}. Please review the changes and ensure they are intentional. If valid, update the branch protection settings in .github/branch_protection_settings/${{ matrix.branch }}.json to match the diff in this workflow."
echo "failure_message=$message" >> $GITHUB_ENV
echo "$message"

- uses: ./.github/actions/slack-alert
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
if: ${{ env.diff_failed == 'true' && github.event_name != 'workflow_dispatch' }}
with:
slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
message: ${{ env.failure_message }}
color: purple
2 changes: 1 addition & 1 deletion .github/workflows/enterprise-dates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Create pull request
id: create-pull-request
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # pin @v6.1.0
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # pin @v7.0.3
env:
# Disable pre-commit hooks; they don't play nicely here
HUSKY: '0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
src/graphql/scripts/sync.js
- name: Create pull request
id: create-pull-request
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # pin @v6.1.0
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # pin @v7.0.3
env:
# Disable pre-commit hooks; they don't play nicely here
HUSKY: '0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"additional-permissions": false,
"access": "write"
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "update-an-attribute-for-a-scim-enterprise-user",
"subcategory": "scim",
"verb": "patch",
"requestPath": "/scim/v2/enterprises/{enterprise}/Users/{scim_user_id}",
"access": "write",
"user-to-server": true,
"server-to-server": true,
"additional-permissions": false
},
{
"category": "enterprise-admin",
"slug": "delete-a-scim-user-from-an-enterprise",
Expand Down
2 changes: 1 addition & 1 deletion src/github-apps/lib/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@
"2022-11-28"
]
},
"sha": "7f17604280e700f508ade59884f6b43be2c52716"
"sha": "9abc91759872a4e974ddcc0df69bdef3493b69f0"
}
Loading
Loading