Skip to content

Commit 70c9469

Browse files
authored
Merge branch 'main' into AddPS72
2 parents a3858a2 + b672a0b commit 70c9469

File tree

4,968 files changed

+685019
-15492
lines changed

Some content is hidden

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

4,968 files changed

+685019
-15492
lines changed
-78.1 KB
Loading

.github/PULL_REQUEST_TEMPLATE/control_plane_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Please understand this diagram before proceeding. It explains how to get your PR approved & merged.
66

7-
![diagram](https://github.com/Azure/azure-rest-api-specs/assets/4429827/b321e1dc-5e07-4940-9cd6-a65ac6729a8b)
7+
![diagram](https://github.com/Azure/azure-rest-api-specs/assets/4429827/029a11fd-eaf9-4865-9d77-a16b5ea5eb26)
88

99
[1] [ARM review queue] (for **merge** queues, see [4])
1010
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.

.github/PULL_REQUEST_TEMPLATE/data_plane_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ The [Azure API Review Board](https://aka.ms/azsdk/onboarding/restapischedule) is
4747
### Tooling
4848

4949
* [Open API validation tools](https://aka.ms/swaggertools) were run on this PR. Go here to see [how to fix errors](https://aka.ms/ci-fix)
50-
* [Spectral Linting](https://aka.ms/style)
50+
* [Spectral Linting](https://github.com/Azure/azure-api-style-guide/blob/main/README.md)
5151
* [Open API Hub](https://aka.ms/openapiportal)
5252

5353
### Guidelines & Specifications
5454

55-
* [Azure REST API Guidelines](https://aka.ms/guidelines)
56-
* [OpenAPI Style Guidelines](https://aka.ms/style)
55+
* [Azure REST API Guidelines](https://aka.ms/azapi/guidelines)
56+
* [OpenAPI Style Guidelines](https://aka.ms/azapi/style)
5757
* [Azure Breaking Change Policy](https://aka.ms/AzBreakingChangesPolicy)
5858

5959
### Helpful Links

.github/comment.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
repoAllowList:
1515
- Azure/azure-rest-api-specs-pr
1616
variables:
17-
openapiHub: https://aka.ms/openapihub
17+
openapiHub: https://portal.azure-devex-tools.com
1818
to: Azure/azure-rest-api-specs/main
1919
label: Approved-OkToMerge
2020
onLabeledComments: >-
@@ -25,8 +25,7 @@
2525
If you want to publish the PR to the public repo (`Azure/azure-rest-api-specs`) `main` branch,
2626
please use [OpenAPIHub Publish PR](${openapiHub}/tools/publishpullrequest?pr=${owner}/${repo}/${PRNumber}&to=${to}).
2727
</li><li>
28-
For further guidance on how to proceed please refer to this
29-
[wiki article](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**).
28+
For further guidance see [Spec Repos](https://eng.ms/docs/products/azure-developer-experience/design/api-specs-pr/api-repos).
3029
</li>
3130
3231
- rule:

.github/policies/resourceManagement.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2529,7 +2529,16 @@ configuration:
25292529
then:
25302530
- removeLabel:
25312531
label: no-recent-activity
2532-
description:
2532+
description:
2533+
- if:
2534+
- payloadType: Pull_Request
2535+
then:
2536+
- if:
2537+
- filesMatchPattern:
2538+
pattern: specification/.*(\.tsp|tspconfig.yaml)
2539+
then:
2540+
- addLabel:
2541+
label: TypeSpec
25332542
- if:
25342543
- payloadType: Pull_Request
25352544
then:

.github/workflows/comment.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ on:
44
issue_comment:
55
types: [created]
66

7-
permissions:
8-
pull-requests: write
9-
repository-projects: read
7+
permissions: { }
108

119
jobs:
1210
comment-handler:
1311
permissions:
14-
pull-requests: write # to read pull requests and write comments
12+
pull-requests: write # to read pull requests and write comments
13+
repository-projects: read # Workaround issue with cli trying to read projects during edit
1514
name: Handle ${{ github.event_name }} ${{ github.event.action }} event
1615
runs-on: ubuntu-latest
1716
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ If the AutoRest configuration file (aka. the readme.md) is placed out of sub-ser
168168

169169
### common-types
170170

171-
Specification files and AutoRest configuration files in one RP folder are better to refer to files in the same RP folder. Entity type definition that can be shared cross resource providers or services should to be placed and maintained either under the folder [**common-types**](https://github.com/Azure/azure-rest-api-specs#common-types) under specification, or under **common-types** folder of service group folder structure. The former supports the entity type sharing cross rp folders, while the latter supports the enitity type sharing cross components or services under the same rp folder.
171+
Specification files and AutoRest configuration files in one RP folder are better to refer to files in the same RP folder. Entity type definition that can be shared cross resource providers or services should to be placed and maintained either under the folder [**common-types**](https://github.com/Azure/azure-rest-api-specs#common-types) under specification, or under **common-types** folder of service group folder structure. The former supports the entity type sharing cross rp folders, while the latter supports the entity type sharing cross components or services under the same rp folder.
172172

173173
Refer to [Resource-Management](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/common-types/resource-management) common types for example.
174174

arm-compute/quickstart-templates/aliases.json

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,97 +9,48 @@
99
"type": "object",
1010
"value": {
1111
"Linux": {
12-
"CentOS": {
13-
"publisher": "OpenLogic",
14-
"offer": "CentOS",
15-
"sku": "7.5",
16-
"version": "latest",
17-
"architecture": "x64"
18-
},
1912
"CentOS85Gen2": {
2013
"publisher": "OpenLogic",
2114
"offer": "CentOS",
2215
"sku": "8_5-gen2",
2316
"version": "latest",
2417
"architecture": "x64"
2518
},
26-
"Debian": {
27-
"publisher": "Debian",
28-
"offer": "debian-10",
29-
"sku": "10",
30-
"version": "latest",
31-
"architecture": "x64"
32-
},
3319
"Debian11": {
3420
"publisher": "Debian",
3521
"offer": "debian-11",
3622
"sku": "11-backports-gen2",
3723
"version": "latest",
3824
"architecture": "x64"
3925
},
40-
"Flatcar": {
41-
"publisher": "kinvolk",
42-
"offer": "flatcar-container-linux-free",
43-
"sku": "stable",
44-
"version": "latest",
45-
"architecture": "x64"
46-
},
4726
"FlatcarLinuxFreeGen2": {
4827
"publisher": "kinvolk",
4928
"offer": "flatcar-container-linux-free",
5029
"sku": "stable-gen2",
5130
"version": "latest",
5231
"architecture": "x64"
5332
},
54-
"openSUSE-Leap": {
55-
"publisher": "SUSE",
56-
"offer": "opensuse-leap-15-3",
57-
"sku": "gen2",
58-
"version": "latest",
59-
"architecture": "x64"
60-
},
6133
"OpenSuseLeap154Gen2": {
6234
"publisher": "SUSE",
6335
"offer": "openSUSE-leap-15-4",
6436
"sku": "gen2",
6537
"version": "latest",
6638
"architecture": "x64"
6739
},
68-
"RHEL": {
69-
"publisher": "RedHat",
70-
"offer": "RHEL",
71-
"sku": "7-LVM",
72-
"version": "latest",
73-
"architecture": "x64"
74-
},
7540
"RHELRaw8LVMGen2": {
7641
"publisher": "RedHat",
7742
"offer": "RHEL",
7843
"sku": "8-lvm-gen2",
7944
"version": "latest",
8045
"architecture": "x64"
8146
},
82-
"SLES": {
83-
"publisher": "SUSE",
84-
"offer": "sles-15-sp3",
85-
"sku": "gen2",
86-
"version": "latest",
87-
"architecture": "x64"
88-
},
8947
"SuseSles15SP3": {
9048
"publisher": "SUSE",
9149
"offer": "sles-15-sp3",
9250
"sku": "gen2",
9351
"version": "latest",
9452
"architecture": "x64"
9553
},
96-
"UbuntuLTS": {
97-
"publisher": "Canonical",
98-
"offer": "UbuntuServer",
99-
"sku": "18.04-LTS",
100-
"version": "latest",
101-
"architecture": "x64"
102-
},
10354
"Ubuntu2204": {
10455
"publisher": "Canonical",
10556
"offer": "0001-com-ubuntu-server-jammy",

cSpell.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
],
2424
"ignorePaths": [
2525
"node_modules/**",
26-
"**/examples/**"
26+
"**/examples/**",
27+
"**/package-lock.json"
2728
],
2829
"ignoreRegExpList": [
2930
"v\\d",
@@ -402,9 +403,21 @@
402403
]
403404
},
404405
{
405-
"filename": "**/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json",
406+
"filename": "**/specification/migrate/resource-manager/**/*.json",
406407
"words": [
407-
"Occured"
408+
"Occured",
409+
"Assessible",
410+
"sqlcollectors",
411+
"Reasonings",
412+
"Overcommit",
413+
"overcommit",
414+
"SSDE",
415+
"Recieved",
416+
"Ebds",
417+
"idms",
418+
"Idms",
419+
"Cluter",
420+
"Mfamily"
408421
]
409422
},
410423
{
@@ -592,12 +605,6 @@
592605
"Listblob"
593606
]
594607
},
595-
{
596-
"filename": "**/specification/migrate/resource-manager/Microsoft.Migrate/preview/2017-11-11-preview/migrate.json",
597-
"words": [
598-
"Occured"
599-
]
600-
},
601608
{
602609
"filename": "**/specification/cognitiveservices/data-plane/TextAnalytics/preview/v2.1/TextAnalytics.json",
603610
"words": [

0 commit comments

Comments
 (0)