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.

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

Jump to bottom

Update manage service identity api version #4492

Merged
merged 3 commits into from
Nov 28, 2018
Merged

Update manage service identity api version #4492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4feffbe
directly copy swagger folder from old api version
Nov 16, 2018
c5e3d7f
update Managed Service Identity api version to 2018-11-30, the differ…
Nov 16, 2018
d191254
feedback
Nov 27, 2018
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
9 changes: 6 additions & 3 deletions specification/msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/ManagedIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "2015-08-31-preview",
"version": "2018-11-30",
"title": "ManagedServiceIdentityClient",
"description": "The Managed Service Identity Client."
},
Expand Down Expand Up @@ -388,7 +388,7 @@
"clientSecretUrl": {
"type": "string",
"readOnly": true,
"description": " The ManagedServiceIdentity DataPlane URL that can be queried to obtain the identity credentials."
"description": " The ManagedServiceIdentity DataPlane URL that can be queried to obtain the identity credentials. If identity is user assigned, the clientSecretUrl is null, otherwise the clientSecretUrl is not null"
amarzavery marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand Down Expand Up @@ -535,7 +535,10 @@
"in": "query",
"description": "Version of API to invoke.",
"required": true,
"type": "string"
"type": "string",
"enum": [
"2018-11-30"
]
amarzavery marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
4 changes: 1 addition & 3 deletions ...on/msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid",
"resourceGroupName": "rgName",
"resourceName": "resourceName",
Expand All @@ -20,7 +20,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand All @@ -38,7 +37,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand Down
2 changes: 1 addition & 1 deletion ...on/msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid",
"resourceGroupName": "rgName",
"resourceName": "resourceName"
Expand Down
3 changes: 1 addition & 2 deletions ...ation/msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid",
"resourceGroupName": "rgName",
"resourceName": "resourceName"
Expand All @@ -13,7 +13,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand Down
5 changes: 2 additions & 3 deletions ...ce-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid",
"resourceGroupName": "rgName"
},
Expand All @@ -14,7 +14,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand All @@ -25,7 +24,7 @@
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
],
"nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities?api-version=2015-08-31-preview&$skiptoken=X'12345'"
"nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities?api-version=2018-11-30&$skiptoken=X'12345'"
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions ...rce-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid"
},
"responses": {
Expand All @@ -13,7 +13,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand All @@ -24,7 +23,7 @@
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
],
"nextLink": "https://serviceRoot/subscriptions/subId/providers/Microsoft.ManagedIdentity/userAssignedIdentities?api-version=2015-08-31-preview&$skiptoken=X'12345'"
"nextLink": "https://serviceRoot/subscriptions/subId/providers/Microsoft.ManagedIdentity/userAssignedIdentities?api-version=2018-11-30&$skiptoken=X'12345'"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...on/msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/examples/IdentityUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview",
"api-version": "2018-11-30",
"subscriptionId": "subid",
"resourceGroupName": "rgName",
"resourceName": "resourceName",
Expand All @@ -20,7 +20,6 @@
"name": "identityName",
"properties": {
"clientId": "clientGUID",
"clientSecretUrl": "https://serviceRoot/subscriptions/subscriptionId/resourcegroups/rgName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName/credentials?tid=tenantId&oid=principalId&aid=clientId",
"principalId": "identityObjectID",
"tenantId": "tenantGUID"
},
Expand Down
4 changes: 2 additions & 2 deletions ...msi/resource-manager/Microsoft.ManagedIdentity/2018-11-30/examples/MsiOperationsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2015-08-31-preview"
"api-version": "2018-11-30"
},
"responses": {
"200": {
Expand Down Expand Up @@ -34,7 +34,7 @@
"name": "Microsoft.ManagedIdentity/userAssignedIdentities/delete"
}
],
"nextLink": "https://serviceRoot/providers/Microsoft.ManagedIdentity/operations?api-version=2015-08-31-preview&$skiptoken=X'12345'"
"nextLink": "https://serviceRoot/providers/Microsoft.ManagedIdentity/operations?api-version=2018-11-30&$skiptoken=X'12345'"
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions specification/msi/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,19 @@ go:
``` yaml $(go) && $(multiapi)
batch:
- tag: package-2018-11-30
- tag: package-2015-08-31-preview
```
### Tag: package-2018-11-30 and go
These settings apply only when `--tag=package-2018-11-30 --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-2018-11-30' && $(go)
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-11-30/$(namespace)
```

### Tag: package-2015-08-31-preview and go

These settings apply only when `--tag=package-2015-08-31-preview --go` is specified on the command line.
Expand Down
24 changes: 23 additions & 1 deletion specification/msi/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,17 @@ These are the global settings for the Managed Service Identity API.

``` yaml
openapi-type: arm
tag: package-2015-08-31-preview
tag: package-2018-11-30
```
### Tag: package-2018-11-30
These settings apply only when `--tag=package-2018-11-30` is specified on the command line.

``` yaml $(tag) == 'package-2018-11-30'
input-file:
- Microsoft.ManagedIdentity/2018-11-30/ManagedIdentity.json
```

### Tag: package-2015-08-31-preview

Expand Down Expand Up @@ -120,9 +128,23 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-msi

``` yaml $(java) && $(multiapi)
batch:
- tag: package-2018-11-30
- tag: package-2015-08-31-preview
```

### Tag: package-2018-11-30 and java

These settings apply only when `--tag=package-2018-11-30 --java` is specified on the command line.
Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.

``` yaml $(tag) == 'package-2018-11-30' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.managedserviceidentity.v2018-11-30
output-folder: $(azure-libraries-for-java-folder)/managedserviceidentity/resource-manager/v2018-11-30
regenerate-manager: true
generate-interface: true
```

### Tag: package-2015-08-31-preview and java

These settings apply only when `--tag=package-2015-08-31-preview --java` is specified on the command line.
Expand Down
11 changes: 11 additions & 0 deletions specification/msi/resource-manager/readme.ruby.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@ azure-arm: true
``` yaml $(ruby) && $(multiapi)
batch:
- tag: package-2018-11-30
- tag: package-2015-08-31-preview
```
### Tag: package-2018-11-30 and ruby
These settings apply only when `--tag=package-2018-11-30 --ruby` is specified on the command line.
Please also specify `--ruby-sdks-folder=<path to the root directory of your azure-sdk-for-ruby clone>`.

``` yaml $(tag) == 'package-2018-11-30' && $(ruby)
namespace: "Azure::ManagedServiceIdentity::Mgmt::V2018-11-30"
output-folder: $(ruby-sdks-folder)/management/azure_mgmt_msi/lib
```

### Tag: package-2015-08-31-preview and ruby

These settings apply only when `--tag=package-2015-08-31-preview --ruby` is specified on the command line.
Expand Down