Skip to content

Commit c72f3d5

Browse files
JarbasHorstJarbasHorst
authored
Merge branch 'main' into v-rmanda/122910/Doc_Review_Quality_Categories_pages
2 parents 23aa3cf + 5be2286 commit c72f3d5

26 files changed

+314
-159
lines changed

‎.gdn/.gdnbaselines

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"hydrated": true,
3+
"properties": {
4+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines",
5+
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
6+
},
7+
"version": "1.0.0",
8+
"baselines": {
9+
"default": {
10+
"name": "default",
11+
"createdDate": "2024-08-26 12:06:54Z",
12+
"lastUpdatedDate": "2024-08-26 12:06:54Z"
13+
}
14+
},
15+
"results": {
16+
"b3d46ea406a66acd0fa8b1130ec9be5b501ad4a933d98ce70193c68771b6e7be": {
17+
"signature": "b3d46ea406a66acd0fa8b1130ec9be5b501ad4a933d98ce70193c68771b6e7be",
18+
"alternativeSignatures": [
19+
"79e125fb7927450b0ebb02d6b3ddb03d7a6a971e21dfdc1c246ba8fd39f0969e"
20+
],
21+
"target": "update-permissions-reference.ps1",
22+
"line": 170,
23+
"memberOf": [
24+
"default"
25+
],
26+
"tool": "psscriptanalyzer",
27+
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
28+
"createdDate": "2024-08-26 12:06:54Z"
29+
}
30+
}
31+
}

‎.gdn/.gdnsuppress

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"hydrated": true,
3+
"properties": {
4+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
5+
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
6+
},
7+
"version": "1.0.0",
8+
"suppressionSets": {
9+
"default": {
10+
"name": "default",
11+
"createdDate": "2024-08-26 12:06:54Z",
12+
"lastUpdatedDate": "2024-08-26 12:06:54Z"
13+
}
14+
},
15+
"results": {
16+
"b3d46ea406a66acd0fa8b1130ec9be5b501ad4a933d98ce70193c68771b6e7be": {
17+
"signature": "b3d46ea406a66acd0fa8b1130ec9be5b501ad4a933d98ce70193c68771b6e7be",
18+
"alternativeSignatures": [
19+
"79e125fb7927450b0ebb02d6b3ddb03d7a6a971e21dfdc1c246ba8fd39f0969e"
20+
],
21+
"target": "update-permissions-reference.ps1",
22+
"line": 170,
23+
"memberOf": [
24+
"default"
25+
],
26+
"tool": "psscriptanalyzer",
27+
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
28+
"createdDate": "2024-08-26 12:06:54Z"
29+
}
30+
}
31+
}

‎.github/workflows/permissions-reference-gen.yml

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
path: docs
2525

26-
- name: Run PowerShell script
26+
- name: Run PowerShell script to update permissions
2727
shell: pwsh
2828
run: |
2929
$ClientId = "${{ secrets.GRAPH_CLIENT_ID }}"
@@ -38,22 +38,46 @@ jobs:
3838
application-id: ${{ secrets.APPLICATION_ID }}
3939
application-private-key: ${{ secrets.APPLICATION_PRIVATE_KEY }}
4040

41-
- name: Commit updates and open a pull request
41+
- name: Commit updates from service principal
4242
working-directory: ./docs
4343
shell: pwsh
4444
env:
45-
GH_TOKEN: ${{ steps.get_token.outputs.app-token }}
45+
GH_TOKEN: ${{ steps.get_token.outputs.app-token }}
4646
run: |
4747
$status = git status --porcelain
4848
if ($status -eq $null) {
4949
Write-Host "No changes to commit." -ForegroundColor Green
50-
} else {
51-
$timestamp = Get-Date -Format FileDateTimeUniversal
50+
}
51+
else {
5252
git config user.email "GraphTooling@service.microsoft.com"
5353
git config user.name "Microsoft Graph DevX Tooling"
54-
git checkout -b permissions-reference/$timestamp
5554
git add .
5655
git commit -m "Update permissions reference"
57-
git push --set-upstream origin permissions-reference/$timestamp
58-
gh pr create --base main --title "Automated permissons reference update" --body "Scheduled permissions reference update" --reviewer "FaithOmbongi","msewaweru" --label "ready for content review"
56+
}
57+
58+
- name: Run PowerShell script to correct errors in permissions descriptions
59+
shell: pwsh
60+
run: |
61+
./docs/correct-permissions-reference-errors.ps1
62+
63+
- name: Commit errors correction and open a pull request
64+
working-directory: ./docs
65+
shell: pwsh
66+
env:
67+
GH_TOKEN: ${{ steps.get_token.outputs.app-token }}
68+
run: |
69+
$status = git status --porcelain
70+
if ($status -eq $null) {
71+
Write-Host "No changes to commit." -ForegroundColor Green
72+
} else {
73+
$dateToday = Get-Date -Format 'yyyy-MM-dd'
74+
$branchName = "permissions-reference/$dateToday"
75+
$prTitle = "${dateToday}: Automated permissions reference update"
76+
77+
git add .
78+
git commit -m "Correct errors in permissions reference"
79+
git checkout -b $branchName
80+
git push --set-upstream origin $branchName
81+
82+
gh pr create --base main --title $prTitle --body "Scheduled permissions reference update" --reviewer "FaithOmbongi,msewaweru" --label "ready for content review"
5983
}

‎api-reference/beta/api/calendar-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Permanently delete a calendar folder and the events that it contains and remove
1717

1818
>**Note:** Folders aren't placed in the Purges folder when they are permanently deleted. Permanently deleted folders are removed from the mailbox.
1919
20+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
21+
2022
## Permissions
2123

2224
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/contact-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Permanently delete a contact and place it in the Purges folder in the dumpster i
1717

1818
For more information about item retention, see [Configure Deleted Item retention and Recoverable Items quotas](/exchange/configure-deleted-item-retention-and-recoverable-items-quotas-exchange-2013-help).
1919

20+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
21+
2022
## Permissions
2123

2224
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/contactfolder-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Permanently delete a contact folder and remove its items from the user's mailbox
1717

1818
>**Note:** Folders aren't placed in the Purges folder when they are permanently deleted. Permanently deleted folders are removed from the mailbox.
1919
20+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
21+
2022
## Permissions
2123

2224
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/event-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ For more information about item retention, see [Configure Deleted Item retention
1919

2020
>**Note:** Folders aren't placed in the Purges folder when they are permanently deleted. Permanently deleted folders are removed from the mailbox.
2121
22+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
23+
2224
## Permissions
2325

2426
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/eventmessage-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Permanently delete an event message and place it in the Purges folder in the use
1818
For more information about item retention, see [Configure Deleted Item retention and Recoverable Items quotas](/exchange/configure-deleted-item-retention-and-recoverable-items-quotas-exchange-2013-help).
1919

2020

21+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
22+
2123
## Permissions
2224

2325
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/mailfolder-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Permanently delete a mail folder and remove its items from the user's mailbox. F
1818
>**Note:** Folders aren't placed in the Purges folder when they are permanently deleted. Permanently deleted folders are removed from the mailbox.
1919
2020

21+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
22+
2123
## Permissions
2224

2325
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

‎api-reference/beta/api/mailsearchfolder-permanentdelete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Permanently delete a mail search folder and remove its items from the user's mai
1818
>**Note:** Folders aren't placed in the Purges folder when they are permanently deleted. Permanently deleted folders are removed from the mailbox.
1919
2020

21+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
22+
2123
## Permissions
2224

2325
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).

0 commit comments

Comments
 (0)