Skip to content

Merge in new edits to main to the feature branch #18237

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.

Sign up for GitHub

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

Closed
wants to merge 13 commits into from
Closed

Merge in new edits to main to the feature branch #18237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5b820e6
Update gallery.json
Sandido Mar 14, 2022
25896c4
Update sharedGallery.json
Sandido Mar 14, 2022
85465e8
Update compute.json
Sandido Mar 14, 2022
3c35fc7
Update disk.json
Sandido Mar 14, 2022
46e9d53
Update runCommands.json
Sandido Mar 14, 2022
1e85ee1
Update compute.json
Sandido Mar 14, 2022
6015c74
Update gallery.json
Sandido Mar 14, 2022
11aaa50
Update runCommands.json
Sandido Mar 14, 2022
94288cb
Update gallery.json
Sandido Mar 14, 2022
1a4a841
Update compute.json
Sandido Mar 14, 2022
7aa2add
Update readme.go.md
Sandido Mar 14, 2022
8a8ac87
Update readme.go.md
Sandido Mar 14, 2022
192cf0e
Update readme.go.md
Sandido Mar 14, 2022
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
11 changes: 11 additions & 0 deletions specification/azurestackhci/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,22 @@ azure-arm: true

```yaml $(go) && $(multiapi)
batch:
- tag: package-2022-01
- tag: package-preview-2021-01
- tag: package-2020-10
- tag: package-2020-03-01-preview
```

### Tag: package-2022-01 and go

These settings apply only when `--tag=package-2022-01 --go` is specified on the command line.
Please also specify `--go-sdks-folder=<path to the root directory of your azure-sdk-for-go clone>`.

```yaml $(tag) == 'package-2022-01' && $(go)
namespace: azurestackhci
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-01-01/$(namespace)
```

### Tag: package-preview-2021-01 and go

These settings apply only when `--tag=package-preview-2021-01 --go` is specified on the command line.
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2020-09-30/gallery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,6 +2705,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions ...ification/compute/resource-manager/Microsoft.Compute/stable/2020-09-30/sharedGallery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14439,6 +14439,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/disk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3531,6 +3531,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/runCommands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14562,6 +14562,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/gallery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2736,6 +2736,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
4 changes: 4 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/runCommands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,10 @@
"items": {
"$ref": "#/definitions/ApiErrorBase"
},
"x-ms-identifiers": [
"message",
"target"
],
"description": "The Api error details"
},
"innererror": {
Expand Down
12 changes: 12 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-10-01/gallery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,6 +2271,18 @@
"name"
],
"description": "A list of gallery image features."
},
"architecture": {
"type": "string",
"description": "The architecture of the image. Applicable to OS disks only.",
"enum": [
"x64",
"Arm64"
],
"x-ms-enum": {
"name": "Architecture",
"modelAsString": true
}
}
},
"required": [
Expand Down
15 changes: 15 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10130,6 +10130,18 @@
"modelAsString": true
}
},
"ArchitectureType": {
"type": "string",
"description": "Specifies the Architecture Type",
"enum": [
"x64",
"Arm64"
],
"x-ms-enum": {
"name": "ArchitectureTypes",
"modelAsString": true
}
},
"InstanceViewStatus": {
"properties": {
"code": {
Expand Down Expand Up @@ -11886,6 +11898,9 @@
"x-ms-identifiers": [
"name"
]
},
"architecture": {
"$ref": "#/definitions/ArchitectureType"
}
},
"description": "Describes the properties of a Virtual Machine Image."
Expand Down
11 changes: 11 additions & 0 deletions specification/compute/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ directive:

```yaml $(go) && $(multiapi)
batch:
- tag: package-2021-12-01
- tag: package-2021-11-01
- tag: package-2021-08-01
- tag: package-2021-07-01
Expand Down Expand Up @@ -76,6 +77,16 @@ batch:
- tag: package-container-service-2015-11-preview
```

### Tag: package-2021-12-01 and go

These settings apply only when `--tag=package-2021-12-01 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

```yaml $(tag)=='package-2021-12-01' && $(go)
namespace: compute
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-12-01/$(namespace)
```

### Tag: package-2021-11-01 and go

These settings apply only when `--tag=package-2021-11-01 --go` is specified on the command line.
Expand Down
10 changes: 10 additions & 0 deletions specification/resourcehealth/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,20 @@ azure-arm: true

``` yaml $(go) && $(multiapi)
batch:
- tag: package-2020-05-01
- tag: package-2017-07
- tag: package-2015-01
```

### Tag: package-2020-05-01 and go

These settings apply only when `--tag=package-2020-05-01 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-2020-05-01' && $(go)
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-05-01/$(namespace)
```

### Tag: package-2017-07 and go

These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
Expand Down