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

Container Instance October Swagger #4058

Merged
merged 5 commits into from
Oct 2, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Expand Up @@ -475,6 +475,43 @@
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/providers/Microsoft.ContainerInstance/serviceAssociationLinks/default": {
"delete": {
"operationId": "ServiceAssociationLink_Delete",
"x-ms-examples": {
"ContainerGroupsDelete": {
"$ref": "./examples/ServiceAssociationLink_Delete.json"
}
},
"summary": "Delete the container instance service association link for the subnet.",
"description": "Delete the container instance service association link for the subnet. This operation unblocks user from deleting subnet.",
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/VirtualNetworkNameParameter"
},
{
"$ref": "#/parameters/SubnetNameParameter"
}
],
"responses": {
"200": {
"description": "OK"
},
"204": {
"description": "No Content - the specified service association link was not found."
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -892,6 +929,10 @@
"required": [
"properties"
],
"identity": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is in the wrong place and is the cause for the autorest codegen to fail. Presumably this is supposed to go under properties?

"$ref": "#/definitions/ContainerGroupIdentity",
"description": "The identity of the container group, if configured."
},
"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand Down Expand Up @@ -990,6 +1031,54 @@
}
]
},
"ContainerGroupIdentity": {
"description": "Identity for the container group.",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of the container group identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "The tenant id associated with the container group. This property will only be provided for a system assigned identity."
},
"type": {
"type": "string",
"description": "The type of identity used for the container group. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the container group.",
"enum": [
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned",
"None"
],
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"type": "object",
"description": "The list of user identities associated with the container group. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.",
"additionalProperties": {
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
}
}
}
},
"ImageRegistryCredential": {
"description": "Image registry credential.",
"type": "object",
Expand Down Expand Up @@ -1085,7 +1174,7 @@
},
"type": {
"type": "string",
"description": "Specifies if the IP is exposed to the public internet.",
"description": "Specifies if the IP is exposed to the public internet or private VNET.",
"enum": [
"Public",
"Private"
Expand Down Expand Up @@ -1435,6 +1524,22 @@
"description": "The name of the resource group.",
"x-ms-parameter-location": "method"
},
"VirtualNetworkNameParameter": {
"name": "virtualNetworkName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the virtual network.",
"x-ms-parameter-location": "method"
},
"SubnetNameParameter": {
"name": "subnetName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the subnet.",
"x-ms-parameter-location": "method"
},
"ContainerGroupNameParameter": {
"name": "containerGroupName",
"in": "path",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"id": "/subscriptions/subid/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1",
"location": "west us",
"name": "demo1",
"Identity": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This example also needs to be updated after your last commit, see the failure in the model validator log.

"type": "SystemAssigned, UserAssigned",
"UserAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity-name": {}
}
},
"properties": {
"containers": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"subscriptionId": "subid",
"api-version": "2018-09-01",
"resourceGroupName": "demo",
"virtualNetworkName": "demo1",
"subnetName": "demo1"
},
"responses": {
"200": {},
"204": {}
}
}