Skip to content
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.

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

[Hub Generated] Review request for Microsoft.InstanceMetadataService to add version stable/2021-11-15 #21201

Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2021-11-01",
"api-version": "2021-11-15",
"nonce": "abcde12345",
"Metadata": "true"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2021-11-01",
"api-version": "2021-11-15",
"Metadata": "true"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2021-11-01",
"api-version": "2021-11-15",
"Metadata": "true",
"resource": "https://vault.azure.net"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2021-11-01",
"api-version": "2021-11-15",
"Metadata": "true"
},
"responses": {
Expand Down Expand Up @@ -53,6 +53,9 @@
"virtualTpmEnabled": "false",
"encryptionAtHost": "true"
},
"hostGroup": {
"id": "testHostGroupId"
},
"sku": "Windows-Server-2012-R2-Datacenter",
"storageProfile": {
"dataDisks": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "InstanceMetadataClient",
"description": "The Azure Instance Metadata Client",
"version": "2021-11-01"
"version": "2021-11-15"
},
"host": "169.254.169.254",
"basePath": "/metadata",
Expand Down Expand Up @@ -335,6 +335,14 @@
"description": "This contains the data about the security profile associated with the VM.",
"$ref": "#/definitions/SecurityProfile"
},
"host": {
"description": "This contains the data about the host of VM.",
"$ref": "#/definitions/host"
},
"hostGroup": {
"description": "This contains the data about the host group of VM.",
"$ref": "#/definitions/hostGroup"
},
"sku": {
"type": "string",
"description": "This is the specific SKU for the VM image."
Expand Down Expand Up @@ -598,6 +606,26 @@
}
}
},
"host": {
"type": "object",
"description": "This contains data about host of VM",
"properties": {
"id": {
"type": "string",
"description": "This is the name of the host of VM. Note that a VM will either have a host or a hostGroup but not both"
}
}
},
"hostGroup": {
"type": "object",
"description": "This contains data about host group of VM",
"properties": {
"id": {
"type": "string",
"description": "This is the name of the host group of VM. Note that a VM will either have a host or a hostGroup but not both"
}
}
},
ChhabraAnshul marked this conversation as resolved.
Show resolved Hide resolved
"StorageProfile": {
"type": "object",
"description": "This contains the data about the storage disks associated with the VM.",
Expand Down
31 changes: 29 additions & 2 deletions specification/imds/data-plane/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,27 @@ These are the global settings for the Instance Metadata Service API.
``` yaml
openapi-type: data-plane
azure-arm: false
tag: package-2021-11-01
tag: package-2021-11-15
```


### Tag: package-2021-11-15

These settings apply only when `--tag=package-2021-11-15` is specified on the command line.

``` yaml $(tag) == 'package-2021-11-15'
input-file:
- Microsoft.InstanceMetadataService/stable/2021-11-15/imds.json
```
### Tag: package-2021-11-01

These settings apply only when `--tag=package-2021-11-01` is specified on the command line.

```yaml $(tag) == 'package-2021-11-01'
``` yaml $(tag) == 'package-2021-11-01'
input-file:
- Microsoft.InstanceMetadataService/stable/2021-11-01/imds.json
```

### Tag: package-2018-02-01

These settings apply only when `--tag=package-2018-02-01` is specified on the command line.
Expand Down Expand Up @@ -589,6 +598,22 @@ directive:
- $.definitions.IdentityTokenResponse.properties.object_id
- $.definitions.IdentityTokenResponse.properties.msi_res_id
- $.definitions.IdentityErrorResponse.properties.error_description

- suppress: DefinitionsPropertiesNamesCamelCase
reason: The following properties follow the Oath2 spec, which does not use camelCase.
from: Microsoft.InstanceMetadataService/stable/2021-11-15/imds.json
where:
- $.definitions.IdentityTokenResponse.properties.access_token
- $.definitions.IdentityTokenResponse.properties.expires_in
- $.definitions.IdentityTokenResponse.properties.expires_on
- $.definitions.IdentityTokenResponse.properties.ext_expires_in
- $.definitions.IdentityTokenResponse.properties.not_before
- $.definitions.IdentityTokenResponse.properties.resource
- $.definitions.IdentityTokenResponse.properties.token_type
- $.definitions.IdentityTokenResponse.properties.client_id
- $.definitions.IdentityTokenResponse.properties.object_id
- $.definitions.IdentityTokenResponse.properties.msi_res_id
- $.definitions.IdentityErrorResponse.properties.error_description
```

---
Expand Down Expand Up @@ -641,6 +666,8 @@ input-file:
- $(this-folder)/Microsoft.InstanceMetadataService/stable/2021-03-01/imds.json
- $(this-folder)/Microsoft.InstanceMetadataService/stable/2021-05-01/imds.json
- $(this-folder)/Microsoft.InstanceMetadataService/stable/2021-10-01/imds.json
- $(this-folder)/Microsoft.InstanceMetadataService/stable/2021-11-01/imds.json
- $(this-folder)/Microsoft.InstanceMetadataService/stable/2021-11-15/imds.json
```

If there are files that should not be in the `all-api-versions` set,
Expand Down