Skip to content

Commit 781becc

Browse files
wandegwandeg
authored
Merge pull request #1263 from microsoftgraph/dev
Sync master with dev branch
2 parents cce6dab + a934340 commit 781becc

File tree

6 files changed

+595
-104
lines changed

6 files changed

+595
-104
lines changed

‎.github/workflows/validate-patch.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This file mirrors validate.yml and is designed to be a
2+
# "stand-in" that always passes so that pull requests are not
3+
# blocked waiting on the "Validate sample queries" workflow.
4+
# For context, validate.yml will only run if specific files are
5+
# updated in the PR. If a PR doesn't touch any of those files,
6+
# validate.yml will never run, but since it's a required status
7+
# check for PRs, the PR will be stuck waiting for the workflow to run.
8+
# This file solves that problem. For more info, see
9+
# https://github.com/orgs/community/discussions/44490
10+
name: Validate sample queries
11+
on:
12+
pull_request:
13+
paths-ignore:
14+
- sample-queries/sample-queries.json
15+
- scripts/**
16+
- tests/**
17+
- package.json
18+
- package-lock.json
19+
20+
jobs:
21+
validate-json-schema:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- run: 'echo "No validation required"'
25+
26+
test:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- run: 'echo "No tests required"'

‎.github/workflows/validate.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
name: Validate sample queries
2-
on: [pull_request,push]
2+
on:
3+
push:
4+
paths:
5+
- sample-queries/sample-queries.json
6+
- scripts/**
7+
- tests/**
8+
- package.json
9+
- package-lock.json
10+
pull_request:
11+
paths:
12+
- sample-queries/sample-queries.json
13+
- scripts/**
14+
- tests/**
15+
- package.json
16+
- package-lock.json
317

418
jobs:
519
validate-json-schema:
@@ -18,8 +32,8 @@ jobs:
1832
steps:
1933
- uses: actions/checkout@v2
2034

21-
- name: Install
22-
run: npm install
35+
- name: Install
36+
run: npm install
2337

2438
- name: Run test
2539
run: npm run test

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ POST Example includes headers, post body and a tip <br>
6767
When done making the changes on the document,
6868
1. Save the document on your machine
6969
1. Create a Git branch on this repo and name it using your initials + describe the changes ie. bn/add-xyz-samples
70+
1. Run `npm run test` to test your changes locally
7071
1. Commit the changes to your branch
7172
1. Create a PR (the PR is automatically updated with the relevant reviewers).
7273

@@ -114,15 +115,18 @@ Then in the new Git command line window, paste in this command to create and che
114115
### 4. Update your sample query
115116
Now you can add, update or delete your sample query in the `sample-queries.json` file that opened up in VS Code earlier.
116117

117-
### 5. Add, commit and push your changes back to the remote repo with the following commands
118+
### 5. Test your changes locally
119+
Run `npm run test` to test your changes locally before committing.
120+
121+
### 6. Add, commit and push your changes back to the remote repo with the following commands
118122
- Add the changes to you local repo: `git add sample-queries.json`
119123
- Commit your changes: `git commit -m "{add-reason-for-update}"`
120124
- Push your changes to the remote repo: `git push origin {your-branch-name}`
121125

122-
### 6. Login to GitHub
126+
### 7. Login to GitHub
123127
Follow the instructions to login to GitHub using your credentials.
124128

125-
### 7. If you get error 403
129+
### 8. If you get error 403
126130
Follow the instructions specified, then run this command again:<br/>
127131
`git push origin {your-branch-name}`
128132

‎permissions/new/ProvisioningInfo.json‎

Lines changed: 87 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,7 +2878,7 @@
28782878
{
28792879
"id": "1e4c6c41-0803-4f52-85ef-0a5d63ad8670",
28802880
"scheme": "DelegatedWork",
2881-
"environment": "PPE;public",
2881+
"environment": "",
28822882
"isHidden": false,
28832883
"isEnabled": true,
28842884
"resourceAppId": ""
@@ -5814,7 +5814,7 @@
58145814
{
58155815
"id": "37e00479-5776-4659-aecf-4841ec5d590a",
58165816
"scheme": "DelegatedWork",
5817-
"environment": "PPE;public",
5817+
"environment": "",
58185818
"isHidden": false,
58195819
"isEnabled": true,
58205820
"resourceAppId": "00000002-0000-0000-c000-000000000000"
@@ -7464,6 +7464,42 @@
74647464
"resourceAppId": ""
74657465
}
74667466
],
7467+
"MailboxConfigItem.Read": [
7468+
{
7469+
"id": "",
7470+
"scheme": "DelegatedWork",
7471+
"environment": "public",
7472+
"isHidden": true,
7473+
"isEnabled": false,
7474+
"resourceAppId": "c999ed3e-27ae-4cb3-b3a2-46b056af63d3"
7475+
},
7476+
{
7477+
"id": "",
7478+
"scheme": "Application",
7479+
"environment": "public",
7480+
"isHidden": true,
7481+
"isEnabled": false,
7482+
"resourceAppId": "c999ed3e-27ae-4cb3-b3a2-46b056af63d3"
7483+
}
7484+
],
7485+
"MailboxConfigItem.ReadWrite": [
7486+
{
7487+
"id": "",
7488+
"scheme": "DelegatedWork",
7489+
"environment": "public",
7490+
"isHidden": true,
7491+
"isEnabled": false,
7492+
"resourceAppId": "c999ed3e-27ae-4cb3-b3a2-46b056af63d3"
7493+
},
7494+
{
7495+
"id": "",
7496+
"scheme": "Application",
7497+
"environment": "public",
7498+
"isHidden": true,
7499+
"isEnabled": false,
7500+
"resourceAppId": "c999ed3e-27ae-4cb3-b3a2-46b056af63d3"
7501+
}
7502+
],
74677503
"MailboxFolder.Read": [
74687504
{
74697505
"id": "52dc2051-4958-4636-8f2a-281d39c6981c",
@@ -10444,12 +10480,12 @@
1044410480
"resourceAppId": "74658136-14ec-4630-ad9b-26e160ff0fc6"
1044510481
},
1044610482
{
10447-
"id": "",
10483+
"id": "abafe00f-ea87-4c63-b8a8-0e7bb0a88144",
1044810484
"scheme": "Application",
1044910485
"environment": "public",
10450-
"isHidden": true,
10451-
"isEnabled": false,
10452-
"resourceAppId": "74658136-14ec-4630-ad9b-26e160ff0fc6"
10486+
"isHidden": false,
10487+
"isEnabled": true,
10488+
"resourceAppId": ""
1045310489
}
1045410490
],
1045510491
"RecordsManagement.Read.All": [
@@ -12320,37 +12356,37 @@
1232012356
],
1232112357
"SharePointCrossTenantMigration.Read.All": [
1232212358
{
12323-
"id": "",
12359+
"id": "00dcb678-f9af-4e73-acb1-4f1657364629",
1232412360
"scheme": "DelegatedWork",
1232512361
"environment": "public",
1232612362
"isHidden": true,
12327-
"isEnabled": false,
12363+
"isEnabled": true,
1232812364
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1232912365
},
1233012366
{
12331-
"id": "",
12367+
"id": "f5fa52a5-b9ab-4dc3-885e-9e5b4a67068e",
1233212368
"scheme": "Application",
1233312369
"environment": "public",
1233412370
"isHidden": true,
12335-
"isEnabled": false,
12371+
"isEnabled": true,
1233612372
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1233712373
}
1233812374
],
1233912375
"SharePointCrossTenantMigration.Manage.All": [
1234012376
{
12341-
"id": "",
12377+
"id": "c608c170-08b5-466b-a8fe-0b4074b01613",
1234212378
"scheme": "DelegatedWork",
1234312379
"environment": "public",
1234412380
"isHidden": true,
12345-
"isEnabled": false,
12381+
"isEnabled": true,
1234612382
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1234712383
},
1234812384
{
12349-
"id": "",
12385+
"id": "a0521574-fcd8-4742-b29c-f796df57ea70",
1235012386
"scheme": "Application",
1235112387
"environment": "public",
1235212388
"isHidden": true,
12353-
"isEnabled": false,
12389+
"isEnabled": true,
1235412390
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1235512391
}
1235612392
],
@@ -12979,15 +13015,15 @@
1297913015
"id": "2104a4db-3a2f-4ea0-9dba-143d457dc666",
1298013016
"scheme": "DelegatedWork",
1298113017
"environment": "public",
12982-
"isHidden": true,
13018+
"isHidden": false,
1298313019
"isEnabled": true,
1298413020
"resourceAppId": "ab3be6b7-f5df-413d-ac2d-abf1e3fd9c0b"
1298513021
},
1298613022
{
1298713023
"id": "4437522e-9a86-4a41-a7da-e380edd4a97d",
1298813024
"scheme": "Application",
1298913025
"environment": "public",
12990-
"isHidden": true,
13026+
"isHidden": false,
1299113027
"isEnabled": true,
1299213028
"resourceAppId": "ab3be6b7-f5df-413d-ac2d-abf1e3fd9c0b"
1299313029
}
@@ -14747,15 +14783,15 @@
1474714783
"id": "7ff9afdd-0cdb-439d-a61c-fea3e9339e89",
1474814784
"scheme": "DelegatedWork",
1474914785
"environment": "PPE;public",
14750-
"isHidden": true,
14786+
"isHidden": false,
1475114787
"isEnabled": true,
1475214788
"resourceAppId": ""
1475314789
},
1475414790
{
1475514791
"id": "a94a502d-0281-4d15-8cd2-682ac9362c4c",
1475614792
"scheme": "Application",
1475714793
"environment": "PPE;public",
14758-
"isHidden": true,
14794+
"isHidden": false,
1475914795
"isEnabled": true,
1476014796
"resourceAppId": ""
1476114797
}
@@ -16531,6 +16567,38 @@
1653116567
"isEnabled": true,
1653216568
"resourceAppId": "f0574968-bd32-4379-a169-50a2695e68f5"
1653316569
}
16570+
],
16571+
"IdentityRiskyAgent.Read.All": [
16572+
{
16573+
"scheme": "Application",
16574+
"environment": "public",
16575+
"isHidden": true,
16576+
"isEnabled": true,
16577+
"resourceAppId": "a3dfc3c6-2c7d-4f42-aeec-b2877f9bce97"
16578+
},
16579+
{
16580+
"scheme": "DelegatedWork",
16581+
"environment": "public",
16582+
"isHidden": true,
16583+
"isEnabled": true,
16584+
"resourceAppId": "a3dfc3c6-2c7d-4f42-aeec-b2877f9bce97"
16585+
}
16586+
],
16587+
"IdentityRiskyAgent.ReadWrite.All": [
16588+
{
16589+
"scheme": "Application",
16590+
"environment": "public",
16591+
"isHidden": true,
16592+
"isEnabled": true,
16593+
"resourceAppId": "a3dfc3c6-2c7d-4f42-aeec-b2877f9bce97"
16594+
},
16595+
{
16596+
"scheme": "DelegatedWork",
16597+
"environment": "public",
16598+
"isHidden": true,
16599+
"isEnabled": true,
16600+
"resourceAppId": "a3dfc3c6-2c7d-4f42-aeec-b2877f9bce97"
16601+
}
1653416602
]
1653516603
}
16536-
}
16604+
}

0 commit comments

Comments
 (0)