Skip to content

Commit cab5c3d

Browse files
authored
Merge pull request #25063 from microsoftgraph/main
Merge to publish.
2 parents b4a13ca + a180cab commit cab5c3d

File tree

82 files changed

+669
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+669
-49
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/backuprestoreroot-enable.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Namespace: microsoft.graph
1616

1717
Enable the [Microsoft 365 Backup Storage](../resources/backuprestoreroot.md) service for a tenant.
1818

19+
Before you call this API, call [List protection policies](../api/backuprestoreroot-list-protectionpolicies.md) to initialize the data store in the tenant. Data store initialization takes about 5 minutes. If you call this API before the data store is initialized, the call results in an error.
20+
1921
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2022

2123
## Permissions

api-reference/beta/api/backuprestoreroot-list-driveprotectionunits.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Don't supply a request body for this method.
4949

5050
If successful, this method returns a `200 OK` response code and a collection of [driveProtectionUnit](../resources/driveprotectionunit.md) in the response body.
5151

52+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
53+
5254
## Examples
5355

5456
### Example 1: List all the driveProtectionUnits in a tenant

api-reference/beta/api/backuprestoreroot-list-mailboxprotectionunits.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Don't supply a request body for this method.
5050

5151
If successful, this method returns a `200 OK` response code and a [mailboxProtectionUnit](../resources/mailboxprotectionunit.md) in the response body.
5252

53+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
54+
5355
## Examples
5456

5557
### Example 1: List all mailboxProtectionUnits in a tenant

api-reference/beta/api/backuprestoreroot-list-restorepoints.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "List restorePoints"
3-
description: "Get a list of the restorePoint objects and their properties."
3+
description: "Get a list of restorePoint objects and their properties."
44
author: "tushar20"
55
ms.reviewer: "manikantsinghms"
66
ms.localizationpriority: medium
@@ -14,7 +14,9 @@ Namespace: microsoft.graph
1414

1515
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1616

17-
Get a list of the [restorePoint](../resources/restorepoint.md) objects and their properties.
17+
Get a list of [restorePoint](../resources/restorepoint.md) objects and their properties.
18+
19+
> **Note:** This API returns a maximum of five **restorePoint** objects. If you don't include the `orderBy` parameter, the five most recent restore points are returned.
1820
1921
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2022

@@ -28,7 +30,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
2830
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
2931
|Application|BackupRestore-Restore.Read.All|BackupRestore-Restore.ReadWrite.All|
3032

31-
3233
## HTTP request
3334

3435
<!-- {
@@ -40,9 +41,10 @@ GET /solutions/backupRestore/restorePoints?$expand=protectionUnit($filter=id eq
4041
```
4142

4243
## Optional query parameters
43-
This method supports the `$expand` and `$filter` [OData puery parameters](/graph/query-parameters), as shown in the following [example](../api/backuprestoreroot-list-restorepoints.md#request).
4444

45-
The two query parameters are required.
45+
This method supports the `$expand`, `$filter` and `orderBy` [OData query parameters](/graph/query-parameters), as shown in the [example](../api/backuprestoreroot-list-restorepoints.md#request) later in this topic.
46+
47+
The `$expand` and `$filter` query parameters are required.
4648

4749
## Request headers
4850

@@ -58,6 +60,8 @@ Don't supply a request body for this method.
5860

5961
If successful, this method returns a `200 OK` response code and a collection of [restorePoint](../resources/restorepoint.md) object in the response body.
6062

63+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
64+
6165
## Examples
6266

6367
### Request

api-reference/beta/api/backuprestoreroot-list-siteprotectionunits.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Don't supply a request body for this method.
5050

5151
If successful, this method returns a `200 OK` response code and a [siteProtectionUnit](../resources/siteprotectionunit.md) in the response body.
5252

53+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
54+
5355
## Examples
5456

5557
### Example 1: List all the siteProtectionUnits in a tenant

api-reference/beta/api/backuprestoreroot-post-exchangeprotectionpolicies.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ In the request body, include a JSON representation of the [exchangeProtectionPol
5656

5757
If successful, this method returns a `201 Created` response code and an [exchangeProtectionPolicy](../resources/exchangeprotectionpolicy.md) object in the response body.
5858

59+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
60+
5961
## Examples
6062

6163
### Request

api-reference/beta/api/backuprestoreroot-post-exchangerestoresessions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ You can specify the following properties when you create an **exchangeRestoreSes
6060

6161
If successful, this method returns a `201 Created` response code and an [exchangeRestoreSession](../resources/exchangerestoresession.md) object in the response body.
6262

63+
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
64+
6365
## Examples
6466

6567
### Example 1: Create exchangeRestoreSession with mailboxRestoreArtifacts

0 commit comments

Comments
 (0)