From 034a5be0f0abafcd698cde7b0b219c4edeb7b40f Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 25 Nov 2020 14:07:39 -0800 Subject: [PATCH 01/26] Added all private endpoint APIs; added missing 'nonce' attribute to data plane --- .../stable/2020-10-01/attestation.json | 8 + .../attestation/data-plane/readme.python.md | 10 + .../stable/2020-10-01/attestation.json | 423 +++++++++++++++++- .../deletePrivateEndpointConnection.json | 28 ++ .../getPrivateEndpointConnection.json | 29 ++ .../examples/listPrivateLinkResources.json | 21 + .../putPrivateEndpointConnection.json | 37 ++ 7 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json index e82086d63342..f2c1744739d2 100644 --- a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -911,6 +911,10 @@ "draftPolicyForAttestation": { "description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.", "type": "string" + }, + "nonce": { + "description": "Nonce for incoming request - emitted in the generated attestation token", + "type": "string" } } }, @@ -934,6 +938,10 @@ "draftPolicyForAttestation": { "description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.", "type": "string" + }, + "nonce": { + "description": "Nonce for incoming request - emitted in the generated attestation token", + "type": "string" } } }, diff --git a/specification/attestation/data-plane/readme.python.md b/specification/attestation/data-plane/readme.python.md index edcb0a792127..08c7d88909ff 100644 --- a/specification/attestation/data-plane/readme.python.md +++ b/specification/attestation/data-plane/readme.python.md @@ -15,6 +15,16 @@ python: package-version: 0.1.0 clear-output-folder: true ``` + +### Python multi-api + +Generate all API versions currently shipped for this package + +```yaml $(python) && $(multiapi) +batch: + - tag: package-2020-10-01 +``` + ``` yaml $(python) && $(python-mode) == 'update' python: no-namespace-folders: true diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 39bf61c88556..10574acdf8ff 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "AttestationManagementClient", - "description": "Various APIs for managing resources in attestation service. This primarily encompasses per-tenant instance management.", + "description": "Various APIs for managing resources in attestation service. This primarily encompasses per-instance instance management.", "version": "2020-10-01" }, "host": "management.azure.com", @@ -421,6 +421,230 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{instanceName}/privateEndpointConnections/{privateEndpointConnectionName}": { + "get": { + "tags": [ + "PrivateEndpointConnections" + ], + "operationId": "PrivateEndpointConnections_Get", + "description": "Gets the specified private endpoint connection associated with the attestation instance.", + "x-ms-examples": { + "AttestationInstanceGetPrivateEndpointConnection": { + "$ref": "./examples/getPrivateEndpointConnection.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/InstanceName" + }, + { + "$ref": "#/parameters/PrivateEndpointConnectionName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "Private endpoint connection successfully returned.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, + "put": { + "tags": [ + "PrivateEndpointConnections" + ], + "operationId": "PrivateEndpointConnections_Put", + "description": "Updates the specified private endpoint connection associated with the attestation instance.", + "x-ms-examples": { + "AttestationInstancePutPrivateEndpointConnection": { + "$ref": "./examples/putPrivateEndpointConnection.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/InstanceName" + }, + { + "$ref": "#/parameters/PrivateEndpointConnectionName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "properties", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + }, + "description": "The intended state of private endpoint connection." + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "The state of private endpoint connection was updated successfully.", + "headers": { + "Retry-After": { + "description": "(specified only if operation does not finish synchronously) The recommended number of seconds to wait before calling the URI specified in Azure-AsyncOperation.", + "type": "integer" + }, + "Azure-AsyncOperation": { + "description": "(specified only if operation does not finish synchronously) The URI to poll for completion status. The response of this URI may be synchronous or asynchronous.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, + "delete": { + "tags": [ + "PrivateEndpointConnections" + ], + "operationId": "PrivateEndpointConnections_Delete", + "description": "Deletes the specified private endpoint connection associated with the attestation instance.", + "x-ms-examples": { + "AttestationInstanceDeletePrivateEndpointConnection": { + "$ref": "./examples/deletePrivateEndpointConnection.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/InstanceName" + }, + { + "$ref": "#/parameters/PrivateEndpointConnectionName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "The private endpoint connection was successfully deleted.", + "schema": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + }, + "202": { + "description": "The private endpoint connection is being deleted.", + "headers": { + "Retry-After": { + "description": "The recommended number of seconds to wait before calling the URI specified in the location header.", + "type": "integer" + }, + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + } + }, + "204": { + "description": "The private endpoint connection does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{instanceName}/privateLinkResources": { + "get": { + "tags": [ + "PrivateLinkResources" + ], + "operationId": "PrivateLinkResources_ListByProvider", + "description": "Gets the private link resources supported for the attestation instance.", + "x-ms-examples": { + "AttestationProviderListPrivateLinkResources": { + "$ref": "./examples/listPrivateLinkResources.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/InstanceName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "Successfully retrieved private link resources.", + "schema": { + "$ref": "#/definitions/PrivateLinkResourceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } } }, "definitions": { @@ -525,6 +749,14 @@ "attestUri": { "type": "string", "description": "Gets the uri of attestation service" + }, + "privateEndpointConnections": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/PrivateEndpointConnectionItem" + }, + "description": "List of private endpoint connections associated with the attestation provider." } } }, @@ -614,6 +846,178 @@ "$ref": "../../../../../common-types/rfcs/rfc7517.json#/definitions/JSONWebKeySet" } } + }, + "PrivateEndpointConnection": { + "properties": { + "properties": { + "$ref": "#/definitions/PrivateEndpointConnectionProperties", + "x-ms-client-flatten": true, + "description": "Resource properties." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Private endpoint connection resource.", + "x-ms-azure-resource": true + }, + "PrivateEndpointConnectionProperties": { + "properties": { + "privateEndpoint": { + "$ref": "#/definitions/PrivateEndpoint", + "description": "Properties of the private endpoint object." + }, + "privateLinkServiceConnectionState": { + "$ref": "#/definitions/PrivateLinkServiceConnectionState", + "description": "Approval state of the private link connection." + }, + "provisioningState": { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState", + "description": "Provisioning state of the private endpoint connection." + } + }, + "description": "Properties of the private endpoint connection resource." + }, + "PrivateEndpoint": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Full identifier of the private endpoint resource." + } + }, + "description": "Private endpoint object properties." + }, + "PrivateEndpointConnectionItem": { + "properties": { + "type": { + "type": "string", + "description": "Type of the connection item." + }, + "properties": { + "$ref": "#/definitions/PrivateLinkConnectionItemProperties" + } + }, + "description": "Private endpoint connection item." + }, + "PrivateLinkConnectionItemProperties": { + "type": "object", + "properties": { + "provisioningState": { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" + }, + "privateEndpoint": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Identifier for the endpoint" + } + } + }, + "privateLinkServiceConnectionState": { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + } + } + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "status": { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" + }, + "description": { + "type": "string", + "description": "The reason for approval/rejection of the connection." + }, + "actionsRequired": { + "type": "string", + "description": "A message indicating if changes on the service provider require any updates on the consumer." + } + }, + "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "PrivateEndpointServiceConnectionStatus": { + "type": "string", + "description": "The private endpoint connection status.", + "enum": [ + "Pending", + "Approved", + "Rejected" + ], + "x-ms-enum": { + "name": "PrivateEndpointServiceConnectionStatus", + "modelAsString": true + } + }, + "PrivateEndpointConnectionProvisioningState": { + "type": "string", + "readOnly": true, + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.", + "enum": [ + "Succeeded", + "Creating", + "Deleting", + "Failed" + ], + "x-ms-enum": { + "name": "PrivateEndpointConnectionProvisioningState", + "modelAsString": true + } + }, + "PrivateLinkResourceListResult": { + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + }, + "description": "A list of private link resources" + }, + "PrivateLinkResource": { + "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "A private link resource" + }, + "PrivateLinkResourceProperties": { + "properties": { + "groupId": { + "description": "Group identifier of private link resource.", + "type": "string", + "readOnly": true + }, + "requiredMembers": { + "description": "Required member names of private link resource.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + }, + "requiredZoneNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Required DNS zone names of the the private link resource." + } + }, + "description": "Properties of a private link resource." } }, "parameters": { @@ -623,6 +1027,23 @@ "required": true, "type": "string", "description": "Client API version. Current version is 2020-10-01" + }, + "PrivateEndpointConnectionName": { + "name": "privateEndpointConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the private endpoint connection associated with the attestation providers.", + "x-ms-parameter-location": "method" + }, + "InstanceName": { + "name": "instanceName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9-]{3,24}$", + "description": "The name of the attestation instance.", + "x-ms-parameter-location": "method" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json new file mode 100644 index 000000000000..53d70ecd9d1a --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "sample-group", + "instanceName": "sample-instance", + "privateEndpointConnectionName": "sample-pec", + "api-version": "2018-02-14" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", + "name": "sample-pec", + "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", + "properties": { + "provisioningState": "Disconnected" + } + } + }, + "202": { + "headers": { + "Retry-After": "60", + "Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec?operationid=25334578" + } + }, + "204": {} + } +} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json new file mode 100644 index 000000000000..8f303a9c6246 --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "sample-group", + "instanceName": "sample-instance", + "privateEndpointConnectionName": "sample-pec", + "api-version": "2018-02-14" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", + "name": "sample-pec", + "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "This was automatically approved by user1234@contoso.com", + "actionRequired": "None" + } + } + } + } + } +} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json new file mode 100644 index 000000000000..74026f1a277e --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "sample-group", + "instanceName": "sampleinstance", + "api-version": "2018-02-14" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-resource-group/providers/Microsoft.Attestation/attestationProviders/sample-provider/privateLinkResources", + "name": "instance", + "type": "Microsoft.Attestation/attestationProviders/privateLinkResources" + } + ] + } + } + } +} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json new file mode 100644 index 000000000000..6aae58f33fbe --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "sample-group", + "instanceName": "sample-instance", + "privateEndpointConnectionName": "sample-pec", + "api-version": "2018-02-14", + "properties": { + "properties": { + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "My name is Joe and I'm approving this." + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", + "name": "sample-pec", + "type": "Microsoft.Attesation/attestationProviders/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "My name is Joe and I'm approving this.", + "actionRequired": "None" + } + } + } + } + } +} From f46feff0538dd24d1c1ef20f7ffcc5c7ddae4400 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 25 Nov 2020 15:24:44 -0800 Subject: [PATCH 02/26] Added missing 'resource' type --- .../stable/2020-10-01/attestation.json | 92 ++++++++++++------- 1 file changed, 58 insertions(+), 34 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 10574acdf8ff..862f230f0543 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "AttestationManagementClient", - "description": "Various APIs for managing resources in attestation service. This primarily encompasses per-instance instance management.", + "description": "Various APIs for managing resources in attestation service. This primarily encompasses per-provider management.", "version": "2020-10-01" }, "host": "management.azure.com", @@ -80,11 +80,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "name": "providerName", - "in": "path", - "required": true, - "type": "string", - "description": "Name of the attestation service instance" + "$ref": "#/parameters/ProviderName" }, { "$ref": "#/parameters/ApiVersionParameter" @@ -92,7 +88,7 @@ ], "responses": { "200": { - "description": "The status of the specified attestation service instance", + "description": "The status of the specified attestation provider", "schema": { "$ref": "#/definitions/AttestationProvider" } @@ -110,7 +106,7 @@ "AttestationProviders" ], "operationId": "AttestationProviders_Create", - "description": "Creates a new Attestation Provider instance.", + "description": "Creates a new Attestation Provider.", "x-ms-examples": { "AttestationProviders_Create": { "$ref": "./examples/Create_AttestationProvider.json" @@ -128,7 +124,7 @@ "in": "path", "required": true, "type": "string", - "description": "Name of the attestation service instance." + "description": "Name of the attestation provider." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -188,7 +184,7 @@ "in": "path", "required": true, "type": "string", - "description": "Name of the attestation service instance." + "description": "Name of the attestation provider." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -422,15 +418,15 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{instanceName}/privateEndpointConnections/{privateEndpointConnectionName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateEndpointConnections/{privateEndpointConnectionName}": { "get": { "tags": [ "PrivateEndpointConnections" ], "operationId": "PrivateEndpointConnections_Get", - "description": "Gets the specified private endpoint connection associated with the attestation instance.", + "description": "Gets the specified private endpoint connection associated with the attestation provider.", "x-ms-examples": { - "AttestationInstanceGetPrivateEndpointConnection": { + "AttestationProviderGetPrivateEndpointConnection": { "$ref": "./examples/getPrivateEndpointConnection.json" } }, @@ -442,7 +438,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/InstanceName" + "$ref": "#/parameters/ProviderName" }, { "$ref": "#/parameters/PrivateEndpointConnectionName" @@ -474,9 +470,9 @@ "PrivateEndpointConnections" ], "operationId": "PrivateEndpointConnections_Put", - "description": "Updates the specified private endpoint connection associated with the attestation instance.", + "description": "Updates the specified private endpoint connection associated with the attestation provider.", "x-ms-examples": { - "AttestationInstancePutPrivateEndpointConnection": { + "AttestationProviderPutPrivateEndpointConnection": { "$ref": "./examples/putPrivateEndpointConnection.json" } }, @@ -488,7 +484,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/InstanceName" + "$ref": "#/parameters/ProviderName" }, { "$ref": "#/parameters/PrivateEndpointConnectionName" @@ -518,6 +514,7 @@ "headers": { "Retry-After": { "description": "(specified only if operation does not finish synchronously) The recommended number of seconds to wait before calling the URI specified in Azure-AsyncOperation.", + "format": "int32", "type": "integer" }, "Azure-AsyncOperation": { @@ -542,9 +539,9 @@ "PrivateEndpointConnections" ], "operationId": "PrivateEndpointConnections_Delete", - "description": "Deletes the specified private endpoint connection associated with the attestation instance.", + "description": "Deletes the specified private endpoint connection associated with the attestation provider.", "x-ms-examples": { - "AttestationInstanceDeletePrivateEndpointConnection": { + "AttestationProviderDeletePrivateEndpointConnection": { "$ref": "./examples/deletePrivateEndpointConnection.json" } }, @@ -556,7 +553,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/InstanceName" + "$ref": "#/parameters/ProviderName" }, { "$ref": "#/parameters/PrivateEndpointConnectionName" @@ -580,6 +577,7 @@ "headers": { "Retry-After": { "description": "The recommended number of seconds to wait before calling the URI specified in the location header.", + "format": "int32", "type": "integer" }, "Location": { @@ -601,13 +599,13 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{instanceName}/privateLinkResources": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateLinkResources": { "get": { "tags": [ "PrivateLinkResources" ], "operationId": "PrivateLinkResources_ListByProvider", - "description": "Gets the private link resources supported for the attestation instance.", + "description": "Gets the private link resources supported for the provider.", "x-ms-examples": { "AttestationProviderListPrivateLinkResources": { "$ref": "./examples/listPrivateLinkResources.json" @@ -621,7 +619,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/InstanceName" + "$ref": "#/parameters/ProviderName" }, { "$ref": "#/parameters/ApiVersionParameter" @@ -731,7 +729,7 @@ "properties": { "trustModel": { "type": "string", - "description": "Trust model for the attestation service instance." + "description": "Trust model for the attestation provider." }, "status": { "type": "string", @@ -801,7 +799,7 @@ } }, "AttestationServicePatchParams": { - "description": "Parameters for patching an attestation service instance", + "description": "Parameters for patching an attestation provider", "x-ms-azure-resource": true, "properties": { "tags": { @@ -809,12 +807,12 @@ "additionalProperties": { "type": "string" }, - "description": "The tags that will be assigned to the attestation service instance." + "description": "The tags that will be assigned to the attestation provider." } } }, "AttestationServiceCreationParams": { - "description": "Parameters for creating an attestation service instance", + "description": "Parameters for creating an attestation provider", "required": [ "location", "properties" @@ -823,23 +821,23 @@ "properties": { "location": { "type": "string", - "description": "The supported Azure location where the attestation service instance should be created." + "description": "The supported Azure location where the attestation provider should be created." }, "tags": { "type": "object", "additionalProperties": { "type": "string" }, - "description": "The tags that will be assigned to the attestation service instance." + "description": "The tags that will be assigned to the attestation provider." }, "properties": { "$ref": "#/definitions/AttestationServiceCreationSpecificParams", - "description": "Properties of the attestation service instance" + "description": "Properties of the attestation provider" } } }, "AttestationServiceCreationSpecificParams": { - "description": "Client supplied parameters used to create a new attestation service instance.", + "description": "Client supplied parameters used to create a new attestation provider.", "properties": { "policySigningCertificates": { "description": "JSON Web Key Set defining a set of X.509 Certificates that will represent the parent certificate for the signing certificate used for policy operations", @@ -1018,6 +1016,32 @@ } }, "description": "Properties of a private link resource." + }, + "Resource": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified identifier of the attestation provider." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Name of the attestation provider." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type of the attestation provider." + }, + "location": { + "readOnly": true, + "type": "string", + "description": "Azure location of the attestation provider." + } + }, + "description": "Attestation resource", + "x-ms-azure-resource": true } }, "parameters": { @@ -1036,13 +1060,13 @@ "description": "Name of the private endpoint connection associated with the attestation providers.", "x-ms-parameter-location": "method" }, - "InstanceName": { - "name": "instanceName", + "ProviderName": { + "name": "providerName", "in": "path", "required": true, "type": "string", "pattern": "^[a-zA-Z0-9-]{3,24}$", - "description": "The name of the attestation instance.", + "description": "The name of the attestation provider.", "x-ms-parameter-location": "method" } } From 7f397976325e0d69f58f0c05475825ffcd82c7df Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 25 Nov 2020 15:32:30 -0800 Subject: [PATCH 03/26] Fixed a bunch of validation errors --- .../2020-10-01/examples/deletePrivateEndpointConnection.json | 2 +- .../2020-10-01/examples/getPrivateEndpointConnection.json | 4 ++-- .../2020-10-01/examples/putPrivateEndpointConnection.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json index 53d70ecd9d1a..71cefb92516c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "sample-group", - "instanceName": "sample-instance", + "providerName": "sample-instance", "privateEndpointConnectionName": "sample-pec", "api-version": "2018-02-14" }, diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json index 8f303a9c6246..fd40d5b5aeb2 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "sample-group", - "instanceName": "sample-instance", + "providerName": "sample-instance", "privateEndpointConnectionName": "sample-pec", "api-version": "2018-02-14" }, @@ -20,7 +20,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "This was automatically approved by user1234@contoso.com", - "actionRequired": "None" + "actionsRequired": "None" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json index 6aae58f33fbe..755f00901b3b 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "sample-group", - "instanceName": "sample-instance", + "providerName": "sample-instance", "privateEndpointConnectionName": "sample-pec", "api-version": "2018-02-14", "properties": { @@ -28,7 +28,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "My name is Joe and I'm approving this.", - "actionRequired": "None" + "actionsRequired": "None" } } } From cf6121ee9151fe8bd969734d3822d6ad74f52964 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 25 Nov 2020 15:40:38 -0800 Subject: [PATCH 04/26] Fixed a bunch of validation errors --- .../stable/2020-10-01/attestation.json | 6 +++++- .../2020-10-01/examples/listPrivateLinkResources.json | 2 +- .../2020-10-01/examples/putPrivateEndpointConnection.json | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 862f230f0543..e212a0c51c02 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -80,7 +80,11 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ProviderName" + "name": "providerName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the attestation provider." }, { "$ref": "#/parameters/ApiVersionParameter" diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json index 74026f1a277e..7d526739114c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "sample-group", - "instanceName": "sampleinstance", + "providerName": "sampleinstance", "api-version": "2018-02-14" }, "responses": { diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json index 755f00901b3b..a770199ce4cb 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json @@ -8,7 +8,6 @@ "properties": { "properties": { "privateLinkServiceConnectionState": { - "status": "Approved", "description": "My name is Joe and I'm approving this." } } From fb765140fdf87e723b930a122220e60f24f80c7e Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 25 Nov 2020 16:12:10 -0800 Subject: [PATCH 05/26] Undid track 2 python sdk for now --- specification/attestation/data-plane/readme.python.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/specification/attestation/data-plane/readme.python.md b/specification/attestation/data-plane/readme.python.md index 08c7d88909ff..f8ef34bfe568 100644 --- a/specification/attestation/data-plane/readme.python.md +++ b/specification/attestation/data-plane/readme.python.md @@ -16,14 +16,6 @@ python: clear-output-folder: true ``` -### Python multi-api - -Generate all API versions currently shipped for this package - -```yaml $(python) && $(multiapi) -batch: - - tag: package-2020-10-01 -``` ``` yaml $(python) && $(python-mode) == 'update' python: From fd547ffee007f5292530f381a78e04ceddce72b1 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 09:54:13 -0800 Subject: [PATCH 06/26] Backed out data-plane changes from this pull request --- .../stable/2020-10-01/attestation.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json index f2c1744739d2..e82086d63342 100644 --- a/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/data-plane/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -911,10 +911,6 @@ "draftPolicyForAttestation": { "description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.", "type": "string" - }, - "nonce": { - "description": "Nonce for incoming request - emitted in the generated attestation token", - "type": "string" } } }, @@ -938,10 +934,6 @@ "draftPolicyForAttestation": { "description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.", "type": "string" - }, - "nonce": { - "description": "Nonce for incoming request - emitted in the generated attestation token", - "type": "string" } } }, From 651daf8861098b2bef3845fe0775bf8049eed01a Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 11:43:16 -0800 Subject: [PATCH 07/26] Added privateEndpointConnection_list API --- .../stable/2020-10-01/attestation.json | 57 +++++++++++++++++++ .../listPrivateEndpointConnections.json | 32 +++++++++++ .../resource-manager/readme.python.md | 39 ++++++++++--- 3 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index e212a0c51c02..8098e5c76a62 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -647,6 +647,51 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateEndpointConnections": { + "get": { + "tags": [ + "PrivateEndpointConnections" + ], + "operationId": "PrivateEndpointConnections_ListByProvider", + "description": "Gets the private link resources supported for the provider.", + "x-ms-examples": { + "AttestationProviderListPrivateEndpointConnections": { + "$ref": "./examples/listPrivateEndpointConnections.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ProviderName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "Successfully retrieved private link resources.", + "schema": { + "$ref": "#/definitions/PrivateLinkResourceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } } }, "definitions": { @@ -941,6 +986,18 @@ }, "description": "A collection of information about the state of the connection between service consumer and provider." }, + "PrivateEndpointConnectionsListResult": { + "properties": { + "value": { + "type": "array", + "description": "Array of private endpoint connections", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + }, + "description": "A list of private endpoint connections" + }, "PrivateEndpointServiceConnectionStatus": { "type": "string", "description": "The private endpoint connection status.", diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json new file mode 100644 index 000000000000..eeb8c70b44da --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "sample-group", + "providerName": "sampleinstance", + "api-version": "2018-02-14" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", + "name": "sample-pec", + "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "This was automatically approved by user1234@contoso.com", + "actionsRequired": "None" + } + } + } + ] + } + } + } +} diff --git a/specification/attestation/resource-manager/readme.python.md b/specification/attestation/resource-manager/readme.python.md index 9e387739adc7..15baf0c09bda 100644 --- a/specification/attestation/resource-manager/readme.python.md +++ b/specification/attestation/resource-manager/readme.python.md @@ -6,18 +6,39 @@ Use `--python-mode=update` if you already have a setup.py and just want to updat ``` yaml $(python) python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.attestation - package-name: azure-mgmt-attestation - package-version: 0.1.0 - clear-output-folder: true +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +payload-flattening-threshold: 2 +namespace: azure.mgmt.attestation +no-namespace-folders: true +credential-scopes: https://management.azure.com +package-name: azure-mgmt-attestation +package-version: 0.1.0 +clear-output-folder: true +``` +``` yaml +batch: + - tag: package-2018-09-01 + - tag: package-2020-10-01 + - multiapiscript: true +``` + +### Tag: release_2018-09-01-preview +``` yaml +namespace: azure.mgmt.attestation +output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/azure/mgmt/attestation + ``` + +### Tag: release_2020-10-01 +``` yaml +namespace: azure.mgmt.attestation +output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/ + +``` + ``` yaml $(python) && $(python-mode) == 'update' python: - no-namespace-folders: true output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/azure/mgmt/attestation ``` ``` yaml $(python) && $(python-mode) == 'create' From 1b09be3e767b680fe3b5a2b6742f25cee65e6283 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 11:45:29 -0800 Subject: [PATCH 08/26] Removed two added lines --- specification/attestation/data-plane/readme.python.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/attestation/data-plane/readme.python.md b/specification/attestation/data-plane/readme.python.md index f8ef34bfe568..edcb0a792127 100644 --- a/specification/attestation/data-plane/readme.python.md +++ b/specification/attestation/data-plane/readme.python.md @@ -15,8 +15,6 @@ python: package-version: 0.1.0 clear-output-folder: true ``` - - ``` yaml $(python) && $(python-mode) == 'update' python: no-namespace-folders: true From 09b8a23ca54e5e45889aaf544c5e58d4389c9bfc Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 11:52:52 -0800 Subject: [PATCH 09/26] Updated --- .../stable/2020-10-01/attestation.json | 13 ++++++++----- .../examples/listPrivateEndpointConnections.json | 13 +------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 8098e5c76a62..75d6c3937afd 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -1028,11 +1028,14 @@ }, "PrivateLinkResourceListResult": { "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } } } }, diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json index eeb8c70b44da..b38b64b428e9 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json @@ -12,18 +12,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", "name": "sample-pec", - "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "This was automatically approved by user1234@contoso.com", - "actionsRequired": "None" - } - } + "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections" } ] } From 11619571d9cb28d2f01292e103bc3b3629084e59 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 12:02:19 -0800 Subject: [PATCH 10/26] corrected swagger schema for privatelinkresourcelistresult --- .../stable/2020-10-01/attestation.json | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 75d6c3937afd..b88876f11c6f 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -1027,15 +1027,13 @@ } }, "PrivateLinkResourceListResult": { + "type": "object", "properties": { - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" } } }, From 8edb50b4d7ed91f4b8a5e985c1c790876692a013 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Nov 2020 14:34:40 -0800 Subject: [PATCH 11/26] Updated readme.python.md; Fixed some swagger errors in attestation.json --- .../stable/2020-10-01/attestation.json | 32 ++----------------- .../resource-manager/readme.python.md | 31 +++++++++--------- 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index b88876f11c6f..8ccbfbf0bfea 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -681,7 +681,7 @@ "200": { "description": "Successfully retrieved private link resources.", "schema": { - "$ref": "#/definitions/PrivateLinkResourceListResult" + "$ref": "#/definitions/PrivateEndpointConnectionsListResult" } }, "default": { @@ -904,7 +904,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ], "description": "Private endpoint connection resource.", @@ -1049,7 +1049,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ], "description": "A private link resource" @@ -1078,32 +1078,6 @@ } }, "description": "Properties of a private link resource." - }, - "Resource": { - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified identifier of the attestation provider." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Name of the attestation provider." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type of the attestation provider." - }, - "location": { - "readOnly": true, - "type": "string", - "description": "Azure location of the attestation provider." - } - }, - "description": "Attestation resource", - "x-ms-azure-resource": true } }, "parameters": { diff --git a/specification/attestation/resource-manager/readme.python.md b/specification/attestation/resource-manager/readme.python.md index 15baf0c09bda..1680d8d4aff2 100644 --- a/specification/attestation/resource-manager/readme.python.md +++ b/specification/attestation/resource-manager/readme.python.md @@ -5,16 +5,16 @@ Please also specify `--python-sdks-folder= Date: Mon, 30 Nov 2020 21:38:12 -0800 Subject: [PATCH 12/26] Added back name and id properties to PrivateEndpointConnectionItem --- .../stable/2020-10-01/attestation.json | 9 +++++++++ .../examples/getPrivateEndpointConnection.json | 2 +- .../examples/putPrivateEndpointConnection.json | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 8ccbfbf0bfea..e6c34430638c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -938,7 +938,16 @@ "description": "Private endpoint object properties." }, "PrivateEndpointConnectionItem": { + "type": "object", "properties": { + "name": { + "type": "string", + "description": "Name of the connection item" + }, + "id": { + "type": "string", + "description": "ID of the connection item" + }, "type": { "type": "string", "description": "Type of the connection item." diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json index fd40d5b5aeb2..029069c48d60 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json @@ -20,7 +20,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "This was automatically approved by user1234@contoso.com", - "actionsRequired": "None" + "actionRequired": "None" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json index a770199ce4cb..755f00901b3b 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json @@ -8,6 +8,7 @@ "properties": { "properties": { "privateLinkServiceConnectionState": { + "status": "Approved", "description": "My name is Joe and I'm approving this." } } From 60dd15a6f5da6c9d0b1e32559885eb6a05f57c9b Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Tue, 1 Dec 2020 04:49:55 -0800 Subject: [PATCH 13/26] Fixed swagger validation issues --- .../2020-10-01/examples/getPrivateEndpointConnection.json | 2 +- .../2020-10-01/examples/putPrivateEndpointConnection.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json index 029069c48d60..fd40d5b5aeb2 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json @@ -20,7 +20,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "This was automatically approved by user1234@contoso.com", - "actionRequired": "None" + "actionsRequired": "None" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json index 755f00901b3b..a770199ce4cb 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json @@ -8,7 +8,6 @@ "properties": { "properties": { "privateLinkServiceConnectionState": { - "status": "Approved", "description": "My name is Joe and I'm approving this." } } From eb6155587b6751ff00cb395e532a95550c324bb7 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Tue, 1 Dec 2020 14:45:54 -0800 Subject: [PATCH 14/26] Data Plane SDK for python fixes --- specification/attestation/resource-manager/readme.python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/readme.python.md b/specification/attestation/resource-manager/readme.python.md index 1680d8d4aff2..53b67b49883d 100644 --- a/specification/attestation/resource-manager/readme.python.md +++ b/specification/attestation/resource-manager/readme.python.md @@ -12,7 +12,7 @@ payload-flattening-threshold: 2 namespace: azure.mgmt.attestation no-namespace-folders: true add-credential: true -credential-scopes: https://management.azure.com +credential-scopes: https://management.azure.com/.default package-name: azure-mgmt-attestation package-version: 0.1.0 ``` From d27f4468fd68a78d9a8fd625dc6e7e2f3ee1d409 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 3 Dec 2020 17:47:33 -0800 Subject: [PATCH 15/26] Removed 3 new APIs, leaving remaining changes --- .../stable/2020-10-01/attestation.json | 275 +----------------- .../deletePrivateEndpointConnection.json | 28 -- .../listPrivateEndpointConnections.json | 21 -- .../examples/listPrivateLinkResources.json | 21 -- .../putPrivateEndpointConnection.json | 36 --- 5 files changed, 2 insertions(+), 379 deletions(-) delete mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json delete mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json delete mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json delete mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index e6c34430638c..b94b2568233c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -421,277 +421,6 @@ } } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateEndpointConnections/{privateEndpointConnectionName}": { - "get": { - "tags": [ - "PrivateEndpointConnections" - ], - "operationId": "PrivateEndpointConnections_Get", - "description": "Gets the specified private endpoint connection associated with the attestation provider.", - "x-ms-examples": { - "AttestationProviderGetPrivateEndpointConnection": { - "$ref": "./examples/getPrivateEndpointConnection.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ProviderName" - }, - { - "$ref": "#/parameters/PrivateEndpointConnectionName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "Private endpoint connection successfully returned.", - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - }, - "put": { - "tags": [ - "PrivateEndpointConnections" - ], - "operationId": "PrivateEndpointConnections_Put", - "description": "Updates the specified private endpoint connection associated with the attestation provider.", - "x-ms-examples": { - "AttestationProviderPutPrivateEndpointConnection": { - "$ref": "./examples/putPrivateEndpointConnection.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ProviderName" - }, - { - "$ref": "#/parameters/PrivateEndpointConnectionName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "properties", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - }, - "description": "The intended state of private endpoint connection." - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "The state of private endpoint connection was updated successfully.", - "headers": { - "Retry-After": { - "description": "(specified only if operation does not finish synchronously) The recommended number of seconds to wait before calling the URI specified in Azure-AsyncOperation.", - "format": "int32", - "type": "integer" - }, - "Azure-AsyncOperation": { - "description": "(specified only if operation does not finish synchronously) The URI to poll for completion status. The response of this URI may be synchronous or asynchronous.", - "type": "string" - } - }, - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - }, - "delete": { - "tags": [ - "PrivateEndpointConnections" - ], - "operationId": "PrivateEndpointConnections_Delete", - "description": "Deletes the specified private endpoint connection associated with the attestation provider.", - "x-ms-examples": { - "AttestationProviderDeletePrivateEndpointConnection": { - "$ref": "./examples/deletePrivateEndpointConnection.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ProviderName" - }, - { - "$ref": "#/parameters/PrivateEndpointConnectionName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "The private endpoint connection was successfully deleted.", - "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" - } - }, - "202": { - "description": "The private endpoint connection is being deleted.", - "headers": { - "Retry-After": { - "description": "The recommended number of seconds to wait before calling the URI specified in the location header.", - "format": "int32", - "type": "integer" - }, - "Location": { - "description": "The URI to poll for completion status.", - "type": "string" - } - } - }, - "204": { - "description": "The private endpoint connection does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateLinkResources": { - "get": { - "tags": [ - "PrivateLinkResources" - ], - "operationId": "PrivateLinkResources_ListByProvider", - "description": "Gets the private link resources supported for the provider.", - "x-ms-examples": { - "AttestationProviderListPrivateLinkResources": { - "$ref": "./examples/listPrivateLinkResources.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ProviderName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "Successfully retrieved private link resources.", - "schema": { - "$ref": "#/definitions/PrivateLinkResourceListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}/privateEndpointConnections": { - "get": { - "tags": [ - "PrivateEndpointConnections" - ], - "operationId": "PrivateEndpointConnections_ListByProvider", - "description": "Gets the private link resources supported for the provider.", - "x-ms-examples": { - "AttestationProviderListPrivateEndpointConnections": { - "$ref": "./examples/listPrivateEndpointConnections.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ProviderName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "Successfully retrieved private link resources.", - "schema": { - "$ref": "#/definitions/PrivateEndpointConnectionsListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - } } }, "definitions": { @@ -982,7 +711,7 @@ "type": "object", "properties": { "status": { - "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" + "$ref": "#/definitions/PrivateEndpointServiceConnectionStatus" }, "description": { "type": "string", @@ -1023,7 +752,7 @@ "PrivateEndpointConnectionProvisioningState": { "type": "string", "readOnly": true, - "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.", + "description": "The current provisioning state.", "enum": [ "Succeeded", "Creating", diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json deleted file mode 100644 index 71cefb92516c..000000000000 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/deletePrivateEndpointConnection.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "sample-group", - "providerName": "sample-instance", - "privateEndpointConnectionName": "sample-pec", - "api-version": "2018-02-14" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", - "name": "sample-pec", - "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", - "properties": { - "provisioningState": "Disconnected" - } - } - }, - "202": { - "headers": { - "Retry-After": "60", - "Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec?operationid=25334578" - } - }, - "204": {} - } -} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json deleted file mode 100644 index b38b64b428e9..000000000000 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateEndpointConnections.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "sample-group", - "providerName": "sampleinstance", - "api-version": "2018-02-14" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", - "name": "sample-pec", - "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections" - } - ] - } - } - } -} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json deleted file mode 100644 index 7d526739114c..000000000000 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/listPrivateLinkResources.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "sample-group", - "providerName": "sampleinstance", - "api-version": "2018-02-14" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-resource-group/providers/Microsoft.Attestation/attestationProviders/sample-provider/privateLinkResources", - "name": "instance", - "type": "Microsoft.Attestation/attestationProviders/privateLinkResources" - } - ] - } - } - } -} diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json deleted file mode 100644 index a770199ce4cb..000000000000 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/putPrivateEndpointConnection.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "sample-group", - "providerName": "sample-instance", - "privateEndpointConnectionName": "sample-pec", - "api-version": "2018-02-14", - "properties": { - "properties": { - "privateLinkServiceConnectionState": { - "description": "My name is Joe and I'm approving this." - } - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", - "name": "sample-pec", - "type": "Microsoft.Attesation/attestationProviders/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "My name is Joe and I'm approving this.", - "actionsRequired": "None" - } - } - } - } - } -} From d50d3ce8343801c929c1b7c21e9c522de86eb94d Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 3 Dec 2020 17:58:14 -0800 Subject: [PATCH 16/26] Removed one additional file --- .../getPrivateEndpointConnection.json | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json deleted file mode 100644 index fd40d5b5aeb2..000000000000 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/examples/getPrivateEndpointConnection.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "sample-group", - "providerName": "sample-instance", - "privateEndpointConnectionName": "sample-pec", - "api-version": "2018-02-14" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Attestation/attestationProviders/sample-instance/privateEndpointConnections/sample-pec", - "name": "sample-pec", - "type": "Microsoft.Attestation/attestationProviders/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pe" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "This was automatically approved by user1234@contoso.com", - "actionsRequired": "None" - } - } - } - } - } -} From 603178ee473aea8d027692e2b54434a70cda114a Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 3 Dec 2020 21:13:36 -0800 Subject: [PATCH 17/26] Fixed package name comment --- specification/attestation/resource-manager/readme.python.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/readme.python.md b/specification/attestation/resource-manager/readme.python.md index 53b67b49883d..9a4697081675 100644 --- a/specification/attestation/resource-manager/readme.python.md +++ b/specification/attestation/resource-manager/readme.python.md @@ -16,6 +16,7 @@ credential-scopes: https://management.azure.com/.default package-name: azure-mgmt-attestation package-version: 0.1.0 ``` + ``` yaml batch: - tag: package-2018-09-01 @@ -29,7 +30,7 @@ clear-output-folder: false perform-load: false ``` -### Tag: package-2018-09-01 +### Tag: package-2020-10-01 ``` yaml $(tag) == 'package-2020-10-01' clear-output-folder: true output-folder: $(python-sdks-folder)/attestation/azure-mgmt-attestation/azure/mgmt/attestation/v2020_10_01 From 0032923544b8ed8947433d204ccef50069b89085 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Fri, 4 Dec 2020 07:41:48 -0800 Subject: [PATCH 18/26] Dummy hcange to restart pipelines --- .../Microsoft.Attestation/stable/2020-10-01/attestation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index b94b2568233c..a7db11f27e69 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -841,7 +841,7 @@ "type": "string", "pattern": "^[a-zA-Z0-9-]{3,24}$", "description": "The name of the attestation provider.", - "x-ms-parameter-location": "method" + "x-ms-parameter-location": "method" } } } From 8db4eb36523ebeaa3839336b65132d8597664303 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Fri, 4 Dec 2020 07:45:02 -0800 Subject: [PATCH 19/26] Fixed prettier issue --- .../Microsoft.Attestation/stable/2020-10-01/attestation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index a7db11f27e69..b94b2568233c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -841,7 +841,7 @@ "type": "string", "pattern": "^[a-zA-Z0-9-]{3,24}$", "description": "The name of the attestation provider.", - "x-ms-parameter-location": "method" + "x-ms-parameter-location": "method" } } } From d9fae0295792259bb6aae59da1b6db3b0017257d Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Fri, 4 Dec 2020 10:58:43 -0800 Subject: [PATCH 20/26] Added missing enum value --- .../Microsoft.Attestation/stable/2020-10-01/attestation.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index b94b2568233c..fa2a55d26b50 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -742,7 +742,8 @@ "enum": [ "Pending", "Approved", - "Rejected" + "Rejected", + "Disconnected" ], "x-ms-enum": { "name": "PrivateEndpointServiceConnectionStatus", From ea7a6d48c4eb72a00b0487d93848ea6b8343be44 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 9 Dec 2020 10:17:03 -0800 Subject: [PATCH 21/26] Use private link definitions from private link swagger --- .../stable/2020-10-01/attestation.json | 96 +++---------------- 1 file changed, 15 insertions(+), 81 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index fa2a55d26b50..52453df5a772 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -623,70 +623,15 @@ } } }, - "PrivateEndpointConnection": { - "properties": { - "properties": { - "$ref": "#/definitions/PrivateEndpointConnectionProperties", - "x-ms-client-flatten": true, - "description": "Resource properties." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" - } - ], - "description": "Private endpoint connection resource.", - "x-ms-azure-resource": true - }, "PrivateEndpointConnectionProperties": { "properties": { - "privateEndpoint": { - "$ref": "#/definitions/PrivateEndpoint", - "description": "Properties of the private endpoint object." - }, - "privateLinkServiceConnectionState": { - "$ref": "#/definitions/PrivateLinkServiceConnectionState", - "description": "Approval state of the private link connection." - }, "provisioningState": { - "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState", + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProvisioningState", "description": "Provisioning state of the private endpoint connection." } }, "description": "Properties of the private endpoint connection resource." }, - "PrivateEndpoint": { - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Full identifier of the private endpoint resource." - } - }, - "description": "Private endpoint object properties." - }, - "PrivateEndpointConnectionItem": { - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "Name of the connection item" - }, - "id": { - "type": "string", - "description": "ID of the connection item" - }, - "type": { - "type": "string", - "description": "Type of the connection item." - }, - "properties": { - "$ref": "#/definitions/PrivateLinkConnectionItemProperties" - } - }, - "description": "Private endpoint connection item." - }, "PrivateLinkConnectionItemProperties": { "type": "object", "properties": { @@ -703,26 +648,30 @@ } }, "privateLinkServiceConnectionState": { - "$ref": "#/definitions/PrivateLinkServiceConnectionState" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" } } }, - "PrivateLinkServiceConnectionState": { + "PrivateEndpointConnectionItem": { "type": "object", "properties": { - "status": { - "$ref": "#/definitions/PrivateEndpointServiceConnectionStatus" + "name": { + "type": "string", + "description": "Name of the connection item" }, - "description": { + "id": { "type": "string", - "description": "The reason for approval/rejection of the connection." + "description": "ID of the connection item" }, - "actionsRequired": { + "type": { "type": "string", - "description": "A message indicating if changes on the service provider require any updates on the consumer." + "description": "Type of the connection item." + }, + "properties": { + "$ref": "#/definitions/PrivateLinkConnectionItemProperties" } }, - "description": "A collection of information about the state of the connection between service consumer and provider." + "description": "Private endpoint connection item." }, "PrivateEndpointConnectionsListResult": { "properties": { @@ -730,7 +679,7 @@ "type": "array", "description": "Array of private endpoint connections", "items": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" } } }, @@ -750,21 +699,6 @@ "modelAsString": true } }, - "PrivateEndpointConnectionProvisioningState": { - "type": "string", - "readOnly": true, - "description": "The current provisioning state.", - "enum": [ - "Succeeded", - "Creating", - "Deleting", - "Failed" - ], - "x-ms-enum": { - "name": "PrivateEndpointConnectionProvisioningState", - "modelAsString": true - } - }, "PrivateLinkResourceListResult": { "type": "object", "properties": { From c0e4aeab3d973e6de45f1906d89f98c1db835dee Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 9 Dec 2020 10:26:05 -0800 Subject: [PATCH 22/26] Updated --- .../Microsoft.Attestation/stable/2020-10-01/attestation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index 52453df5a772..d926895f686d 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -636,7 +636,7 @@ "type": "object", "properties": { "provisioningState": { - "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProvisioningState" }, "privateEndpoint": { "type": "object", From bcdf2735d99a5fbd9698d9d58d4905926d068825 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Wed, 9 Dec 2020 10:46:31 -0800 Subject: [PATCH 23/26] Updated --- .../stable/2020-10-01/attestation.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index d926895f686d..f75a1666744f 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -620,6 +620,14 @@ "policySigningCertificates": { "description": "JSON Web Key Set defining a set of X.509 Certificates that will represent the parent certificate for the signing certificate used for policy operations", "$ref": "../../../../../common-types/rfcs/rfc7517.json#/definitions/JSONWebKeySet" + }, + "privateEndpointConnections": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/PrivateEndpointConnectionItem" + }, + "description": "List of private endpoint connections associated with the attestation provider." } } }, From a5a75527a5d49b814b0186186dbb8c879282fbfb Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 10 Dec 2020 09:28:52 -0800 Subject: [PATCH 24/26] Pull request feedback --- .../stable/2020-10-01/attestation.json | 104 +----------------- 1 file changed, 2 insertions(+), 102 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index f75a1666744f..a9fe09faa755 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -530,7 +530,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/PrivateEndpointConnectionItem" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" }, "description": "List of private endpoint connections associated with the attestation provider." } @@ -625,7 +625,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/PrivateEndpointConnectionItem" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" }, "description": "List of private endpoint connections associated with the attestation provider." } @@ -659,106 +659,6 @@ "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" } } - }, - "PrivateEndpointConnectionItem": { - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "Name of the connection item" - }, - "id": { - "type": "string", - "description": "ID of the connection item" - }, - "type": { - "type": "string", - "description": "Type of the connection item." - }, - "properties": { - "$ref": "#/definitions/PrivateLinkConnectionItemProperties" - } - }, - "description": "Private endpoint connection item." - }, - "PrivateEndpointConnectionsListResult": { - "properties": { - "value": { - "type": "array", - "description": "Array of private endpoint connections", - "items": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" - } - } - }, - "description": "A list of private endpoint connections" - }, - "PrivateEndpointServiceConnectionStatus": { - "type": "string", - "description": "The private endpoint connection status.", - "enum": [ - "Pending", - "Approved", - "Rejected", - "Disconnected" - ], - "x-ms-enum": { - "name": "PrivateEndpointServiceConnectionStatus", - "modelAsString": true - } - }, - "PrivateLinkResourceListResult": { - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } - } - }, - "description": "A list of private link resources" - }, - "PrivateLinkResource": { - "properties": { - "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" - } - ], - "description": "A private link resource" - }, - "PrivateLinkResourceProperties": { - "properties": { - "groupId": { - "description": "Group identifier of private link resource.", - "type": "string", - "readOnly": true - }, - "requiredMembers": { - "description": "Required member names of private link resource.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true - }, - "requiredZoneNames": { - "type": "array", - "items": { - "type": "string" - }, - "description": "Required DNS zone names of the the private link resource." - } - }, - "description": "Properties of a private link resource." } }, "parameters": { From a3b1369f7860e654895649b781bc2402a3874b05 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Thu, 10 Dec 2020 10:05:02 -0800 Subject: [PATCH 25/26] Pull request feedback --- .../stable/2020-10-01/attestation.json | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index a9fe09faa755..c6a21f62a852 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -639,26 +639,6 @@ } }, "description": "Properties of the private endpoint connection resource." - }, - "PrivateLinkConnectionItemProperties": { - "type": "object", - "properties": { - "provisioningState": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProvisioningState" - }, - "privateEndpoint": { - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "Identifier for the endpoint" - } - } - }, - "privateLinkServiceConnectionState": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" - } - } } }, "parameters": { From cc41dab06e13436e29e40cb5e018dff6f1372ec9 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 4 Jan 2021 10:09:08 -0800 Subject: [PATCH 26/26] Fixed pull request feedback issue --- .../Microsoft.Attestation/stable/2020-10-01/attestation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json index c6a21f62a852..b14dfb4e68b1 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/stable/2020-10-01/attestation.json @@ -530,7 +530,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" }, "description": "List of private endpoint connections associated with the attestation provider." }