From 67398144fb4694a7ae66d514848b25aab813612f Mon Sep 17 00:00:00 2001 From: Bo Wen Date: Wed, 14 Aug 2019 11:06:46 -0700 Subject: [PATCH 1/2] Update 2019-04-01 API as changes from 2019-06-01. --- .../stable/2019-04-01/privateEndpoint.json | 33 +++++++--- .../stable/2019-04-01/privateLinkService.json | 62 ++++++++++++++----- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json index 807ef0d89c20..4eb8edb34196 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json @@ -74,7 +74,7 @@ "description": "Delete successful." }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -133,7 +133,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -176,7 +176,7 @@ "schema": { "$ref": "#/definitions/PrivateEndpoint" }, - "description": "Parameters supplied to the create or update private endpoint operation" + "description": "Parameters supplied to the create or update private endpoint operation." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -199,7 +199,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -249,7 +249,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -288,7 +288,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -396,7 +396,7 @@ }, "etag": { "type": "string", - "description": "Gets a unique read-only string that changes whenever the resource is updated." + "description": "A unique read-only string that changes whenever the resource is updated." } }, "allOf": [ @@ -421,9 +421,8 @@ "description": "Gets an array of references to the network interfaces created for this private endpoint." }, "provisioningState": { - "readOnly": true, - "type": "string", - "description": "The provisioning state of the private endpoint. Possible values are: 'Updating', 'Deleting', and 'Failed'." + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the private endpoint." }, "privateLinkServiceConnections": { "type": "array", @@ -452,6 +451,16 @@ "name": { "type": "string", "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." } }, "allOf": [ @@ -463,6 +472,10 @@ }, "PrivateLinkServiceConnectionProperties": { "properties": { + "provisioningState": { + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the private link service connection." + }, "privateLinkServiceId": { "type": "string", "description": "The resource id of private link service." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json index e8fa9661b772..5e3b6150e756 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json @@ -74,7 +74,7 @@ "description": "Delete successful." }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -133,7 +133,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -173,7 +173,7 @@ "schema": { "$ref": "#/definitions/PrivateLinkService" }, - "description": "Parameters supplied to the create or update private link service operation" + "description": "Parameters supplied to the create or update private link service operation." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -196,7 +196,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -243,7 +243,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -282,7 +282,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -351,7 +351,7 @@ } }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -409,7 +409,7 @@ "description": "Delete successful." }, "default": { - "description": "Error", + "description": "Error.", "schema": { "$ref": "./network.json#/definitions/Error" } @@ -623,7 +623,7 @@ }, "etag": { "type": "string", - "description": "Gets a unique read-only string that changes whenever the resource is updated." + "description": "A unique read-only string that changes whenever the resource is updated." } }, "allOf": [ @@ -658,9 +658,8 @@ "description": "Gets an array of references to the network interfaces created for this private link service." }, "provisioningState": { - "readOnly": true, - "type": "string", - "description": "The provisioning state of the private link service. Possible values are: 'Updating', 'Succeeded', and 'Failed'." + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the private link service." }, "privateEndpointConnections": { "type": "array", @@ -722,8 +721,23 @@ "name": { "type": "string", "description": "The name of private link service ip configuration." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." } }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], "description": "The private link service ip configuration." }, "PrivateLinkServiceIpConfigurationProperties": { @@ -740,13 +754,13 @@ "$ref": "./virtualNetwork.json#/definitions/Subnet", "description": "The reference of the subnet resource." }, - "publicIPAddress": { - "$ref": "./publicIpAddress.json#/definitions/PublicIPAddress", - "description": "The reference of the public IP resource." + "primary": { + "type": "boolean", + "description": "Whether the ip configuration is primary or not." }, "provisioningState": { - "type": "string", - "description": "Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the private link service ip configuration." }, "privateIPAddressVersion": { "$ref": "./network.json#/definitions/IPVersion", @@ -765,6 +779,16 @@ "name": { "type": "string", "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." } }, "allOf": [ @@ -783,6 +807,10 @@ "privateLinkServiceConnectionState": { "$ref": "#/definitions/PrivateLinkServiceConnectionState", "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "provisioningState": { + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the private endpoint connection." } }, "description": "Properties of the PrivateEndpointConnectProperties." From 92006e420d65cb70e4b93bc5850af575da4efb78 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 15 Aug 2019 12:05:25 -0700 Subject: [PATCH 2/2] Mark "provisioningState" as read-only --- .../Microsoft.Network/stable/2019-04-01/privateEndpoint.json | 2 ++ .../stable/2019-04-01/privateLinkService.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json index 4eb8edb34196..c67b957db73d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateEndpoint.json @@ -421,6 +421,7 @@ "description": "Gets an array of references to the network interfaces created for this private endpoint." }, "provisioningState": { + "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the private endpoint." }, @@ -473,6 +474,7 @@ "PrivateLinkServiceConnectionProperties": { "properties": { "provisioningState": { + "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the private link service connection." }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json index 5e3b6150e756..06321a2cb0f1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/privateLinkService.json @@ -658,6 +658,7 @@ "description": "Gets an array of references to the network interfaces created for this private link service." }, "provisioningState": { + "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the private link service." }, @@ -759,6 +760,7 @@ "description": "Whether the ip configuration is primary or not." }, "provisioningState": { + "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the private link service ip configuration." }, @@ -809,6 +811,7 @@ "description": "A collection of information about the state of the connection between service consumer and provider." }, "provisioningState": { + "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the private endpoint connection." }