From 2f4e35259259517343bb261389a8b681fa27c80f Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 07:20:50 -0700 Subject: [PATCH 01/43] Adds base for updating Microsoft.DigitalTwins from version stable/2020-10-31 to version 2020-12-01 --- .../stable/2020-12-01/digitaltwins.json | 1162 +++++++++++++++++ ...talTwinsCheckNameAvailability_example.json | 20 + .../examples/DigitalTwinsDelete_example.json | 39 + .../DigitalTwinsEndpointDelete_example.json | 40 + .../DigitalTwinsEndpointGet_example.json | 25 + .../DigitalTwinsEndpointPut_example.json | 46 + .../DigitalTwinsEndpointsGet_example.json | 40 + .../examples/DigitalTwinsGet_example.json | 24 + ...gitalTwinsListByResourceGroup_example.json | 40 + .../examples/DigitalTwinsList_example.json | 39 + .../DigitalTwinsOperationsList_example.json | 54 + .../examples/DigitalTwinsPatch_example.json | 32 + .../examples/DigitalTwinsPut_example.json | 44 + 13 files changed, 1605 insertions(+) create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsOperationsList_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json new file mode 100644 index 000000000000..a0d33dd14c94 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -0,0 +1,1162 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-10-31", + "title": "AzureDigitalTwinsManagementClient", + "description": "Azure Digital Twins Client for managing DigitalTwinsInstance" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}": { + "get": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Get DigitalTwinsInstances resource.", + "operationId": "DigitalTwins_Get", + "x-ms-examples": { + "Get a DigitalTwinsInstance resource": { + "$ref": "./examples/DigitalTwinsGet_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + } + ], + "responses": { + "200": { + "description": "The body contains all the non-security properties of the DigitalTwinsInstance. Security-related properties are set to null.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Create or update the metadata of a DigitalTwinsInstance. The usual pattern to modify a property is to retrieve the DigitalTwinsInstance and security metadata, and then combine them with the modified values in a new body to update the DigitalTwinsInstance.", + "operationId": "DigitalTwins_CreateOrUpdate", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Put a DigitalTwinsInstance resource": { + "$ref": "./examples/DigitalTwinsPut_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "name": "digitalTwinsCreate", + "in": "body", + "description": "The DigitalTwinsInstance and security metadata.", + "required": true, + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + } + ], + "responses": { + "200": { + "description": "This is returned as a response when the resource already exists and was updated successfully.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "201": { + "description": "Created - Put request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Update metadata of DigitalTwinsInstance.", + "operationId": "DigitalTwins_Update", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Patch a DigitalTwinsInstance resource": { + "$ref": "./examples/DigitalTwinsPatch_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "name": "digitalTwinsPatchDescription", + "in": "body", + "description": "The DigitalTwinsInstance and security metadata.", + "required": true, + "schema": { + "$ref": "#/definitions/DigitalTwinsPatchDescription" + } + } + ], + "responses": { + "200": { + "description": "This is returned as a response to the status polling request for the create or update operation. The body contains the resource representation that indicates a transitional provisioning state.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Delete a DigitalTwinsInstance.", + "operationId": "DigitalTwins_Delete", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete a DigitalTwinsInstance resource": { + "$ref": "./examples/DigitalTwinsDelete_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + } + ], + "responses": { + "200": { + "description": "Returned if the operation was canceled or failed.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "202": { + "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, + "204": { + "description": "Returned when the long running delete operation has finished, or the Digital Twins instance does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/endpoints": { + "get": { + "tags": [ + "Endpoints" + ], + "description": "Get DigitalTwinsInstance Endpoints.", + "operationId": "DigitalTwinsEndpoint_List", + "x-ms-examples": { + "Get a DigitalTwinsInstance endpoints": { + "$ref": "./examples/DigitalTwinsEndpointsGet_example.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + } + ], + "responses": { + "200": { + "description": "The body contains all the non-security properties of the DigitalTwinsInstance. Security-related properties are set to null.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResourceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/endpoints/{endpointName}": { + "get": { + "tags": [ + "Endpoints" + ], + "description": "Get DigitalTwinsInstances Endpoint.", + "operationId": "DigitalTwinsEndpoint_Get", + "x-ms-examples": { + "Get a DigitalTwinsInstance endpoint": { + "$ref": "./examples/DigitalTwinsEndpointGet_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/endpointName" + } + ], + "responses": { + "200": { + "description": "The body contains all the non-security properties of the DigitalTwinsInstance. Security-related properties are set to null.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + }, + "default": { + "description": "Default error response", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "Endpoints" + ], + "description": "Create or update DigitalTwinsInstance endpoint.", + "operationId": "DigitalTwinsEndpoint_CreateOrUpdate", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Put a DigitalTwinsInstance resource": { + "$ref": "./examples/DigitalTwinsEndpointPut_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/endpointName" + }, + { + "name": "endpointDescription", + "in": "body", + "description": "The DigitalTwinsInstance endpoint metadata and security metadata.", + "required": true, + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + } + ], + "responses": { + "200": { + "description": "This is returned as a response to the status polling request for the create or update operation. The body contains the resource representation that indicates a transitional provisioning state.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + }, + "201": { + "description": "Created - Put request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "Endpoints" + ], + "description": "Delete a DigitalTwinsInstance endpoint.", + "operationId": "DigitalTwinsEndpoint_Delete", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete a DigitalTwinsInstance endpoint": { + "$ref": "./examples/DigitalTwinsEndpointDelete_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/endpointName" + } + ], + "responses": { + "200": { + "description": "Returned if the operation was canceled or failed.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + }, + "202": { + "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } + }, + "204": { + "description": "Returned when the long running delete operation has finished, or the egress endpoint does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DigitalTwins/digitalTwinsInstances": { + "get": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Get all the DigitalTwinsInstances in a subscription.", + "operationId": "DigitalTwins_List", + "x-ms-examples": { + "Get DigitalTwinsInstance resources by subscription": { + "$ref": "./examples/DigitalTwinsList_example.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + } + ], + "responses": { + "200": { + "description": "This is a synchronous operation. The body contains a JSON-serialized array of the metadata from all the DigitalTwinsInstances in the subscription.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescriptionListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances": { + "get": { + "tags": [ + "DigitalTwinsInstance" + ], + "description": "Get all the DigitalTwinsInstances in a resource group.", + "operationId": "DigitalTwins_ListByResourceGroup", + "x-ms-examples": { + "Get DigitalTwinsInstance resources by resource group": { + "$ref": "./examples/DigitalTwinsListByResourceGroup_example.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + } + ], + "responses": { + "200": { + "description": "This is a synchronous operation. The body contains a JSON-serialized array of the metadata from all the DigitalTwinsInstances in the resource group. If more data is available, the body will contain a link to the next page of items (nextLink).", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescriptionListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.DigitalTwins/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Lists all of the available DigitalTwins service REST API operations.", + "operationId": "Operations_List", + "x-ms-examples": { + "Get available operations": { + "$ref": "./examples/DigitalTwinsOperationsList_example.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DigitalTwins/locations/{location}/checkNameAvailability": { + "post": { + "tags": [ + "CheckNameAvailability" + ], + "description": "Check if a DigitalTwinsInstance name is available.", + "operationId": "DigitalTwins_CheckNameAvailability", + "x-ms-examples": { + "Check name Availability": { + "$ref": "./examples/DigitalTwinsCheckNameAvailability_example.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/location" + }, + { + "name": "digitalTwinsInstanceCheckName", + "in": "body", + "description": "Set the name parameter in the DigitalTwinsInstanceCheckName structure to the name of the DigitalTwinsInstance to check.", + "required": true, + "schema": { + "$ref": "#/definitions/CheckNameRequest" + } + } + ], + "responses": { + "200": { + "description": "This is a synchronous operation. The body contains a JSON-serialized response that specifies whether the DigitalTwins service name is available. If the name is not available, the body contains the reason.", + "schema": { + "$ref": "#/definitions/CheckNameResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "DigitalTwinsProperties": { + "description": "The properties of a DigitalTwinsInstance.", + "type": "object", + "properties": { + "createdTime": { + "description": "Time when DigitalTwinsInstance was created.", + "readOnly": true, + "type": "string", + "format": "date-time" + }, + "lastUpdatedTime": { + "description": "Time when DigitalTwinsInstance was updated.", + "readOnly": true, + "type": "string", + "format": "date-time" + }, + "provisioningState": { + "description": "The provisioning state.", + "enum": [ + "Provisioning", + "Deleting", + "Succeeded", + "Failed", + "Canceled", + "Deleted", + "Warning", + "Suspending", + "Restoring", + "Moving" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "provisioningState", + "modelAsString": true + } + }, + "hostName": { + "description": "Api endpoint to work with DigitalTwinsInstance.", + "type": "string", + "x-nullable": true, + "readOnly": true + } + } + }, + "DigitalTwinsDescription": { + "description": "The description of the DigitalTwins service.", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "DigitalTwins instance properties.", + "$ref": "#/definitions/DigitalTwinsProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsResource" + } + ] + }, + "DigitalTwinsPatchDescription": { + "description": "The description of the DigitalTwins service.", + "type": "object", + "properties": { + "tags": { + "description": "Instance tags", + "type": "object", + "x-nullable": true, + "additionalProperties": { + "type": "string" + } + } + } + }, + "DigitalTwinsResource": { + "description": "The common properties of a DigitalTwinsInstance.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The resource identifier." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The resource name.", + "pattern": "^(?!-)[A-Za-z0-9-]{3,63}(? Date: Tue, 29 Sep 2020 07:21:13 -0700 Subject: [PATCH 02/43] Updates readme --- specification/digitaltwins/resource-manager/readme.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/readme.md b/specification/digitaltwins/resource-manager/readme.md index 9b4edd43b37d..74e5fad1a955 100644 --- a/specification/digitaltwins/resource-manager/readme.md +++ b/specification/digitaltwins/resource-manager/readme.md @@ -26,9 +26,18 @@ These are the global settings for the digitaltwins. ``` yaml openapi-type: arm -tag: package-2020-10 +tag: package-2020-12 ``` + +### Tag: package-2020-12 + +These settings apply only when `--tag=package-2020-12` is specified on the command line. + +```yaml $(tag) == 'package-2020-12' +input-file: + - Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +``` ### Tag: package-2020-10 These settings apply only when `--tag=package-2020-10` is specified on the command line. From 433dbe6e1c9bd51814a9df07aec77219a500a6b5 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 07:21:16 -0700 Subject: [PATCH 03/43] Updates API version in new specs and examples --- .../stable/2020-12-01/digitaltwins.json | 4 ++-- .../examples/DigitalTwinsCheckNameAvailability_example.json | 2 +- .../2020-12-01/examples/DigitalTwinsDelete_example.json | 2 +- .../examples/DigitalTwinsEndpointDelete_example.json | 2 +- .../2020-12-01/examples/DigitalTwinsEndpointGet_example.json | 2 +- .../2020-12-01/examples/DigitalTwinsEndpointPut_example.json | 2 +- .../2020-12-01/examples/DigitalTwinsEndpointsGet_example.json | 2 +- .../stable/2020-12-01/examples/DigitalTwinsGet_example.json | 2 +- .../examples/DigitalTwinsListByResourceGroup_example.json | 2 +- .../stable/2020-12-01/examples/DigitalTwinsList_example.json | 2 +- .../examples/DigitalTwinsOperationsList_example.json | 2 +- .../stable/2020-12-01/examples/DigitalTwinsPatch_example.json | 2 +- .../stable/2020-12-01/examples/DigitalTwinsPut_example.json | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index a0d33dd14c94..acaa40da51e3 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-10-31", + "version": "2020-12-01", "title": "AzureDigitalTwinsManagementClient", "description": "Azure Digital Twins Client for managing DigitalTwinsInstance" }, @@ -1109,7 +1109,7 @@ "api-version": { "name": "api-version", "enum": [ - "2020-10-31" + "2020-12-01" ], "in": "query", "description": "Version of the DigitalTwinsInstance Management API.", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json index 0df8dfcc15b9..b1908f74651d 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "location": "WestUS", - "api-version": "2020-10-31", + "api-version": "2020-12-01", "digitalTwinsInstanceCheckName": { "name": "myadtinstance", "type": "Microsoft.DigitalTwins/digitalTwinsInstances" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json index bc330601fb42..9b3b683790d5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json index 55c92b479c41..800b3edde6ac 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json @@ -4,7 +4,7 @@ "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", "endpointName": "myendpoint", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json index 800b1d510614..4477fcdd213c 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json @@ -4,7 +4,7 @@ "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", "endpointName": "myServiceBus", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json index 4745faf5479b..07995ea5cee4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31", + "api-version": "2020-12-01", "endpointName": "myServiceBus", "endpointDescription": { "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json index a7525b702cd6..7190b724707d 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json index 3296834f087a..1321d56c3ab5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json index e1d83d0ee610..447164dd5604 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", - "api-version": "2020-10-31", + "api-version": "2020-12-01", "resourceGroupName": "resRg" }, "responses": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json index 782077a67cea..aafea53d9c6e 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsOperationsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsOperationsList_example.json index a7b1096490d5..23edee7f70b8 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsOperationsList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsOperationsList_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-10-31" + "api-version": "2020-12-01" }, "responses": { "200": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json index 98fe3253c706..51317859a955 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31", + "api-version": "2020-12-01", "digitalTwinsPatchDescription": { "tags": { "purpose": "dev" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json index 560c09c1abcf..c7f87a3fcf20 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json @@ -3,7 +3,7 @@ "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", "resourceGroupName": "resRg", "resourceName": "myDigitalTwinsService", - "api-version": "2020-10-31", + "api-version": "2020-12-01", "digitalTwinsCreate": { "location": "WestUS" } From e54e392c006c47e5146b6237e56357abc1c68211 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 07:24:15 -0700 Subject: [PATCH 04/43] Update swagger spec --- .../stable/2020-12-01/digitaltwins.json | 625 +++++++++++++++++- ...gitalTwinsDelete_WithIdentity_example.json | 49 ++ ...nsEndpointDelete_WithIdentity_example.json | 42 ++ ...TwinsEndpointGet_WithIdentity_example.json | 26 + .../DigitalTwinsEndpointGet_example.json | 1 + ...TwinsEndpointPut_WithIdentity_example.json | 49 ++ .../DigitalTwinsEndpointPut_example.json | 3 + .../DigitalTwinsEndpointsGet_example.json | 2 + .../DigitalTwinsGet_WithIdentity_example.json | 29 + ...igitalTwinsPatch_WithIdentity_example.json | 49 ++ .../DigitalTwinsPut_WithIdentity.example.json | 55 ++ ...igitalTwinsWithPrivateLinkGet_example.json | 42 ++ ...intConnectionByConnectionName_example.json | 29 + ...ivateEndpointConnectionDelete_example.json | 18 + .../PrivateEndpointConnectionPut_example.json | 60 ++ ...rivateEndpointConnectionsList_example.json | 32 + ...PrivateLinkResourcesByGroupId_example.json | 28 + .../PrivateLinkResourcesList_example.json | 31 + 18 files changed, 1160 insertions(+), 10 deletions(-) create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index acaa40da51e3..48f7470a4c27 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -44,6 +44,9 @@ "x-ms-examples": { "Get a DigitalTwinsInstance resource": { "$ref": "./examples/DigitalTwinsGet_example.json" + }, + "Get a DigitalTwinsInstance resource with identity": { + "$ref": "./examples/DigitalTwinsGet_WithIdentity_example.json" } }, "parameters": [ @@ -85,6 +88,9 @@ "x-ms-examples": { "Put a DigitalTwinsInstance resource": { "$ref": "./examples/DigitalTwinsPut_example.json" + }, + "Put a DigitalTwinsInstance resource with identity": { + "$ref": "./examples/DigitalTwinsPut_WithIdentity_example.json" } }, "parameters": [ @@ -141,6 +147,9 @@ "x-ms-examples": { "Patch a DigitalTwinsInstance resource": { "$ref": "./examples/DigitalTwinsPatch_example.json" + }, + "Patch a DigitalTwinsInstance resource with identity": { + "$ref": "./examples/DigitalTwinsPatch_WithIdentity_example.json" } }, "parameters": [ @@ -173,6 +182,12 @@ "$ref": "#/definitions/DigitalTwinsDescription" } }, + "202": { + "description": "Accepted - Patch request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -191,6 +206,9 @@ "x-ms-examples": { "Delete a DigitalTwinsInstance resource": { "$ref": "./examples/DigitalTwinsDelete_example.json" + }, + "Delete a DigitalTwinsInstance resource with identity": { + "$ref": "./examples/DigitalTwinsDelete_WithIdentity_example.json" } }, "parameters": [ @@ -242,6 +260,9 @@ "x-ms-examples": { "Get a DigitalTwinsInstance endpoints": { "$ref": "./examples/DigitalTwinsEndpointsGet_example.json" + }, + "Get a DigitalTwinsInstance endpoints with identity": { + "$ref": "./examples/DigitalTwinsEndpointsGet_WithIdentity_example.json" } }, "x-ms-pageable": { @@ -287,6 +308,9 @@ "x-ms-examples": { "Get a DigitalTwinsInstance endpoint": { "$ref": "./examples/DigitalTwinsEndpointGet_example.json" + }, + "Get a DigitalTwinsInstance endpoint with identity": { + "$ref": "./examples/DigitalTwinsEndpointGet_WithIdentity_example.json" } }, "parameters": [ @@ -331,6 +355,9 @@ "x-ms-examples": { "Put a DigitalTwinsInstance resource": { "$ref": "./examples/DigitalTwinsEndpointPut_example.json" + }, + "Put a DigitalTwinsInstance resource with identity": { + "$ref": "./examples/DigitalTwinsEndpointPut_WithIdentity_example.json" } }, "parameters": [ @@ -390,6 +417,9 @@ "x-ms-examples": { "Delete a DigitalTwinsInstance endpoint": { "$ref": "./examples/DigitalTwinsEndpointDelete_example.json" + }, + "Delete a DigitalTwinsInstance endpoint with identity": { + "$ref": "./examples/DigitalTwinsEndpointDelete_WithIdentity_example.json" } }, "parameters": [ @@ -598,6 +628,259 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/privateLinkResources": { + "get": { + "tags": [ + "PrivateEndpoints" + ], + "description": "List private link resources for given Digital Twin.", + "operationId": "GetPrivateLinkResources", + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + } + ], + "responses": { + "200": { + "description": "The body contains the list of private link resources.", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/GroupIdInformationResponse" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/privateLinkResources/{resourceId}": { + "get": { + "tags": [ + "PrivateEndpoints" + ], + "description": "Get the specified private link resource for the given Digital Twin.", + "operationId": "GetPrivateLinkResourceByResourceId", + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/resourceId" + } + ], + "responses": { + "200": { + "description": "The body contains the specified of private link resource.", + "schema": { + "$ref": "#/definitions/GroupIdInformation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/privateEndpointConnections": { + "get": { + "tags": [ + "PrivateEndpoints" + ], + "description": "List private endpoint connection properties.", + "operationId": "GetPrivateEndpointConnections", + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + } + ], + "responses": { + "200": { + "description": "The body contains the list of private endpoint connection properties.", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DigitalTwins/digitalTwinsInstances/{resourceName}/privateEndpointConnections/{privateEndpointConnectionName}": { + "get": { + "tags": [ + "PrivateEndpoints" + ], + "description": "Get private endpoint connection properties for the given private endpoint.", + "operationId": "GetPrivateEndpointConnectionByName", + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/privateEndpointConnectionName" + } + ], + "responses": { + "200": { + "description": "The body contains the private endpoint connection properties.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "PrivateEndpoints" + ], + "description": "Delete private endpoint connection with the specified name.", + "operationId": "DeletePrivateEndpointConnection", + "x-ms-long-running-operation": true, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/privateEndpointConnectionName" + } + ], + "responses": { + "202": { + "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation." + }, + "204": { + "description": "Returned when the long running delete operation has finished, or the private endpoint does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "PrivateEndpoints" + ], + "description": "Update the status of a private endpoint connection with the given name.", + "operationId": "PutPrivateEndpointConnection", + "x-ms-long-running-operation": true, + "parameters": [ + { + "$ref": "#/parameters/api-version" + }, + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/resourceName" + }, + { + "$ref": "#/parameters/privateEndpointConnectionName" + }, + { + "name": "privateEndpointConnection", + "in": "body", + "description": "The private endpoint connection with updated properties.", + "required": true, + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + ], + "responses": { + "201": { + "description": "This is a long running operation. The operation returns a 201 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. If successful, the operation returns HTTP status code of 200 (OK).", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "200": { + "description": "This is returned as a response when the resource already exists and was updated successfully.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -622,6 +905,7 @@ "enum": [ "Provisioning", "Deleting", + "Updating", "Succeeded", "Failed", "Canceled", @@ -643,6 +927,12 @@ "type": "string", "x-nullable": true, "readOnly": true + }, + "privateEndpointConnections": { + "type": "array", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } } } }, @@ -667,7 +957,7 @@ "type": "object", "properties": { "tags": { - "description": "Instance tags", + "description": "Instance patch properties", "type": "object", "x-nullable": true, "additionalProperties": { @@ -710,6 +1000,11 @@ "type": "string" }, "description": "The resource tags." + }, + "identity": { + "description": "The managed identity for the DigitalTwinsInstance.", + "x-nullable": true, + "$ref": "#/definitions/DigitalTwinsIdentity" } }, "x-ms-azure-resource": true, @@ -717,6 +1012,35 @@ "location" ] }, + "DigitalTwinsIdentity": { + "description": "The managed identity for the DigitalTwinsInstance.", + "properties": { + "type": { + "type": "string", + "enum": [ + "None", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "DigitalTwinsIdentityType", + "modelAsString": true + }, + "description": "The type of Managed Identity used by the DigitalTwinsInstance. Only SystemAssigned is supported." + }, + "principalId": { + "readOnly": true, + "type": "string", + "x-nullable": true, + "description": "The object id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-identity-principal-id header in the PUT request if the resource has a systemAssigned(implicit) identity" + }, + "tenantId": { + "readOnly": true, + "type": "string", + "x-nullable": true, + "description": "The tenant id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT request if the resource has a systemAssigned(implicit) identity" + } + } + }, "ErrorResponse": { "description": "Error response.", "properties": { @@ -979,23 +1303,68 @@ "format": "date-time", "readOnly": true }, - "deadLetterSecret": { - "x-ms-secret": true, - "description": "Dead letter storage secret. Will be obfuscated during read.", + "authenticationType": { + "description": "Specifies the authentication type being used for connecting to the endpoint.", + "enum": [ + "KeyBased", + "IdentityBased" + ], "type": "string", - "x-nullable": true + "x-ms-enum": { + "name": "AuthenticationType", + "modelAsString": true + } } } }, + "DigitalTwinsEndpointResourcePropertiesWithKeys": { + "description": "Properties related to Digital Twins Endpoint with key-based authentication.", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeys", + "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, + { + "type": "object", + "properties": { + "deadLetterSecret": { + "x-ms-secret": true, + "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + } + } + } + ] + }, + "DigitalTwinsEndpointResourcePropertiesWithIdentity": { + "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentity", + "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, + { + "type": "object", + "properties": { + "deadLetterUri": { + "description": "Dead letter storage URL for identity-based authentication.", + "type": "string", + "x-nullable": true + } + } + } + ] + }, "ServiceBus": { - "description": "Properties related to ServiceBus.", + "description": "Properties related to ServiceBus with key-based authentication.", "required": [ "primaryConnectionString" ], "x-ms-discriminator-value": "ServiceBus", "allOf": [ { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" }, { "type": "object", @@ -1016,15 +1385,43 @@ } ] }, + "ServiceBusWithIdentity": { + "description": "Properties related to ServiceBus with identity-based authentication.", + "required": [ + "endpointUri", + "entityPath" + ], + "x-ms-discriminator-value": "ServiceBusWithIdentity", + "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" + }, + { + "type": "object", + "properties": { + "endpointUri": { + "description": "The URL of the ServiceBus namespace. It must include the protocol sb://", + "type": "string", + "x-nullable": true + }, + "entityPath": { + "description": "The ServiceBus Topic name", + "type": "string", + "x-nullable": true + } + } + } + ] + }, "EventHub": { - "description": "Properties related to EventHub.", + "description": "Properties related to EventHub with key-based authentication.", "required": [ "connectionStringPrimaryKey" ], "x-ms-discriminator-value": "EventHub", "allOf": [ { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" }, { "type": "object", @@ -1045,6 +1442,34 @@ } ] }, + "EventHubWithIdentity": { + "description": "Properties related to EventHub with identity-based authentication.", + "required": [ + "endpointUri", + "entityPath" + ], + "x-ms-discriminator-value": "EventHubWithIdentity", + "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" + }, + { + "type": "object", + "properties": { + "endpointUri": { + "description": "The URL of the EventHub namespace. It must include the protocol sb://", + "type": "string", + "x-nullable": true + }, + "entityPath": { + "description": "The EventHub name in the EventHub namespace", + "type": "string", + "x-nullable": true + } + } + } + ] + }, "EventGrid": { "description": "Properties related to EventGrid.", "required": [ @@ -1054,7 +1479,7 @@ "x-ms-discriminator-value": "EventGrid", "allOf": [ { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" }, { "type": "object", @@ -1096,6 +1521,170 @@ } } } + }, + "GroupIdInformationProperties": { + "description": "The properties for a group information object.", + "type": "object", + "properties": { + "groupId": { + "type": "string", + "description": "The group id" + }, + "requiredMembers": { + "description": "The required members for a specific group id.", + "type": "array", + "items": { + "type": "string" + } + }, + "requiredZoneNames": { + "description": "The required DNS zones for a specific group id.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "GroupIdInformation": { + "description": "The group information for creating a private endpoint on Digital Twin.", + "type": "object", + "properties": { + "properties": { + "allOf": [ + { + "$ref": "#/definitions/GroupIdInformationProperties" + } + ] + }, + "id": { + "description": "The resource identifier.", + "type": "string" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The resource name.", + "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." + } + }, + "required": [ + "properties" + ] + }, + "GroupIdInformationResponse": { + "description": "The available private link resources for a Digital Twin.", + "type": "object", + "properties": { + "value": { + "description": "The list of available private link resources for a Digital Twin.", + "type": "array", + "items": { + "$ref": "#/definitions/GroupIdInformation" + } + } + } + }, + "PrivateLinkServiceConnectionState": { + "description": "The current state of a private endpoint connection.", + "type": "object", + "properties": { + "status": { + "description": "The status of a private endpoint connection.", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ], + "type": "string", + "x-ms-enum": { + "name": "PrivateLinkServiceConnectionStatus", + "modelAsString": true + } + }, + "description": { + "type": "string", + "description": "The description for the current state of a private endpoint connection." + }, + "actionsRequired": { + "type": "string", + "description": "Actions required for a private endpoint connection." + } + }, + "required": [ + "status", + "description" + ] + }, + "PrivateEndpoint": { + "description": "The private endpoint property of a private endpoint connection.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The resource identifier." + } + } + }, + "PrivateEndpointConnectionProperties": { + "description": "The properties of a private endpoint connection.", + "type": "object", + "properties": { + "privateEndpoint": { + "allOf": [ + { + "$ref": "#/definitions/PrivateEndpoint" + } + ] + }, + "privateLinkServiceConnectionState": { + "allOf": [ + { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + } + ] + } + } + }, + "PrivateEndpointConnection": { + "description": "The private endpoint connection of a Digital Twin.", + "x-ms-azure-resource": true, + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The resource identifier." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The resource name.", + "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." + }, + "properties": { + "allOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + } + ] + } + }, + "required": [ + "properties" + ] } }, "parameters": { @@ -1157,6 +1746,22 @@ "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$", "minLength": 2, "maxLength": 49 + }, + "privateEndpointConnectionName": { + "name": "privateEndpointConnectionName", + "in": "path", + "description": "The name of the private endpoint connection.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "resourceId": { + "name": "resourceId", + "in": "path", + "description": "The name of the private link resource.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json new file mode 100644 index 000000000000..058a7bbd12fa --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "identity": { + "type": "SystemAssigned", + "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", + "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Failed", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "identity": { + "type": "SystemAssigned", + "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", + "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Deleting", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, + "204": {} + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json new file mode 100644 index 000000000000..da10f8aec676 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "endpointName": "myendpoint", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint", + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "provisioningState": "Failed", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint", + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "provisioningState": "Deleting", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + }, + "204": {} + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json new file mode 100644 index 000000000000..9a01ef1a3caf --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "endpointName": "myServiceBus", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint", + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "provisioningState": "Succeeded", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json index 4477fcdd213c..cd41d0af45ba 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json @@ -14,6 +14,7 @@ "name": "myendpoint", "properties": { "endpointType": "ServiceBus", + "authenticationType": "KeyBased", "provisioningState": "Succeeded", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json new file mode 100644 index 000000000000..f7a3729dac7b --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "endpointName": "myServiceBus", + "endpointDescription": { + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myServiceBus", + "properties": { + "endpointType": "ServiceBus", + "provisioningState": "Succeeded", + "authenticationType": "IdentityBased", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myServiceBus", + "properties": { + "endpointType": "ServiceBus", + "provisioningState": "Provisioning", + "authenticationType": "IdentityBased", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json index 07995ea5cee4..8c49845752b7 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json @@ -8,6 +8,7 @@ "endpointDescription": { "properties": { "endpointType": "ServiceBus", + "authenticationType": "KeyBased", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=", "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=" } @@ -21,6 +22,7 @@ "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", + "authenticationType": "KeyBased", "provisioningState": "Succeeded", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", @@ -35,6 +37,7 @@ "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", + "authenticationType": "KeyBased", "provisioningState": "Provisioning", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json index 7190b724707d..ec2ec423910f 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json @@ -15,6 +15,7 @@ "name": "myendpoint1", "properties": { "endpointType": "ServiceBus", + "authenticationType": "KeyBased", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", "provisioningState": "Succeeded", @@ -27,6 +28,7 @@ "name": "myendpoint2", "properties": { "endpointType": "EventHub", + "authenticationType": "KeyBased", "connectionStringPrimaryKey": "************", "connectionStringSecondaryKey": "************", "provisioningState": "Succeeded", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json new file mode 100644 index 000000000000..11a43c77f34b --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "identity": { + "type": "SystemAssigned", + "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", + "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json new file mode 100644 index 000000000000..077681f8921a --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "digitalTwinsPatchDescription": { + "identity": { + "type": "None" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Updating", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json new file mode 100644 index 000000000000..a148eb03a68e --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "digitalTwinsCreate": { + "location": "WestUS", + "identity": { + "type": "SystemAssigned" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "identity": { + "type": "SystemAssigned", + "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", + "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-11-19T12:55:05.229Z", + "provisioningState": "Provisioning", + "hostName": null + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json new file mode 100644 index 000000000000..899d493db8cd --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "privateEndpointConnections": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Please approve my request, thanks.", + "actionsRequired": "None" + } + } + } + ] + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json new file mode 100644 index 000000000000..074025c48e55 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "privateEndpointConnectionName": "myPrivateConnection" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Please approve my request, thanks.", + "actionsRequired": "None" + } + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json new file mode 100644 index 000000000000..dea8675536d1 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "privateEndpointConnectionName": "myPrivateConnection" + }, + "responses": { + "202": { + "headers": { + "Location": "https: //management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Retry-After": "17" + } + }, + "204": {} + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json new file mode 100644 index 000000000000..d174ae73455e --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "privateEndpointConnectionName": "myPrivateConnection", + "privateEndpointConnection": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Approved by johndoe@company.com." + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Approved by johndoe@company.com." + } + } + } + }, + "201": { + "headers": { + "Location": "https: //management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Retry-After": "17" + }, + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Awaiting approval." + } + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json new file mode 100644 index 000000000000..1b6dd7414e7d --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Please approve my request, thanks.", + "actionsRequired": "None" + } + } + } + ] + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json new file mode 100644 index 000000000000..10ca65216ce1 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "resourceId": "subResource", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateLinkResources", + "name": "myDigitalTwinsService", + "properties": { + "groupId": "digitalTwinsInstance", + "requiredMembers": [ + "myDigitalTwinsService" + ], + "requiredZoneNames": [ + "privatelink.api.wus2.digitaltwins.azure.net" + ] + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json new file mode 100644 index 000000000000..d99c88516966 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateLinkResources", + "name": "myDigitalTwinsService", + "properties": { + "groupId": "digitalTwinsInstance", + "requiredMembers": [ + "myDigitalTwinsService" + ], + "requiredZoneNames": [ + "privatelink.api.wus2.digitaltwins.azure.net" + ] + } + } + ] + } + } + } +} From 313db7e7857f5b663ab3dd8ec74b9a4336984da3 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 07:44:32 -0700 Subject: [PATCH 05/43] Modify SDK build configs --- .../readme.azureresourceschema.md | 12 ++++++++++++ .../resource-manager/readme.go.md | 11 +++++++++++ .../resource-manager/readme.java.md | 14 ++++++++++++++ .../resource-manager/readme.python.md | 19 +++++++++++++------ .../resource-manager/readme.ruby.md | 12 +++++++++++- 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/specification/digitaltwins/resource-manager/readme.azureresourceschema.md b/specification/digitaltwins/resource-manager/readme.azureresourceschema.md index 851a70ff5ed9..6826e9d534e0 100644 --- a/specification/digitaltwins/resource-manager/readme.azureresourceschema.md +++ b/specification/digitaltwins/resource-manager/readme.azureresourceschema.md @@ -6,6 +6,7 @@ These settings apply only when `--azureresourceschema` is specified on the comma ``` yaml $(azureresourceschema) && $(multiapi) batch: + - tag: schema-digitaltwins-2020-12-01 - tag: schema-digitaltwins-2020-10-31 - tag: schema-digitaltwins-2020-03-01-preview @@ -13,6 +14,17 @@ batch: Please also specify `--azureresourceschema-folder=`. +### Tag: schema-digitaltwins-2020-12-01 and azureresourceschema + +``` yaml $(tag) == 'schema-digitaltwins-2020-12-01' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json + +``` + ### Tag: schema-digitaltwins-2020-10-31 and azureresourceschema ``` yaml $(tag) == 'schema-digitaltwins-2020-10-31' && $(azureresourceschema) diff --git a/specification/digitaltwins/resource-manager/readme.go.md b/specification/digitaltwins/resource-manager/readme.go.md index 78e8b74c463d..99e7838eb217 100644 --- a/specification/digitaltwins/resource-manager/readme.go.md +++ b/specification/digitaltwins/resource-manager/readme.go.md @@ -13,10 +13,21 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2020-12 - tag: package-2020-10 - tag: package-2020-03-01-preview ``` +### Tag: package-2020-12 and go + +These settings apply only when `--tag=package-2020-12 --go` is specified on the command line. +Please also specify `--go-sdks-folder=digitaltwins`. + +```yaml $(tag) == 'package-2020-12' && $(go) +namespace: digitaltwins +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-12-01/$(namespace) +``` + ### Tag: package-2020-10 and go These settings apply only when `--tag=package-2020-10 --go` is specified on the command line. diff --git a/specification/digitaltwins/resource-manager/readme.java.md b/specification/digitaltwins/resource-manager/readme.java.md index e85c4d26fdcb..d2ac1dc6a6ab 100644 --- a/specification/digitaltwins/resource-manager/readme.java.md +++ b/specification/digitaltwins/resource-manager/readme.java.md @@ -16,10 +16,24 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-digitaltwins ``` yaml $(java) && $(multiapi) batch: + - tag: package-2020-12 - tag: package-2020-10 - tag: package-2020-03-01-preview ``` +### Tag: package-2020-12 and java + +These settings apply only when `--tag=package-2020-12 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2020-12' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.digitaltwins.v2020_12_01 + output-folder: $(azure-libraries-for-java-folder)/sdk/digitaltwins/mgmt-v2020_12_01 +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2020-10 and java These settings apply only when `--tag=package-2020-10 --java` is specified on the command line. diff --git a/specification/digitaltwins/resource-manager/readme.python.md b/specification/digitaltwins/resource-manager/readme.python.md index b6ac8b85de37..e06eba2efdbf 100644 --- a/specification/digitaltwins/resource-manager/readme.python.md +++ b/specification/digitaltwins/resource-manager/readme.python.md @@ -11,12 +11,7 @@ python: namespace: azure.mgmt.digitaltwins package-name: azure-mgmt-digitaltwins clear-output-folder: true -``` - -```yaml $(python) -python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/digitaltwins/azure-mgmt-digitaltwins/azure/mgmt/digitaltwins ``` ### Python multi-api @@ -25,10 +20,22 @@ Generate all API versions currently shipped for this package ```yaml $(python) && $(multiapi) batch: + - tag: package-2020-12 - tag: package-2020-10 - tag: package-2020-03-01-preview ``` +### Tag: package-2020-12 and python + +These settings apply only when `--tag=package-2020-12 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-10' && $(python) +python: + namespace: azure.mgmt.digitaltwins.v2020_12_01 + output-folder: $(python-sdks-folder)/digitaltwins/azure-mgmt-digitaltwins/azure/mgmt/digitaltwins/v2020_12_01 +``` + ### Tag: package-2020-10 and python These settings apply only when `--tag=package-2020-10 --python` is specified on the command line. @@ -37,7 +44,7 @@ Please also specify `--python-sdks-folder=`. + +```yaml $(tag) == 'package-2020-12' && $(ruby) +namespace: Microsoft.DigitalTwins +output-folder: $(ruby-sdks-folder)/digitaltwins +``` + ### Tag: package-2020-10 and ruby These settings apply only when `--tag=package-2020-10 --ruby` is specified on the command line. From 16b23cd12accc5deac5306ded307870043590d06 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 08:22:20 -0700 Subject: [PATCH 06/43] Fix example filename reference --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 48f7470a4c27..3ea124a59788 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -262,7 +262,7 @@ "$ref": "./examples/DigitalTwinsEndpointsGet_example.json" }, "Get a DigitalTwinsInstance endpoints with identity": { - "$ref": "./examples/DigitalTwinsEndpointsGet_WithIdentity_example.json" + "$ref": "./examples/DigitalTwinsEndpointGet_WithIdentity_example.json" } }, "x-ms-pageable": { From 8d7e4f67d2fa01db89947af5b055c509d7568b03 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 08:32:47 -0700 Subject: [PATCH 07/43] Rename example file --- ...ity.example.json => DigitalTwinsPut_WithIdentity_example.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/{DigitalTwinsPut_WithIdentity.example.json => DigitalTwinsPut_WithIdentity_example.json} (100%) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json similarity index 100% rename from specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity.example.json rename to specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json From ca2997d06373811a8c92d62fe8e48fefe3110095 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 09:00:21 -0700 Subject: [PATCH 08/43] Fix validation errors --- .../stable/2020-12-01/digitaltwins.json | 7 +++- ...winsEndpointsGet_WithIdentity_example.json | 42 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 3ea124a59788..34fc60dbeea6 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -262,7 +262,7 @@ "$ref": "./examples/DigitalTwinsEndpointsGet_example.json" }, "Get a DigitalTwinsInstance endpoints with identity": { - "$ref": "./examples/DigitalTwinsEndpointGet_WithIdentity_example.json" + "$ref": "./examples/DigitalTwinsEndpointsGet_WithIdentity_example.json" } }, "x-ms-pageable": { @@ -963,6 +963,11 @@ "additionalProperties": { "type": "string" } + }, + "identity": { + "description": "The managed identity for the DigitalTwinsInstance.", + "x-nullable": true, + "$ref": "#/definitions/DigitalTwinsIdentity" } } }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json new file mode 100644 index 000000000000..ab8013148603 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint1", + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "provisioningState": "Succeeded", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + }, + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint2", + "properties": { + "endpointType": "EventHub", + "authenticationType": "KeyBased", + "connectionStringPrimaryKey": "************", + "connectionStringSecondaryKey": "************", + "provisioningState": "Succeeded", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + ] + } + } + } +} From 56402dcab87991e6ca1a7c9616809c67ab1f63cb Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 12:10:25 -0700 Subject: [PATCH 09/43] Updated examples --- .../stable/2020-12-01/digitaltwins.json | 10 ++-------- ...gitalTwinsDelete_WithIdentity_example.json | 20 +------------------ .../examples/DigitalTwinsDelete_example.json | 15 +------------- ...nsEndpointDelete_WithIdentity_example.json | 16 +-------------- .../DigitalTwinsEndpointDelete_example.json | 15 +------------- .../examples/DigitalTwinsPatch_example.json | 17 ++++++++++++++++ ...ivateEndpointConnectionDelete_example.json | 2 +- .../PrivateEndpointConnectionPut_example.json | 2 +- 8 files changed, 25 insertions(+), 72 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 34fc60dbeea6..fcbdb0b784a9 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -233,10 +233,7 @@ } }, "202": { - "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", - "schema": { - "$ref": "#/definitions/DigitalTwinsDescription" - } + "description": "Accepted - Delete request accepted; the operation will complete asynchronously." }, "204": { "description": "Returned when the long running delete operation has finished, or the Digital Twins instance does not exist." @@ -447,10 +444,7 @@ } }, "202": { - "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", - "schema": { - "$ref": "#/definitions/DigitalTwinsEndpointResource" - } + "description": "Accepted - Delete request accepted; the operation will complete asynchronously." }, "204": { "description": "Returned when the long running delete operation has finished, or the egress endpoint does not exist." diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json index 058a7bbd12fa..49083aedb489 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json @@ -25,25 +25,7 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances", - "name": "myDigitalTwinsService", - "identity": { - "type": "SystemAssigned", - "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", - "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" - }, - "properties": { - "createdTime": "2019-11-19T12:55:05.229Z", - "lastUpdatedTime": "2019-12-06T12:21:58.610Z", - "provisioningState": "Deleting", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" - } - } - }, + "202": {}, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json index 9b3b683790d5..fcf9b8c8cec5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json @@ -20,20 +20,7 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances", - "name": "myDigitalTwinsService", - "properties": { - "createdTime": "2019-11-19T12:55:05.229Z", - "lastUpdatedTime": "2019-12-06T12:21:58.610Z", - "provisioningState": "Deleting", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" - } - } - }, + "202": {}, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json index da10f8aec676..4acd3ee2e162 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -22,21 +22,7 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint", - "properties": { - "endpointType": "ServiceBus", - "authenticationType": "IdentityBased", - "provisioningState": "Deleting", - "endpointUri": "sb://mysb.servicebus.windows.net/", - "entityPath": "mysbtopic", - "createdTime": "2019-11-19T01:10:34.350Z" - } - } - }, + "202": {}, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json index 800b3edde6ac..46832f32e9ae 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json @@ -21,20 +21,7 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint", - "properties": { - "endpointType": "ServiceBus", - "provisioningState": "Deleting", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "createdTime": "2019-11-19T01:10:34.350Z" - } - } - }, + "202": {}, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json index 51317859a955..09632409420e 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json @@ -27,6 +27,23 @@ "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" } } + }, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Updating", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json index dea8675536d1..13ee3947edfa 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json @@ -9,7 +9,7 @@ "responses": { "202": { "headers": { - "Location": "https: //management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", "Retry-After": "17" } }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json index d174ae73455e..763d4e7e1175 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json @@ -36,7 +36,7 @@ }, "201": { "headers": { - "Location": "https: //management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", "Retry-After": "17" }, "body": { From 4fbe23e8e1b1d84bcbb892d8ebef98e22c87e189 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 29 Sep 2020 14:31:14 -0700 Subject: [PATCH 10/43] Revert change to behavior of async op --- .../stable/2020-12-01/digitaltwins.json | 10 ++++++++-- ...gitalTwinsDelete_WithIdentity_example.json | 20 ++++++++++++++++++- .../examples/DigitalTwinsDelete_example.json | 15 +++++++++++++- ...nsEndpointDelete_WithIdentity_example.json | 16 ++++++++++++++- .../DigitalTwinsEndpointDelete_example.json | 15 +++++++++++++- 5 files changed, 70 insertions(+), 6 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index fcbdb0b784a9..34fc60dbeea6 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -233,7 +233,10 @@ } }, "202": { - "description": "Accepted - Delete request accepted; the operation will complete asynchronously." + "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsDescription" + } }, "204": { "description": "Returned when the long running delete operation has finished, or the Digital Twins instance does not exist." @@ -444,7 +447,10 @@ } }, "202": { - "description": "Accepted - Delete request accepted; the operation will complete asynchronously." + "description": "Accepted - Delete request accepted; the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DigitalTwinsEndpointResource" + } }, "204": { "description": "Returned when the long running delete operation has finished, or the egress endpoint does not exist." diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json index 49083aedb489..058a7bbd12fa 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json @@ -25,7 +25,25 @@ } } }, - "202": {}, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "identity": { + "type": "SystemAssigned", + "principalId": "544215a9-21d8-4fb5-8094-8efbcc311dd0", + "tenantId": "544215a9-21d8-4fb5-8094-8efbcc311dd0" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Deleting", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json index fcf9b8c8cec5..9b3b683790d5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json @@ -20,7 +20,20 @@ } } }, - "202": {}, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "location": "westus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Deleting", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + } + } + }, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json index 4acd3ee2e162..da10f8aec676 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -22,7 +22,21 @@ } } }, - "202": {}, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint", + "properties": { + "endpointType": "ServiceBus", + "authenticationType": "IdentityBased", + "provisioningState": "Deleting", + "endpointUri": "sb://mysb.servicebus.windows.net/", + "entityPath": "mysbtopic", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + }, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json index 46832f32e9ae..800b3edde6ac 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json @@ -21,7 +21,20 @@ } } }, - "202": {}, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", + "name": "myendpoint", + "properties": { + "endpointType": "ServiceBus", + "provisioningState": "Deleting", + "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "createdTime": "2019-11-19T01:10:34.350Z" + } + } + }, "204": {} } } From 6c558504ad557c8b7a935836e01e0d3fefd9f3a1 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Wed, 30 Sep 2020 07:34:38 -0700 Subject: [PATCH 11/43] Modify discriminators --- .../stable/2020-12-01/digitaltwins.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 34fc60dbeea6..0cbe6145cff9 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1324,7 +1324,7 @@ }, "DigitalTwinsEndpointResourcePropertiesWithKeys": { "description": "Properties related to Digital Twins Endpoint with key-based authentication.", - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeys", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" @@ -1344,7 +1344,7 @@ }, "DigitalTwinsEndpointResourcePropertiesWithIdentity": { "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentity", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" @@ -1366,7 +1366,7 @@ "required": [ "primaryConnectionString" ], - "x-ms-discriminator-value": "ServiceBus", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" @@ -1396,7 +1396,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "ServiceBusWithIdentity", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentityType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" @@ -1423,7 +1423,7 @@ "required": [ "connectionStringPrimaryKey" ], - "x-ms-discriminator-value": "EventHub", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" @@ -1453,7 +1453,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "EventHubWithIdentity", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentityType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" @@ -1481,7 +1481,7 @@ "TopicEndpoint", "accessKey1" ], - "x-ms-discriminator-value": "EventGrid", + "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" From a00e5e7abd413c4d7bc7f497c056ab5f8c33c4df Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Wed, 30 Sep 2020 08:22:59 -0700 Subject: [PATCH 12/43] Enable two discriminators --- .../stable/2020-12-01/digitaltwins.json | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 0cbe6145cff9..3381bdd9597b 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1260,24 +1260,11 @@ }, "DigitalTwinsEndpointResourceProperties": { "description": "Properties related to Digital Twins Endpoint", - "discriminator": "endpointType", + "discriminator": "authenticationType", "required": [ - "endpointType" + "authenticationType" ], "properties": { - "endpointType": { - "description": "The type of Digital Twins endpoint", - "enum": [ - "EventHub", - "EventGrid", - "ServiceBus" - ], - "x-ms-enum": { - "name": "endpointType", - "modelAsString": true - }, - "type": "string" - }, "provisioningState": { "description": "The provisioning state.", "enum": [ @@ -1324,7 +1311,11 @@ }, "DigitalTwinsEndpointResourcePropertiesWithKeys": { "description": "Properties related to Digital Twins Endpoint with key-based authentication.", - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesType", + "x-ms-discriminator-value": "KeyBased", + "discriminator": "endpointType", + "required": [ + "endpointType" + ], "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" @@ -1332,6 +1323,19 @@ { "type": "object", "properties": { + "endpointType": { + "description": "The type of Digital Twins endpoint", + "enum": [ + "EventHub", + "EventGrid", + "ServiceBus" + ], + "x-ms-enum": { + "name": "endpointType", + "modelAsString": true + }, + "type": "string" + }, "deadLetterSecret": { "x-ms-secret": true, "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", @@ -1344,7 +1348,11 @@ }, "DigitalTwinsEndpointResourcePropertiesWithIdentity": { "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesType", + "x-ms-discriminator-value": "IdentityBased", + "discriminator": "endpointType", + "required": [ + "endpointType" + ], "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" @@ -1352,6 +1360,18 @@ { "type": "object", "properties": { + "endpointType": { + "description": "The type of Digital Twins endpoint", + "enum": [ + "EventHub", + "ServiceBus" + ], + "x-ms-enum": { + "name": "EndpointTypeWithIdentity", + "modelAsString": true + }, + "type": "string" + }, "deadLetterUri": { "description": "Dead letter storage URL for identity-based authentication.", "type": "string", @@ -1366,7 +1386,7 @@ "required": [ "primaryConnectionString" ], - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", + "x-ms-discriminator-value": "ServiceBus", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" @@ -1396,7 +1416,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentityType", + "x-ms-discriminator-value": "ServiceBus", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" @@ -1423,7 +1443,7 @@ "required": [ "connectionStringPrimaryKey" ], - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", + "x-ms-discriminator-value": "EventHub", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" @@ -1453,7 +1473,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithIdentityType", + "x-ms-discriminator-value": "EventHub", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" @@ -1481,7 +1501,7 @@ "TopicEndpoint", "accessKey1" ], - "x-ms-discriminator-value": "DigitalTwinsEndpointResourcePropertiesWithKeysType", + "x-ms-discriminator-value": "EventGrid", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" From 0b941df331ef301574249e623a45064c7240695f Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Wed, 30 Sep 2020 09:53:03 -0700 Subject: [PATCH 13/43] Fix delete endpoint example --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 2 +- .../2020-12-01/examples/DigitalTwinsEndpointDelete_example.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 3381bdd9597b..88ffb676021e 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1331,7 +1331,7 @@ "ServiceBus" ], "x-ms-enum": { - "name": "endpointType", + "name": "EndpointType", "modelAsString": true }, "type": "string" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json index 800b3edde6ac..b8e734f02704 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json @@ -13,6 +13,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { + "authenticationType": "KeyBased", "endpointType": "ServiceBus", "provisioningState": "Failed", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", @@ -27,6 +28,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { + "authenticationType": "KeyBased", "endpointType": "ServiceBus", "provisioningState": "Deleting", "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", From fe04d04d20ed56504db303f33ae832937c899cfe Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Wed, 30 Sep 2020 10:32:52 -0700 Subject: [PATCH 14/43] Attempted fix with discriminator --- .../stable/2020-12-01/digitaltwins.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 88ffb676021e..d0b70322e2d6 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1363,8 +1363,8 @@ "endpointType": { "description": "The type of Digital Twins endpoint", "enum": [ - "EventHub", - "ServiceBus" + "EventHubWithIdentity", + "ServiceBusWithIdentity" ], "x-ms-enum": { "name": "EndpointTypeWithIdentity", @@ -1416,7 +1416,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "ServiceBus", + "x-ms-discriminator-value": "ServiceBusWithIdentity", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" @@ -1473,7 +1473,7 @@ "endpointUri", "entityPath" ], - "x-ms-discriminator-value": "EventHub", + "x-ms-discriminator-value": "EventHubWithIdentity", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" From a05d78caa73e6be649befa42b447155716e9ffbe Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 1 Oct 2020 06:20:35 -0700 Subject: [PATCH 15/43] Added westus2, change discriminator enum type name --- .../stable/2020-12-01/digitaltwins.json | 2 +- .../examples/DigitalTwinsCheckNameAvailability_example.json | 2 +- .../examples/DigitalTwinsDelete_WithIdentity_example.json | 4 ++-- .../2020-12-01/examples/DigitalTwinsDelete_example.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index d0b70322e2d6..87dc6ad071f4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1331,7 +1331,7 @@ "ServiceBus" ], "x-ms-enum": { - "name": "EndpointType", + "name": "endpointType", "modelAsString": true }, "type": "string" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json index b1908f74651d..390398ce2d27 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsCheckNameAvailability_example.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", - "location": "WestUS", + "location": "WestUS2", "api-version": "2020-12-01", "digitalTwinsInstanceCheckName": { "name": "myadtinstance", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json index 058a7bbd12fa..1102b0a235e4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json @@ -9,7 +9,7 @@ "200": { "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "identity": { @@ -28,7 +28,7 @@ "202": { "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "identity": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json index 9b3b683790d5..f84f638a7c70 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json @@ -9,7 +9,7 @@ "200": { "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { @@ -23,7 +23,7 @@ "202": { "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { From abfc788d9d9738000285c4c545fad6b4169a321a Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 1 Oct 2020 06:41:28 -0700 Subject: [PATCH 16/43] Decouple allOf from properties --- .../stable/2020-12-01/digitaltwins.json | 248 +++++++++--------- 1 file changed, 117 insertions(+), 131 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 87dc6ad071f4..5d32f0635252 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1316,35 +1316,33 @@ "required": [ "endpointType" ], + "type": "object", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + } + ], + "properties": { + "endpointType": { + "description": "The type of Digital Twins endpoint", + "enum": [ + "EventHub", + "EventGrid", + "ServiceBus" + ], + "x-ms-enum": { + "name": "endpointType", + "modelAsString": true + }, + "type": "string" }, - { - "type": "object", - "properties": { - "endpointType": { - "description": "The type of Digital Twins endpoint", - "enum": [ - "EventHub", - "EventGrid", - "ServiceBus" - ], - "x-ms-enum": { - "name": "endpointType", - "modelAsString": true - }, - "type": "string" - }, - "deadLetterSecret": { - "x-ms-secret": true, - "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } + "deadLetterSecret": { + "x-ms-secret": true, + "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true } - ] + } }, "DigitalTwinsEndpointResourcePropertiesWithIdentity": { "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", @@ -1353,62 +1351,58 @@ "required": [ "endpointType" ], + "type": "object", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + } + ], + "properties": { + "endpointType": { + "description": "The type of Digital Twins endpoint", + "enum": [ + "EventHubWithIdentity", + "ServiceBusWithIdentity" + ], + "x-ms-enum": { + "name": "EndpointTypeWithIdentity", + "modelAsString": true + }, + "type": "string" }, - { - "type": "object", - "properties": { - "endpointType": { - "description": "The type of Digital Twins endpoint", - "enum": [ - "EventHubWithIdentity", - "ServiceBusWithIdentity" - ], - "x-ms-enum": { - "name": "EndpointTypeWithIdentity", - "modelAsString": true - }, - "type": "string" - }, - "deadLetterUri": { - "description": "Dead letter storage URL for identity-based authentication.", - "type": "string", - "x-nullable": true - } - } + "deadLetterUri": { + "description": "Dead letter storage URL for identity-based authentication.", + "type": "string", + "x-nullable": true } - ] + } }, "ServiceBus": { "description": "Properties related to ServiceBus with key-based authentication.", "required": [ "primaryConnectionString" ], + "type": "object", "x-ms-discriminator-value": "ServiceBus", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" + } + ], + "properties": { + "primaryConnectionString": { + "x-ms-secret": true, + "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", + "type": "string", + "x-nullable": true }, - { - "type": "object", - "properties": { - "primaryConnectionString": { - "x-ms-secret": true, - "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "secondaryConnectionString": { - "x-ms-secret": true, - "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } + "secondaryConnectionString": { + "x-ms-secret": true, + "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", + "type": "string", + "x-nullable": true } - ] + } }, "ServiceBusWithIdentity": { "description": "Properties related to ServiceBus with identity-based authentication.", @@ -1416,56 +1410,52 @@ "endpointUri", "entityPath" ], + "type": "object", "x-ms-discriminator-value": "ServiceBusWithIdentity", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" + } + ], + "properties": { + "endpointUri": { + "description": "The URL of the ServiceBus namespace. It must include the protocol sb://", + "type": "string", + "x-nullable": true }, - { - "type": "object", - "properties": { - "endpointUri": { - "description": "The URL of the ServiceBus namespace. It must include the protocol sb://", - "type": "string", - "x-nullable": true - }, - "entityPath": { - "description": "The ServiceBus Topic name", - "type": "string", - "x-nullable": true - } - } + "entityPath": { + "description": "The ServiceBus Topic name", + "type": "string", + "x-nullable": true } - ] + } }, "EventHub": { "description": "Properties related to EventHub with key-based authentication.", "required": [ "connectionStringPrimaryKey" ], + "type": "object", "x-ms-discriminator-value": "EventHub", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" + } + ], + "properties": { + "connectionStringPrimaryKey": { + "x-ms-secret": true, + "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", + "type": "string", + "x-nullable": true }, - { - "type": "object", - "properties": { - "connectionStringPrimaryKey": { - "x-ms-secret": true, - "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "connectionStringSecondaryKey": { - "x-ms-secret": true, - "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } + "connectionStringSecondaryKey": { + "x-ms-secret": true, + "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", + "type": "string", + "x-nullable": true } - ] + } }, "EventHubWithIdentity": { "description": "Properties related to EventHub with identity-based authentication.", @@ -1473,27 +1463,25 @@ "endpointUri", "entityPath" ], + "type": "object", "x-ms-discriminator-value": "EventHubWithIdentity", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" + } + ], + "properties": { + "endpointUri": { + "description": "The URL of the EventHub namespace. It must include the protocol sb://", + "type": "string", + "x-nullable": true }, - { - "type": "object", - "properties": { - "endpointUri": { - "description": "The URL of the EventHub namespace. It must include the protocol sb://", - "type": "string", - "x-nullable": true - }, - "entityPath": { - "description": "The EventHub name in the EventHub namespace", - "type": "string", - "x-nullable": true - } - } + "entityPath": { + "description": "The EventHub name in the EventHub namespace", + "type": "string", + "x-nullable": true } - ] + } }, "EventGrid": { "description": "Properties related to EventGrid.", @@ -1501,33 +1489,31 @@ "TopicEndpoint", "accessKey1" ], + "type": "object", "x-ms-discriminator-value": "EventGrid", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" + } + ], + "properties": { + "TopicEndpoint": { + "description": "EventGrid Topic Endpoint", + "type": "string" }, - { - "type": "object", - "properties": { - "TopicEndpoint": { - "description": "EventGrid Topic Endpoint", - "type": "string" - }, - "accessKey1": { - "x-ms-secret": true, - "description": "EventGrid secondary accesskey. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "accessKey2": { - "x-ms-secret": true, - "description": "EventGrid secondary accesskey. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } + "accessKey1": { + "x-ms-secret": true, + "description": "EventGrid secondary accesskey. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "accessKey2": { + "x-ms-secret": true, + "description": "EventGrid secondary accesskey. Will be obfuscated during read.", + "type": "string", + "x-nullable": true } - ] + } }, "DigitalTwinsEndpointResourceListResult": { "description": "A list of DigitalTwinsInstance Endpoints with a next link.", From ab777fb9de0f705a44d33a893e9033b66cb9de7c Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 1 Oct 2020 11:49:45 -0700 Subject: [PATCH 17/43] Bugfixes --- .../stable/2020-12-01/digitaltwins.json | 76 ++++++++----------- ...nsEndpointDelete_WithIdentity_example.json | 6 +- ...TwinsEndpointGet_WithIdentity_example.json | 2 +- ...TwinsEndpointPut_WithIdentity_example.json | 8 +- ...winsEndpointsGet_WithIdentity_example.json | 2 +- 5 files changed, 41 insertions(+), 53 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 5d32f0635252..251487ae1394 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1260,11 +1260,26 @@ }, "DigitalTwinsEndpointResourceProperties": { "description": "Properties related to Digital Twins Endpoint", - "discriminator": "authenticationType", + "discriminator": "endpointType", "required": [ - "authenticationType" + "endpointType" ], "properties": { + "endpointType": { + "description": "The type of Digital Twins endpoint", + "enum": [ + "EventHub", + "EventGrid", + "ServiceBus", + "ServiceBusWithIdentity", + "EventHubWithIdentity" + ], + "x-ms-enum": { + "name": "endpointType", + "modelAsString": true + }, + "type": "string" + }, "provisioningState": { "description": "The provisioning state.", "enum": [ @@ -1311,31 +1326,12 @@ }, "DigitalTwinsEndpointResourcePropertiesWithKeys": { "description": "Properties related to Digital Twins Endpoint with key-based authentication.", - "x-ms-discriminator-value": "KeyBased", - "discriminator": "endpointType", - "required": [ - "endpointType" - ], - "type": "object", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" } ], "properties": { - "endpointType": { - "description": "The type of Digital Twins endpoint", - "enum": [ - "EventHub", - "EventGrid", - "ServiceBus" - ], - "x-ms-enum": { - "name": "endpointType", - "modelAsString": true - }, - "type": "string" - }, "deadLetterSecret": { "x-ms-secret": true, "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", @@ -1346,30 +1342,12 @@ }, "DigitalTwinsEndpointResourcePropertiesWithIdentity": { "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", - "x-ms-discriminator-value": "IdentityBased", - "discriminator": "endpointType", - "required": [ - "endpointType" - ], - "type": "object", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" } ], "properties": { - "endpointType": { - "description": "The type of Digital Twins endpoint", - "enum": [ - "EventHubWithIdentity", - "ServiceBusWithIdentity" - ], - "x-ms-enum": { - "name": "EndpointTypeWithIdentity", - "modelAsString": true - }, - "type": "string" - }, "deadLetterUri": { "description": "Dead letter storage URL for identity-based authentication.", "type": "string", @@ -1382,9 +1360,11 @@ "required": [ "primaryConnectionString" ], - "type": "object", "x-ms-discriminator-value": "ServiceBus", "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" } @@ -1410,9 +1390,11 @@ "endpointUri", "entityPath" ], - "type": "object", "x-ms-discriminator-value": "ServiceBusWithIdentity", "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" } @@ -1435,9 +1417,11 @@ "required": [ "connectionStringPrimaryKey" ], - "type": "object", "x-ms-discriminator-value": "EventHub", "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" } @@ -1463,9 +1447,11 @@ "endpointUri", "entityPath" ], - "type": "object", "x-ms-discriminator-value": "EventHubWithIdentity", "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" } @@ -1489,9 +1475,11 @@ "TopicEndpoint", "accessKey1" ], - "type": "object", "x-ms-discriminator-value": "EventGrid", "allOf": [ + { + "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" + }, { "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json index da10f8aec676..a598f86c4cbc 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -13,8 +13,8 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { - "endpointType": "ServiceBus", - "authenticationType": "IdentityBased", + "endpointType": "ServiceBusWithIdentity", + "authenticationType": "KeyBased", "provisioningState": "Failed", "endpointUri": "sb://mysb.servicebus.windows.net/", "entityPath": "mysbtopic", @@ -28,7 +28,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { - "endpointType": "ServiceBus", + "endpointType": "ServiceBusWithIdentity", "authenticationType": "IdentityBased", "provisioningState": "Deleting", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json index 9a01ef1a3caf..f6ec199fad12 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json @@ -13,7 +13,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { - "endpointType": "ServiceBus", + "endpointType": "ServiceBusWithIdentity", "authenticationType": "IdentityBased", "provisioningState": "Succeeded", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json index f7a3729dac7b..afa4466e12e9 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json @@ -7,7 +7,7 @@ "endpointName": "myServiceBus", "endpointDescription": { "properties": { - "endpointType": "ServiceBus", + "endpointType": "ServiceBusWithIdentity", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", "entityPath": "mysbtopic" @@ -21,8 +21,8 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { - "endpointType": "ServiceBus", - "provisioningState": "Succeeded", + "endpointType": "ServiceBusWithIdentity", + "provisioningState": "Provisioning", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", "entityPath": "mysbtopic", @@ -36,7 +36,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { - "endpointType": "ServiceBus", + "endpointType": "ServiceBusWithIdentity", "provisioningState": "Provisioning", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json index ab8013148603..d44d3e3ba4d5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json @@ -14,7 +14,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint1", "properties": { - "endpointType": "ServiceBus", + "endpointType": "ServiceBusWithIdentity", "authenticationType": "IdentityBased", "provisioningState": "Succeeded", "endpointUri": "sb://mysb.servicebus.windows.net/", From 4074d14c4d9b16913959a8fad26f2a1134eccf7a Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 6 Oct 2020 15:11:47 -0700 Subject: [PATCH 18/43] Modify response to fix validation errors --- .../stable/2020-12-01/digitaltwins.json | 218 +++++++----------- 1 file changed, 77 insertions(+), 141 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 251487ae1394..26c7a69d1cd5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1270,9 +1270,7 @@ "enum": [ "EventHub", "EventGrid", - "ServiceBus", - "ServiceBusWithIdentity", - "EventHubWithIdentity" + "ServiceBus" ], "x-ms-enum": { "name": "endpointType", @@ -1321,33 +1319,13 @@ "name": "AuthenticationType", "modelAsString": true } - } - } - }, - "DigitalTwinsEndpointResourcePropertiesWithKeys": { - "description": "Properties related to Digital Twins Endpoint with key-based authentication.", - "allOf": [ - { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" - } - ], - "properties": { + }, "deadLetterSecret": { "x-ms-secret": true, "description": "Dead letter storage secret for key-based authentication. Will be obfuscated during read.", "type": "string", "x-nullable": true - } - } - }, - "DigitalTwinsEndpointResourcePropertiesWithIdentity": { - "description": "Properties related to Digital Twins Endpoint with identity-based authentication.", - "allOf": [ - { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" - } - ], - "properties": { + }, "deadLetterUri": { "description": "Dead letter storage URL for identity-based authentication.", "type": "string", @@ -1356,118 +1334,76 @@ } }, "ServiceBus": { - "description": "Properties related to ServiceBus with key-based authentication.", - "required": [ - "primaryConnectionString" - ], + "description": "Properties related to ServiceBus.", "x-ms-discriminator-value": "ServiceBus", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" }, { - "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" - } - ], - "properties": { - "primaryConnectionString": { - "x-ms-secret": true, - "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "secondaryConnectionString": { - "x-ms-secret": true, - "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } - }, - "ServiceBusWithIdentity": { - "description": "Properties related to ServiceBus with identity-based authentication.", - "required": [ - "endpointUri", - "entityPath" - ], - "x-ms-discriminator-value": "ServiceBusWithIdentity", - "allOf": [ - { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" - }, - { - "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" - } - ], - "properties": { - "endpointUri": { - "description": "The URL of the ServiceBus namespace. It must include the protocol sb://", - "type": "string", - "x-nullable": true - }, - "entityPath": { - "description": "The ServiceBus Topic name", - "type": "string", - "x-nullable": true + "type": "object", + "properties": { + "primaryConnectionString": { + "x-ms-secret": true, + "description": "PrimaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "secondaryConnectionString": { + "x-ms-secret": true, + "description": "SecondaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "endpointUri": { + "description": "The URL of the ServiceBus namespace for identity-based authentication. It must include the protocol sb://", + "type": "string", + "x-nullable": true + }, + "entityPath": { + "description": "The ServiceBus Topic name for identity-based authentication", + "type": "string", + "x-nullable": true + } + } } - } + ] }, "EventHub": { - "description": "Properties related to EventHub with key-based authentication.", - "required": [ - "connectionStringPrimaryKey" - ], + "description": "Properties related to EventHub.", "x-ms-discriminator-value": "EventHub", "allOf": [ { "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" }, { - "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" - } - ], - "properties": { - "connectionStringPrimaryKey": { - "x-ms-secret": true, - "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "connectionStringSecondaryKey": { - "x-ms-secret": true, - "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - } - } - }, - "EventHubWithIdentity": { - "description": "Properties related to EventHub with identity-based authentication.", - "required": [ - "endpointUri", - "entityPath" - ], - "x-ms-discriminator-value": "EventHubWithIdentity", - "allOf": [ - { - "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" - }, - { - "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithIdentity" - } - ], - "properties": { - "endpointUri": { - "description": "The URL of the EventHub namespace. It must include the protocol sb://", - "type": "string", - "x-nullable": true - }, - "entityPath": { - "description": "The EventHub name in the EventHub namespace", - "type": "string", - "x-nullable": true + "type": "object", + "properties": { + "connectionStringPrimaryKey": { + "x-ms-secret": true, + "description": "PrimaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "connectionStringSecondaryKey": { + "x-ms-secret": true, + "description": "SecondaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "endpointUri": { + "description": "The URL of the EventHub namespace for identity-based authentication. It must include the protocol sb://", + "type": "string", + "x-nullable": true + }, + "entityPath": { + "description": "The EventHub name in the EventHub namespace for identity-based authentication.", + "type": "string", + "x-nullable": true + } + } } - } + ] }, "EventGrid": { "description": "Properties related to EventGrid.", @@ -1481,27 +1417,27 @@ "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" }, { - "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesWithKeys" - } - ], - "properties": { - "TopicEndpoint": { - "description": "EventGrid Topic Endpoint", - "type": "string" - }, - "accessKey1": { - "x-ms-secret": true, - "description": "EventGrid secondary accesskey. Will be obfuscated during read.", - "type": "string", - "x-nullable": true - }, - "accessKey2": { - "x-ms-secret": true, - "description": "EventGrid secondary accesskey. Will be obfuscated during read.", - "type": "string", - "x-nullable": true + "type": "object", + "properties": { + "TopicEndpoint": { + "description": "EventGrid Topic Endpoint", + "type": "string" + }, + "accessKey1": { + "x-ms-secret": true, + "description": "EventGrid secondary accesskey. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + }, + "accessKey2": { + "x-ms-secret": true, + "description": "EventGrid secondary accesskey. Will be obfuscated during read.", + "type": "string", + "x-nullable": true + } + } } - } + ] }, "DigitalTwinsEndpointResourceListResult": { "description": "A list of DigitalTwinsInstance Endpoints with a next link.", From 8e82828371e2a4c68d9e2f7b271ec7a08fc8500b Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 6 Oct 2020 15:23:54 -0700 Subject: [PATCH 19/43] Fix examples --- ...igitalTwinsEndpointDelete_WithIdentity_example.json | 4 ++-- .../DigitalTwinsEndpointGet_WithIdentity_example.json | 6 +++--- .../examples/DigitalTwinsEndpointGet_example.json | 2 +- .../DigitalTwinsEndpointPut_WithIdentity_example.json | 6 +++--- .../DigitalTwinsEndpointsGet_WithIdentity_example.json | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json index a598f86c4cbc..77b6886c1e59 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -13,7 +13,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "authenticationType": "KeyBased", "provisioningState": "Failed", "endpointUri": "sb://mysb.servicebus.windows.net/", @@ -28,7 +28,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "authenticationType": "IdentityBased", "provisioningState": "Deleting", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json index f6ec199fad12..1bd00d82f12d 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_WithIdentity_example.json @@ -9,11 +9,11 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint", + "name": "myServiceBus", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "authenticationType": "IdentityBased", "provisioningState": "Succeeded", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json index cd41d0af45ba..c506310673ef 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json @@ -11,7 +11,7 @@ "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint", + "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json index afa4466e12e9..8e8c1d2ed1e2 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json @@ -7,7 +7,7 @@ "endpointName": "myServiceBus", "endpointDescription": { "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", "entityPath": "mysbtopic" @@ -21,7 +21,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "provisioningState": "Provisioning", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", @@ -36,7 +36,7 @@ "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "provisioningState": "Provisioning", "authenticationType": "IdentityBased", "endpointUri": "sb://mysb.servicebus.windows.net/", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json index d44d3e3ba4d5..ad7a61cf4ea2 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_WithIdentity_example.json @@ -10,11 +10,11 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint1", + "name": "myServiceBus", "properties": { - "endpointType": "ServiceBusWithIdentity", + "endpointType": "ServiceBus", "authenticationType": "IdentityBased", "provisioningState": "Succeeded", "endpointUri": "sb://mysb.servicebus.windows.net/", @@ -23,9 +23,9 @@ } }, { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", - "name": "myendpoint2", + "name": "myServiceBus", "properties": { "endpointType": "EventHub", "authenticationType": "KeyBased", From 41acb423cb9af7b8acf3bfcb5cdda0d6e042eea8 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Wed, 7 Oct 2020 16:03:37 -0700 Subject: [PATCH 20/43] Change private link type names to be smaller --- .../stable/2020-12-01/digitaltwins.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 26c7a69d1cd5..b6af2ea35780 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1525,7 +1525,7 @@ } } }, - "PrivateLinkServiceConnectionState": { + "ConnectionState": { "description": "The current state of a private endpoint connection.", "type": "object", "properties": { @@ -1568,7 +1568,7 @@ } } }, - "PrivateEndpointConnectionProperties": { + "ConnectionProperties": { "description": "The properties of a private endpoint connection.", "type": "object", "properties": { @@ -1582,7 +1582,7 @@ "privateLinkServiceConnectionState": { "allOf": [ { - "$ref": "#/definitions/PrivateLinkServiceConnectionState" + "$ref": "#/definitions/ConnectionState" } ] } @@ -1612,7 +1612,7 @@ "properties": { "allOf": [ { - "$ref": "#/definitions/PrivateEndpointConnectionProperties" + "$ref": "#/definitions/ConnectionProperties" } ] } From 386c64d3e66d0a87ae3b06e432b2a9d36930516d Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 8 Oct 2020 13:37:23 -0700 Subject: [PATCH 21/43] Fix validation errors in private links --- .../stable/2020-12-01/digitaltwins.json | 97 ++++++++++++++++--- ...gitalTwinsDelete_WithIdentity_example.json | 4 +- .../examples/DigitalTwinsDelete_example.json | 4 +- ...nsEndpointDelete_WithIdentity_example.json | 4 +- .../DigitalTwinsEndpointDelete_example.json | 12 +-- .../DigitalTwinsEndpointGet_example.json | 6 +- ...TwinsEndpointPut_WithIdentity_example.json | 4 +- .../DigitalTwinsEndpointPut_example.json | 16 +-- .../DigitalTwinsEndpointsGet_example.json | 8 +- .../DigitalTwinsGet_WithIdentity_example.json | 4 +- ...WithPrivateEndpointConnection_example.json | 42 ++++++++ .../examples/DigitalTwinsGet_example.json | 4 +- ...gitalTwinsListByResourceGroup_example.json | 8 +- .../examples/DigitalTwinsList_example.json | 8 +- ...igitalTwinsPatch_WithIdentity_example.json | 8 +- .../examples/DigitalTwinsPatch_example.json | 8 +- .../DigitalTwinsPut_WithIdentity_example.json | 10 +- .../examples/DigitalTwinsPut_example.json | 10 +- ...igitalTwinsWithPrivateLinkGet_example.json | 6 +- ...intConnectionByConnectionName_example.json | 2 +- ...ivateEndpointConnectionDelete_example.json | 2 +- .../PrivateEndpointConnectionPut_example.json | 8 +- ...rivateEndpointConnectionsList_example.json | 2 +- ...PrivateLinkResourcesByGroupId_example.json | 3 +- .../PrivateLinkResourcesList_example.json | 4 +- 25 files changed, 196 insertions(+), 88 deletions(-) create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index b6af2ea35780..24dee8357beb 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -47,6 +47,9 @@ }, "Get a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsGet_WithIdentity_example.json" + }, + "Get a DigitalTwinsInstance resource with a private endpoint connection": { + "$ref": "./examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json" } }, "parameters": [ @@ -636,6 +639,11 @@ ], "description": "List private link resources for given Digital Twin.", "operationId": "GetPrivateLinkResources", + "x-ms-examples": { + "List private link resources for given Digital Twin": { + "$ref": "./examples/PrivateLinkResourcesList_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -654,7 +662,6 @@ "200": { "description": "The body contains the list of private link resources.", "schema": { - "type": "array", "items": { "$ref": "#/definitions/GroupIdInformationResponse" } @@ -676,6 +683,11 @@ ], "description": "Get the specified private link resource for the given Digital Twin.", "operationId": "GetPrivateLinkResourceByResourceId", + "x-ms-examples": { + "Get the specified private link resource for the given Digital Twin": { + "$ref": "./examples/PrivateLinkResourcesByGroupId_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -716,6 +728,11 @@ ], "description": "List private endpoint connection properties.", "operationId": "GetPrivateEndpointConnections", + "x-ms-examples": { + "List private endpoint connection properties": { + "$ref": "./examples/PrivateEndpointConnectionsList_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -734,9 +751,8 @@ "200": { "description": "The body contains the list of private endpoint connection properties.", "schema": { - "type": "array", "items": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "#/definitions/PrivateEndpointConnectionsResponse" } } }, @@ -756,6 +772,11 @@ ], "description": "Get private endpoint connection properties for the given private endpoint.", "operationId": "GetPrivateEndpointConnectionByName", + "x-ms-examples": { + "Get private endpoint connection properties for the given private endpoint": { + "$ref": "./examples/PrivateEndpointConnectionByConnectionName_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -795,6 +816,11 @@ "description": "Delete private endpoint connection with the specified name.", "operationId": "DeletePrivateEndpointConnection", "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete private endpoint connection with the specified name": { + "$ref": "./examples/PrivateEndpointConnectionDelete_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -834,6 +860,11 @@ "description": "Update the status of a private endpoint connection with the given name.", "operationId": "PutPrivateEndpointConnection", "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update the status of a private endpoint connection with the given name": { + "$ref": "./examples/PrivateEndpointConnectionPut_example.json" + } + }, "parameters": [ { "$ref": "#/parameters/api-version" @@ -1512,6 +1543,19 @@ "properties" ] }, + "PrivateEndpointConnectionsResponse": { + "description": "The available private link connections for a Digital Twin.", + "type": "object", + "properties": { + "value": { + "description": "The list of available private link connections for a Digital Twin.", + "type": "array", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + } + }, "GroupIdInformationResponse": { "description": "The available private link resources for a Digital Twin.", "type": "object", @@ -1568,10 +1612,38 @@ } } }, + "GroupId": { + "readOnly": true, + "description": "The private endpoint group id of a private endpoint connection.", + "type": "string" + }, + "PrivateEndpointConnectionProvisioningState": { + "description": "The provisioning state.", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ], + "type": "string", + "x-nullable": true, + "readOnly": true, + "x-ms-enum": { + "name": "PrivateEndpointConnectionProvisioningState", + "modelAsString": true + } + }, "ConnectionProperties": { "description": "The properties of a private endpoint connection.", "type": "object", "properties": { + "provisioningState": { + "allOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" + } + ] + }, "privateEndpoint": { "allOf": [ { @@ -1579,6 +1651,13 @@ } ] }, + "groupIds": { + "allOf": [ + { + "$ref": "#/definitions/GroupId" + } + ] + }, "privateLinkServiceConnectionState": { "allOf": [ { @@ -1594,21 +1673,9 @@ "type": "object", "properties": { "id": { - "readOnly": true, "type": "string", "description": "The resource identifier." }, - "name": { - "readOnly": true, - "type": "string", - "description": "The resource name.", - "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The resource type." - }, "properties": { "allOf": [ { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json index 1102b0a235e4..ee4700c34a12 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_WithIdentity_example.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", @@ -27,7 +27,7 @@ }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json index f84f638a7c70..47349a4ff5cd 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsDelete_example.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", @@ -22,7 +22,7 @@ }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json index 77b6886c1e59..0f283003b73d 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_WithIdentity_example.json @@ -9,7 +9,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { @@ -24,7 +24,7 @@ }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json index b8e734f02704..059a713e3a68 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointDelete_example.json @@ -9,30 +9,30 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { "authenticationType": "KeyBased", "endpointType": "ServiceBus", "provisioningState": "Failed", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", + "secondaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", "createdTime": "2019-11-19T01:10:34.350Z" } } }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint", "properties": { "authenticationType": "KeyBased", "endpointType": "ServiceBus", "provisioningState": "Deleting", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", + "secondaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", "createdTime": "2019-11-19T01:10:34.350Z" } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json index c506310673ef..62b45ecaf4c9 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointGet_example.json @@ -9,15 +9,15 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", "provisioningState": "Succeeded", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", + "secondaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", "createdTime": "2019-11-19T01:10:34.350Z" } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json index 8e8c1d2ed1e2..806a09027bab 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_WithIdentity_example.json @@ -17,7 +17,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { @@ -32,7 +32,7 @@ }, "201": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json index 8c49845752b7..0659ea27f2f4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointPut_example.json @@ -9,38 +9,38 @@ "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=" + "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=;EntityPath=abcabc", + "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xyzxyzoX4=;EntityPath=abcabc" } } }, "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", "provisioningState": "Succeeded", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", + "secondaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", "createdTime": "2019-11-19T01:10:34.350Z" } } }, "201": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myServiceBus", "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", "provisioningState": "Provisioning", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "", + "secondaryConnectionString": "", "createdTime": "2019-11-19T01:10:34.350Z" } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json index ec2ec423910f..7adaf1ffa79a 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsEndpointsGet_example.json @@ -10,20 +10,20 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint1", "properties": { "endpointType": "ServiceBus", "authenticationType": "KeyBased", - "primaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", - "secondaryConnectionString": "Endpoint=sb://mysb.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=***", + "primaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", + "secondaryConnectionString": "Endpoint=sb://***/;SharedAccessKeyName=***;SharedAccessKey=***;EntityPath=***", "provisioningState": "Succeeded", "createdTime": "2019-11-19T01:10:34.350Z" } }, { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/endpoints/myServiceBus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/endpoints/myServiceBus", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints", "name": "myendpoint2", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json index 11a43c77f34b..98ebaa7da87b 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json @@ -8,8 +8,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "identity": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json new file mode 100644 index 000000000000..78c41b84748e --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "privateEndpointConnections": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Please approve my request, thanks.", + "actionsRequired": "None" + } + } + } + ] + } + } + } + } + } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json index 1321d56c3ab5..cb94a9d7c387 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json @@ -8,8 +8,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json index 447164dd5604..ded0ae165b0b 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json @@ -10,8 +10,8 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { @@ -22,8 +22,8 @@ } }, { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService2", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService2", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService2", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json index aafea53d9c6e..ce8e9110955e 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json @@ -9,8 +9,8 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { @@ -21,8 +21,8 @@ } }, { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg2/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService2", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg2/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService2", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService2", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json index 077681f8921a..dbf088100b0c 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json @@ -13,8 +13,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { @@ -30,8 +30,8 @@ }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json index 09632409420e..e4e22900d0ee 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json @@ -13,8 +13,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { @@ -30,8 +30,8 @@ }, "202": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json index a148eb03a68e..2626ed7277f4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json @@ -5,7 +5,7 @@ "resourceName": "myDigitalTwinsService", "api-version": "2020-12-01", "digitalTwinsCreate": { - "location": "WestUS", + "location": "WestUS2", "identity": { "type": "SystemAssigned" } @@ -14,8 +14,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { @@ -36,8 +36,8 @@ }, "201": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "identity": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json index c7f87a3fcf20..7645b92dca0f 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json @@ -5,14 +5,14 @@ "resourceName": "myDigitalTwinsService", "api-version": "2020-12-01", "digitalTwinsCreate": { - "location": "WestUS" + "location": "WestUS2" } }, "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "tags": { @@ -28,8 +28,8 @@ }, "201": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json index 899d493db8cd..73aa978bfcf3 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json @@ -8,8 +8,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances", "name": "myDigitalTwinsService", "properties": { @@ -19,7 +19,7 @@ "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", "privateEndpointConnections": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "privateEndpoint": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json index 074025c48e55..577cd9a4a3fe 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionByConnectionName_example.json @@ -9,7 +9,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "privateEndpoint": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json index 13ee3947edfa..80100e78e7cf 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json @@ -9,7 +9,7 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", "Retry-After": "17" } }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json index 763d4e7e1175..cbee73aeea6e 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json @@ -6,7 +6,7 @@ "api-version": "2020-12-01", "privateEndpointConnectionName": "myPrivateConnection", "privateEndpointConnection": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "privateLinkServiceConnectionState": { "status": "Approved", @@ -18,7 +18,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "provisioningState": "Succeeded", "privateEndpoint": { @@ -36,11 +36,11 @@ }, "201": { "headers": { - "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", + "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", "Retry-After": "17" }, "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "provisioningState": "Succeeded", "privateEndpoint": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json index 1b6dd7414e7d..ae50a2f46908 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionsList_example.json @@ -10,7 +10,7 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "privateEndpoint": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json index 10ca65216ce1..ddf9543012c5 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesByGroupId_example.json @@ -9,8 +9,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateLinkResources", "name": "myDigitalTwinsService", "properties": { diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json index d99c88516966..ae9e04a67e68 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json @@ -10,8 +10,8 @@ "body": { "value": [ { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/DigitalTwinsInstance/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", - "location": "westus", + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", + "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateLinkResources", "name": "myDigitalTwinsService", "properties": { From f2bb31b04d0e9d729074bf84ac7bbfcfa77added Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Fri, 9 Oct 2020 14:29:14 -0700 Subject: [PATCH 22/43] Fix validation error related to private links --- .../stable/2020-12-01/digitaltwins.json | 55 ++++++++----------- .../PrivateLinkResourcesList_example.json | 1 - 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 24dee8357beb..09488cca5122 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -662,9 +662,7 @@ "200": { "description": "The body contains the list of private link resources.", "schema": { - "items": { - "$ref": "#/definitions/GroupIdInformationResponse" - } + "$ref": "#/definitions/GroupIdInformationResponse" } }, "default": { @@ -751,9 +749,7 @@ "200": { "description": "The body contains the list of private endpoint connection properties.", "schema": { - "items": { - "$ref": "#/definitions/PrivateEndpointConnectionsResponse" - } + "$ref": "#/definitions/PrivateEndpointConnectionsResponse" } }, "default": { @@ -1616,33 +1612,26 @@ "readOnly": true, "description": "The private endpoint group id of a private endpoint connection.", "type": "string" - }, - "PrivateEndpointConnectionProvisioningState": { - "description": "The provisioning state.", - "enum": [ - "Pending", - "Approved", - "Rejected", - "Disconnected" - ], - "type": "string", - "x-nullable": true, - "readOnly": true, - "x-ms-enum": { - "name": "PrivateEndpointConnectionProvisioningState", - "modelAsString": true - } - }, + }, "ConnectionProperties": { "description": "The properties of a private endpoint connection.", "type": "object", "properties": { "provisioningState": { - "allOf": [ - { - "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" - } - ] + "description": "The provisioning state.", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ], + "type": "string", + "x-nullable": true, + "readOnly": true, + "x-ms-enum": { + "name": "ConnectionPropertiesProvisioningState", + "modelAsString": true + } }, "privateEndpoint": { "allOf": [ @@ -1652,11 +1641,11 @@ ] }, "groupIds": { - "allOf": [ - { - "$ref": "#/definitions/GroupId" - } - ] + "description": "The list of group ids for the private endpoint connection.", + "type": "array", + "items": { + "$ref": "#/definitions/GroupId" + } }, "privateLinkServiceConnectionState": { "allOf": [ diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json index ae9e04a67e68..21516fddf2f0 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateLinkResourcesList_example.json @@ -11,7 +11,6 @@ "value": [ { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateLinkResources/myDigitalTwinsService", - "location": "westus2", "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateLinkResources", "name": "myDigitalTwinsService", "properties": { From c02fac7790b431fcf7a489cd73e3a80d962f07ad Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Fri, 9 Oct 2020 14:51:31 -0700 Subject: [PATCH 23/43] Reference private link example --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 09488cca5122..43c7d1008ad4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -50,6 +50,9 @@ }, "Get a DigitalTwinsInstance resource with a private endpoint connection": { "$ref": "./examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json" + }, + "Get a DigitalTwinsInstance resource with a private link": { + "$ref": "./examples/DigitalTwinsWithPrivateLinkGet_example.json" } }, "parameters": [ From b7aeb1e75a5a947a315c54de9c4ebe963adb4e37 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 15 Oct 2020 14:13:40 -0700 Subject: [PATCH 24/43] Add public network access --- .../stable/2020-12-01/digitaltwins.json | 15 ++++++++++++--- .../DigitalTwinsGet_WithIdentity_example.json | 3 ++- ...Get_WithPrivateEndpointConnection_example.json | 3 ++- .../examples/DigitalTwinsGet_example.json | 3 ++- .../DigitalTwinsListByResourceGroup_example.json | 6 ++++-- .../examples/DigitalTwinsList_example.json | 6 ++++-- .../DigitalTwinsPatch_WithIdentity_example.json | 6 ++++-- .../examples/DigitalTwinsPatch_example.json | 6 ++++-- .../DigitalTwinsPut_WithIdentity_example.json | 6 ++++-- .../examples/DigitalTwinsPut_example.json | 6 ++++-- .../DigitalTwinsWithPrivateLinkGet_example.json | 3 ++- 11 files changed, 44 insertions(+), 19 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 43c7d1008ad4..7997d46f91d8 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -50,9 +50,6 @@ }, "Get a DigitalTwinsInstance resource with a private endpoint connection": { "$ref": "./examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json" - }, - "Get a DigitalTwinsInstance resource with a private link": { - "$ref": "./examples/DigitalTwinsWithPrivateLinkGet_example.json" } }, "parameters": [ @@ -963,6 +960,18 @@ "items": { "$ref": "#/definitions/PrivateEndpointConnection" } + }, + "publicNetworkAccess": { + "description": "Public network access for the DigitalTwinsInstance.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "publicNetworkAccess", + "modelAsString": true + } } } }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json index 98ebaa7da87b..d1564853c218 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithIdentity_example.json @@ -21,7 +21,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json index 78c41b84748e..012aa4b6e370 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json @@ -34,7 +34,8 @@ } } } - ] + ], + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json index cb94a9d7c387..591cf22b5bcb 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_example.json @@ -16,7 +16,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json index ded0ae165b0b..0e024cbd2d58 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsListByResourceGroup_example.json @@ -18,7 +18,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-11-19T12:51:05.229Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } }, { @@ -30,7 +31,8 @@ "createdTime": "2019-11-19T12:55:07.229Z", "lastUpdatedTime": "2019-11-19T12:55:07.229Z", "provisioningState": "Provisioning", - "hostName": null + "hostName": null, + "publicNetworkAccess": "Enabled" } } ] diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json index ce8e9110955e..54abe37f7d22 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsList_example.json @@ -17,7 +17,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-11-19T12:55:07.229Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } }, { @@ -29,7 +30,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-11-19T12:55:07.229Z", "provisioningState": "Provisioning", - "hostName": null + "hostName": null, + "publicNetworkAccess": "Enabled" } } ] diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json index dbf088100b0c..7e8415ec777d 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithIdentity_example.json @@ -24,7 +24,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } }, @@ -41,7 +42,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Updating", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json index e4e22900d0ee..93afda3ba747 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_example.json @@ -24,7 +24,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Disabled" } } }, @@ -41,7 +42,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Updating", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Disabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json index 2626ed7277f4..2d00b63cf5ed 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithIdentity_example.json @@ -30,7 +30,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } }, @@ -47,7 +48,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-11-19T12:55:05.229Z", "provisioningState": "Provisioning", - "hostName": null + "hostName": null, + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json index 7645b92dca0f..dfcee8cb4560 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_example.json @@ -22,7 +22,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-12-06T12:21:58.610Z", "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net" + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" } } }, @@ -36,7 +37,8 @@ "createdTime": "2019-11-19T12:55:05.229Z", "lastUpdatedTime": "2019-11-19T12:55:05.229Z", "provisioningState": "Provisioning", - "hostName": null + "hostName": null, + "publicNetworkAccess": "Enabled" } } } diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json index 73aa978bfcf3..22f48c08b0e7 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json @@ -34,7 +34,8 @@ } } } - ] + ], + "publicNetworkAccess": "Enabled" } } } From 26a478417360879e4bd1dbb2124438b7f01e5b02 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 15 Oct 2020 14:29:35 -0700 Subject: [PATCH 25/43] Align with GA swagger --- .../stable/2020-12-01/digitaltwins.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 7997d46f91d8..5aefe621f818 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1295,7 +1295,10 @@ "description": "DigitalTwinsInstance endpoint resource properties.", "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" } - } + }, + "required": [ + "properties" + ] }, "DigitalTwinsEndpointResourceProperties": { "description": "Properties related to Digital Twins Endpoint", From 779b8e6f06f41082ec00f76ff5b9272d39f9a9b2 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 10:01:21 -0800 Subject: [PATCH 26/43] Update private links / private endpoints --- .../stable/2020-12-01/digitaltwins.json | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 5aefe621f818..a279447686f8 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -836,7 +836,7 @@ ], "responses": { "202": { - "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation." + "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete." }, "204": { "description": "Returned when the long running delete operation has finished, or the private endpoint does not exist." @@ -888,8 +888,8 @@ } ], "responses": { - "201": { - "description": "This is a long running operation. The operation returns a 201 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. If successful, the operation returns HTTP status code of 200 (OK).", + "202": { + "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. If successful, the operation returns HTTP status code of 200 (OK).", "schema": { "$ref": "#/definitions/PrivateEndpointConnection" } @@ -957,9 +957,9 @@ }, "privateEndpointConnections": { "type": "array", - "items": { - "$ref": "#/definitions/PrivateEndpointConnection" - } + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } }, "publicNetworkAccess": { "description": "Public network access for the DigitalTwinsInstance.", @@ -1295,10 +1295,7 @@ "description": "DigitalTwinsInstance endpoint resource properties.", "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" } - }, - "required": [ - "properties" - ] + } }, "DigitalTwinsEndpointResourceProperties": { "description": "Properties related to Digital Twins Endpoint", From 04afddd221071b3d9ba83acb1035db05b257129e Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 14:12:25 -0800 Subject: [PATCH 27/43] Fix example to use actual response status code --- .../examples/PrivateEndpointConnectionPut_example.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json index cbee73aeea6e..474295e29c17 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json @@ -34,7 +34,7 @@ } } }, - "201": { + "202": { "headers": { "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", "Retry-After": "17" From e1f157bbb5eb69b56a81f092011e0688849fa0d8 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 14:36:58 -0800 Subject: [PATCH 28/43] Remove unused example --- ...igitalTwinsWithPrivateLinkGet_example.json | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json deleted file mode 100644 index 22f48c08b0e7..000000000000 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsWithPrivateLinkGet_example.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parameters": { - "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", - "resourceGroupName": "resRg", - "resourceName": "myDigitalTwinsService", - "api-version": "2020-12-01" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", - "location": "westus2", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances", - "name": "myDigitalTwinsService", - "properties": { - "createdTime": "2019-11-19T12:55:05.229Z", - "lastUpdatedTime": "2019-12-06T12:21:58.610Z", - "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", - "privateEndpointConnections": [ - { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", - "properties": { - "privateEndpoint": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" - }, - "groupIds": [ - "digitalTwinsInstance" - ], - "privateLinkServiceConnectionState": { - "status": "Pending", - "description": "Please approve my request, thanks.", - "actionsRequired": "None" - } - } - } - ], - "publicNetworkAccess": "Enabled" - } - } - } - } -} From ff45c6237a0e4f70ff32e93b644a16ab023a4bec Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 14:43:43 -0800 Subject: [PATCH 29/43] Unmark private endpoint connection to be an azure resource --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index a279447686f8..2a3f6bf43b12 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1670,7 +1670,6 @@ }, "PrivateEndpointConnection": { "description": "The private endpoint connection of a Digital Twin.", - "x-ms-azure-resource": true, "type": "object", "properties": { "id": { From 5cbf61604c6436e6091c43df86c88f3ff326157f Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 15:07:44 -0800 Subject: [PATCH 30/43] Add type and name to private endpoint connection resource --- .../stable/2020-12-01/digitaltwins.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 2a3f6bf43b12..626ed4ccbf2b 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1671,11 +1671,23 @@ "PrivateEndpointConnection": { "description": "The private endpoint connection of a Digital Twin.", "type": "object", + "x-ms-azure-resource": true, "properties": { "id": { "type": "string", "description": "The resource identifier." }, + "name": { + "readOnly": true, + "type": "string", + "description": "The resource name.", + "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type." + }, "properties": { "allOf": [ { From b4d6713e8ea33d978ca5732352c27042176cc28f Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 15:21:59 -0800 Subject: [PATCH 31/43] Mark id as read-only --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 626ed4ccbf2b..890751f6de74 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1674,6 +1674,7 @@ "x-ms-azure-resource": true, "properties": { "id": { + "readOnly": true, "type": "string", "description": "The resource identifier." }, From b36a43abc364f1c09d35f9a34a3006ad2468c5f9 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 15:38:01 -0800 Subject: [PATCH 32/43] Fix return types for endpoint connections --- .../stable/2020-12-01/digitaltwins.json | 3 ++ ...ivateEndpointConnectionDelete_example.json | 40 +++++++++++++++++-- .../PrivateEndpointConnectionPut_example.json | 9 ++--- 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 890751f6de74..9166583568c4 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -835,6 +835,9 @@ } ], "responses": { + "200": { + "description": "Returned when the long running delete operation has failed, and has reached a terminal state." + }, "202": { "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete." }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json index 80100e78e7cf..808539b22081 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json @@ -7,10 +7,44 @@ "privateEndpointConnectionName": "myPrivateConnection" }, "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "name": "myPrivateConnection", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", + "properties": { + "provisioningState": "Failed", + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Approved by johndoe@company.com." + } + } + } + }, "202": { - "headers": { - "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", - "Retry-After": "17" + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "name": "myPrivateConnection", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", + "properties": { + "provisioningState": "Deleting", + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Approved by johndoe@company.com." + } + } } }, "204": {} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json index 474295e29c17..1eebdfed898f 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionPut_example.json @@ -6,7 +6,6 @@ "api-version": "2020-12-01", "privateEndpointConnectionName": "myPrivateConnection", "privateEndpointConnection": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", "properties": { "privateLinkServiceConnectionState": { "status": "Approved", @@ -19,6 +18,8 @@ "200": { "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "name": "myPrivateConnection", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", "properties": { "provisioningState": "Succeeded", "privateEndpoint": { @@ -35,12 +36,10 @@ } }, "202": { - "headers": { - "Location": "https://management.azure.com/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection/operationResults/myOperationId?api-version=2020-12-01", - "Retry-After": "17" - }, "body": { "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "name": "myPrivateConnection", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", "properties": { "provisioningState": "Succeeded", "privateEndpoint": { From 889747587210450d4956704f436dc4333c769a09 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 15:39:13 -0800 Subject: [PATCH 33/43] Align return of DELETE --- .../stable/2020-12-01/digitaltwins.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 9166583568c4..a13146388006 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -836,10 +836,16 @@ ], "responses": { "200": { - "description": "Returned when the long running delete operation has failed, and has reached a terminal state." + "description": "Returned when the long running delete operation has failed, and has reached a terminal state.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } }, "202": { - "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete." + "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } }, "204": { "description": "Returned when the long running delete operation has finished, or the private endpoint does not exist." From 198c46345bcd8f71fe612f3048bb74b8fc68168d Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 15:48:08 -0800 Subject: [PATCH 34/43] Fix validation errors --- .../stable/2020-12-01/digitaltwins.json | 10 +-- ...WithPrivateEndpointConnection_example.json | 72 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index a13146388006..28e258f0e24a 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -48,7 +48,7 @@ "Get a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsGet_WithIdentity_example.json" }, - "Get a DigitalTwinsInstance resource with a private endpoint connection": { + "Get a DigitalTwinsInstance resource with a private endpoint connection": { "$ref": "./examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json" } }, @@ -966,9 +966,9 @@ }, "privateEndpointConnections": { "type": "array", - "items": { - "$ref": "#/definitions/PrivateEndpointConnection" - } + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } }, "publicNetworkAccess": { "description": "Public network access for the DigitalTwinsInstance.", @@ -1633,7 +1633,7 @@ "readOnly": true, "description": "The private endpoint group id of a private endpoint connection.", "type": "string" - }, + }, "ConnectionProperties": { "description": "The properties of a private endpoint connection.", "type": "object", diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json index 012aa4b6e370..877dca4ab9a9 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsGet_WithPrivateEndpointConnection_example.json @@ -1,43 +1,43 @@ { - "parameters": { - "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", - "resourceGroupName": "resRg", - "resourceName": "myDigitalTwinsService", - "api-version": "2020-12-01" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", - "location": "westus2", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances", - "name": "myDigitalTwinsService", - "properties": { - "createdTime": "2019-11-19T12:55:05.229Z", - "lastUpdatedTime": "2019-12-06T12:21:58.610Z", - "provisioningState": "Succeeded", - "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", - "privateEndpointConnections": [ - { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", - "properties": { - "privateEndpoint": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" - }, - "groupIds": [ - "digitalTwinsInstance" - ], - "privateLinkServiceConnectionState": { - "status": "Pending", - "description": "Please approve my request, thanks.", - "actionsRequired": "None" - } + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "privateEndpointConnections": [ + { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", + "properties": { + "privateEndpoint": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" + }, + "groupIds": [ + "digitalTwinsInstance" + ], + "privateLinkServiceConnectionState": { + "status": "Pending", + "description": "Please approve my request, thanks.", + "actionsRequired": "None" } } - ], - "publicNetworkAccess": "Enabled" - } + } + ], + "publicNetworkAccess": "Enabled" } } } } +} From bc9c8d5215cbccf46352d026fa7aa8275badd531 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 16:34:53 -0800 Subject: [PATCH 35/43] Fix version tag in python.md; remove body from DELETE endpoint connection DELETE responses --- .../stable/2020-12-01/digitaltwins.json | 10 +---- ...ivateEndpointConnectionDelete_example.json | 42 +------------------ .../resource-manager/readme.python.md | 2 +- 3 files changed, 5 insertions(+), 49 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 28e258f0e24a..ea64a2bd715c 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -836,16 +836,10 @@ ], "responses": { "200": { - "description": "Returned when the long running delete operation has failed, and has reached a terminal state.", - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - } + "description": "Returned when the long running delete operation has failed, and has reached a terminal state." }, "202": { - "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete.", - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - } + "description": "This is a long running operation. The operation returns a 202 if the validation is complete. The response includes an Azure-AsyncOperation header that contains a status URL. Clients are expected to poll the status URL for the status of the operation. The status URL returns 204 No Content when the deletion is complete." }, "204": { "description": "Returned when the long running delete operation has finished, or the private endpoint does not exist." diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json index 808539b22081..3ca916ffac39 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/PrivateEndpointConnectionDelete_example.json @@ -7,46 +7,8 @@ "privateEndpointConnectionName": "myPrivateConnection" }, "responses": { - "200": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", - "name": "myPrivateConnection", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", - "properties": { - "provisioningState": "Failed", - "privateEndpoint": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" - }, - "groupIds": [ - "digitalTwinsInstance" - ], - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Approved by johndoe@company.com." - } - } - } - }, - "202": { - "body": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService/privateEndpointConnections/myPrivateConnection", - "name": "myPrivateConnection", - "type": "Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections", - "properties": { - "provisioningState": "Deleting", - "privateEndpoint": { - "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourceGroups/resRg/providers/Microsoft.Network/privateEndpoints/myPrivateEndpoint" - }, - "groupIds": [ - "digitalTwinsInstance" - ], - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Approved by johndoe@company.com." - } - } - } - }, + "200": {}, + "202": {}, "204": {} } } diff --git a/specification/digitaltwins/resource-manager/readme.python.md b/specification/digitaltwins/resource-manager/readme.python.md index e06eba2efdbf..013532be2474 100644 --- a/specification/digitaltwins/resource-manager/readme.python.md +++ b/specification/digitaltwins/resource-manager/readme.python.md @@ -30,7 +30,7 @@ batch: These settings apply only when `--tag=package-2020-12 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2020-10' && $(python) +``` yaml $(tag) == 'package-2020-12' && $(python) python: namespace: azure.mgmt.digitaltwins.v2020_12_01 output-folder: $(python-sdks-folder)/digitaltwins/azure-mgmt-digitaltwins/azure/mgmt/digitaltwins/v2020_12_01 From 949c5484308f9b66e02c9098a00974f19e14f2d9 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 3 Nov 2020 17:19:49 -0800 Subject: [PATCH 36/43] Synchronize swagger with 2020-10-31 version --- .../stable/2020-12-01/digitaltwins.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index ea64a2bd715c..e9a08961c83c 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1298,7 +1298,10 @@ "description": "DigitalTwinsInstance endpoint resource properties.", "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties" } - } + }, + "required": [ + "properties" + ] }, "DigitalTwinsEndpointResourceProperties": { "description": "Properties related to Digital Twins Endpoint", From 06cfc0b650bd07edf99d29bb3409fe3207d9eaac Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Thu, 5 Nov 2020 14:00:29 -0800 Subject: [PATCH 37/43] Increase resource group name max length to 90 characters --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index e9a08961c83c..c7bf6f58a84a 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -1735,7 +1735,7 @@ "type": "string", "x-ms-parameter-location": "method", "minLength": 1, - "maxLength": 64 + "maxLength": 90 }, "resourceName": { "name": "resourceName", From e2d143004956b069ec70ac61ad9e9226f44714a6 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Mon, 9 Nov 2020 11:36:32 -0800 Subject: [PATCH 38/43] Make publicNetworkAccess nullable --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index c7bf6f58a84a..525dc54f0b82 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -971,6 +971,7 @@ "Disabled" ], "type": "string", + "x-nullable": true, "x-ms-enum": { "name": "publicNetworkAccess", "modelAsString": true From c593315753b7a72bada1d7cc9cf29693ca1a5d2c Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 10 Nov 2020 15:47:55 -0800 Subject: [PATCH 39/43] Add publicNetworkAccess flag to PATCH request --- .../stable/2020-12-01/digitaltwins.json | 30 +++++++++++ ...talTwinsPatch_WithPublicNetworkAccess.json | 51 +++++++++++++++++++ ...gitalTwinsPut_WithPublicNetworkAccess.json | 46 +++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithPublicNetworkAccess.json create mode 100644 specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithPublicNetworkAccess.json diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 525dc54f0b82..3ff8d646c5af 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -153,6 +153,9 @@ }, "Patch a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsPatch_WithIdentity_example.json" + }, + "Patch a DigitalTwinsInstance resource with publicNetworkAccess property": { + "$ref": "./examples/DigitalTwinsPatch_WithPublicNetworkAccess.json" } }, "parameters": [ @@ -361,6 +364,9 @@ }, "Put a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsEndpointPut_WithIdentity_example.json" + }, + "Put a DigitalTwinsInstance resource with publicNetworkAccess property": { + "$ref": "./examples/DigitalTwinsPut_WithPublicNeworkAccess.json" } }, "parameters": [ @@ -914,6 +920,25 @@ } }, "definitions": { + "DigitalTwinsPatchProperties": { + "description": "The properties of a DigitalTwinsInstance.", + "type": "object", + "properties": { + "publicNetworkAccess": { + "description": "Public network access for the DigitalTwinsInstance.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-nullable": true, + "x-ms-enum": { + "name": "publicNetworkAccess", + "modelAsString": true + } + } + } + }, "DigitalTwinsProperties": { "description": "The properties of a DigitalTwinsInstance.", "type": "object", @@ -1011,6 +1036,11 @@ "description": "The managed identity for the DigitalTwinsInstance.", "x-nullable": true, "$ref": "#/definitions/DigitalTwinsIdentity" + }, + "properties": { + "description": "Properties for the DigitalTwinsInstance.", + "x-nullable": true, + "$ref": "#/definitions/DigitalTwinsPatchProperties" } } }, diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithPublicNetworkAccess.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithPublicNetworkAccess.json new file mode 100644 index 000000000000..e50d1bb3d7c4 --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPatch_WithPublicNetworkAccess.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "digitalTwinsPatchDescription": { + "properties": { + "publicNetworkAccess": "Disabled" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Disabled" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "tags": { + "purpose": "dev" + }, + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Updating", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Disabled" + } + } + } + } +} diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithPublicNetworkAccess.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithPublicNetworkAccess.json new file mode 100644 index 000000000000..a4b69c8c45ca --- /dev/null +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/examples/DigitalTwinsPut_WithPublicNetworkAccess.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e", + "resourceGroupName": "resRg", + "resourceName": "myDigitalTwinsService", + "api-version": "2020-12-01", + "digitalTwinsCreate": { + "location": "WestUS2", + "properties": { + "publicNetworkAccess": "Enabled" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-12-06T12:21:58.610Z", + "provisioningState": "Succeeded", + "hostName": "https://myDigitalTwinsService.api.wus2.ss.azuredigitaltwins-test.net", + "publicNetworkAccess": "Enabled" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/50016170-c839-41ba-a724-51e9df440b9e/resourcegroups/resRg/providers/Microsoft.DigitalTwins/digitalTwinsInstances/myDigitalTwinsService", + "location": "westus2", + "type": "Microsoft.DigitalTwins/digitalTwinsInstances", + "name": "myDigitalTwinsService", + "properties": { + "createdTime": "2019-11-19T12:55:05.229Z", + "lastUpdatedTime": "2019-11-19T12:55:05.229Z", + "provisioningState": "Provisioning", + "hostName": null, + "publicNetworkAccess": "Enabled" + } + } + } + } +} From 2fd20bae97f030f0f6962911d00ddfc44db47e46 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 10 Nov 2020 15:53:24 -0800 Subject: [PATCH 40/43] Fixed typo --- .../Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 3ff8d646c5af..a54688395738 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -366,7 +366,7 @@ "$ref": "./examples/DigitalTwinsEndpointPut_WithIdentity_example.json" }, "Put a DigitalTwinsInstance resource with publicNetworkAccess property": { - "$ref": "./examples/DigitalTwinsPut_WithPublicNeworkAccess.json" + "$ref": "./examples/DigitalTwinsPut_WithPublicNetworkAccess.json" } }, "parameters": [ From 8e5f099a5ab9178dc478fc359412b5bcb3042096 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 10 Nov 2020 15:58:58 -0800 Subject: [PATCH 41/43] Fix placing of example for endpoints --- .../stable/2020-12-01/digitaltwins.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index a54688395738..673b2d3e6ff1 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -94,6 +94,9 @@ }, "Put a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsPut_WithIdentity_example.json" + }, + "Put a DigitalTwinsInstance resource with publicNetworkAccess property": { + "$ref": "./examples/DigitalTwinsPut_WithPublicNetworkAccess.json" } }, "parameters": [ @@ -364,9 +367,6 @@ }, "Put a DigitalTwinsInstance resource with identity": { "$ref": "./examples/DigitalTwinsEndpointPut_WithIdentity_example.json" - }, - "Put a DigitalTwinsInstance resource with publicNetworkAccess property": { - "$ref": "./examples/DigitalTwinsPut_WithPublicNetworkAccess.json" } }, "parameters": [ From 043fe7030d60d4609b2d9090f4087c79bb14a88f Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Tue, 10 Nov 2020 16:06:21 -0800 Subject: [PATCH 42/43] Update operation ids --- .../stable/2020-12-01/digitaltwins.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json index 673b2d3e6ff1..a60a0f5f0aa1 100644 --- a/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json +++ b/specification/digitaltwins/resource-manager/Microsoft.DigitalTwins/stable/2020-12-01/digitaltwins.json @@ -644,7 +644,7 @@ "PrivateEndpoints" ], "description": "List private link resources for given Digital Twin.", - "operationId": "GetPrivateLinkResources", + "operationId": "PrivateLinkResources_List", "x-ms-examples": { "List private link resources for given Digital Twin": { "$ref": "./examples/PrivateLinkResourcesList_example.json" @@ -686,7 +686,7 @@ "PrivateEndpoints" ], "description": "Get the specified private link resource for the given Digital Twin.", - "operationId": "GetPrivateLinkResourceByResourceId", + "operationId": "PrivateLinkResources_Get", "x-ms-examples": { "Get the specified private link resource for the given Digital Twin": { "$ref": "./examples/PrivateLinkResourcesByGroupId_example.json" @@ -731,7 +731,7 @@ "PrivateEndpoints" ], "description": "List private endpoint connection properties.", - "operationId": "GetPrivateEndpointConnections", + "operationId": "PrivateEndpointConnections_List", "x-ms-examples": { "List private endpoint connection properties": { "$ref": "./examples/PrivateEndpointConnectionsList_example.json" @@ -773,7 +773,7 @@ "PrivateEndpoints" ], "description": "Get private endpoint connection properties for the given private endpoint.", - "operationId": "GetPrivateEndpointConnectionByName", + "operationId": "PrivateEndpointConnections_Get", "x-ms-examples": { "Get private endpoint connection properties for the given private endpoint": { "$ref": "./examples/PrivateEndpointConnectionByConnectionName_example.json" @@ -816,7 +816,7 @@ "PrivateEndpoints" ], "description": "Delete private endpoint connection with the specified name.", - "operationId": "DeletePrivateEndpointConnection", + "operationId": "PrivateEndpointConnections_Delete", "x-ms-long-running-operation": true, "x-ms-examples": { "Delete private endpoint connection with the specified name": { @@ -863,7 +863,7 @@ "PrivateEndpoints" ], "description": "Update the status of a private endpoint connection with the given name.", - "operationId": "PutPrivateEndpointConnection", + "operationId": "PrivateEndpointConnections_CreateOrUpdate", "x-ms-long-running-operation": true, "x-ms-examples": { "Update the status of a private endpoint connection with the given name": { From 416d57a5174cb8276545d4007d7b6817e55f1723 Mon Sep 17 00:00:00 2001 From: Sebastian Herzig-Patel Date: Mon, 14 Dec 2020 10:59:26 -0800 Subject: [PATCH 43/43] Added suppression message --- specification/digitaltwins/resource-manager/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/digitaltwins/resource-manager/readme.md b/specification/digitaltwins/resource-manager/readme.md index 74e5fad1a955..dc750a9fedd2 100644 --- a/specification/digitaltwins/resource-manager/readme.md +++ b/specification/digitaltwins/resource-manager/readme.md @@ -143,4 +143,7 @@ directive: where: '$.definitions.EventHub.allOf["1"].properties.connectionStringSecondaryKey' from: digitaltwins.json reason: Secrets are obfuscated on read. + - suppress: R4009 + from: digitaltwins.json + reason: Warning raised to error while PR was being reviewed. Will implement in next version. ```