From b8165ef8d5cc6e423619fecfeb3597b53ca2bfe0 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Thu, 9 Dec 2021 23:42:53 -0800 Subject: [PATCH 01/15] Added group IDs array to PrivateEndpointConnection in v4 common type --- .../resource-management/v4/privatelinks.json | 189 ++++++++++++++++++ .../2020-03-01-preview/deviceupdate.json | 18 +- 2 files changed, 198 insertions(+), 9 deletions(-) create mode 100644 specification/common-types/resource-management/v4/privatelinks.json diff --git a/specification/common-types/resource-management/v4/privatelinks.json b/specification/common-types/resource-management/v4/privatelinks.json new file mode 100644 index 000000000000..568566fb78d3 --- /dev/null +++ b/specification/common-types/resource-management/v4/privatelinks.json @@ -0,0 +1,189 @@ +{ + "swagger": "2.0", + "info": { + "version": "4.0", + "title": "Common types" + }, + "paths": {}, + "definitions": { + "PrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The ARM identifier for Private Endpoint" + } + }, + "description": "The Private Endpoint resource." + }, + "PrivateEndpointConnection": { + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/PrivateEndpointConnectionProperties", + "x-ms-client-flatten": true, + "description": "Resource properties." + } + }, + "allOf": [ + { + "$ref": "./types.json#/definitions/Resource" + } + ], + "description": "The Private Endpoint Connection resource." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "$ref": "#/definitions/PrivateEndpoint", + "description": "The resource of private end point." + }, + "privateLinkServiceConnectionState": { + "$ref": "#/definitions/PrivateLinkServiceConnectionState", + "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "groupIds": { + "type": "array", + "description": "Array of group IDs", + "items": { + "type": "string" + } + }, + "provisioningState": { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState", + "description": "The provisioning state of the private endpoint connection resource." + } + }, + "required": [ + "privateLinkServiceConnectionState" + ], + "description": "Properties of the PrivateEndpointConnectProperties." + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "status": { + "$ref": "#/definitions/PrivateEndpointServiceConnectionStatus", + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service." + }, + "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": "The current provisioning state.", + "enum": [ + "Succeeded", + "Creating", + "Deleting", + "Failed" + ], + "x-ms-enum": { + "name": "PrivateEndpointConnectionProvisioningState", + "modelAsString": true + } + }, + "PrivateLinkResource": { + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "./types.json#/definitions/Resource" + } + ], + "description": "A private link resource" + }, + "PrivateLinkResourceProperties": { + "type": "object", + "properties": { + "groupId": { + "description": "The private link resource group id.", + "type": "string", + "readOnly": true + }, + "requiredMembers": { + "description": "The private link resource required member names.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + }, + "requiredZoneNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The private link resource Private link DNS zone name." + } + }, + "description": "Properties of a private link resource." + }, + "PrivateEndpointConnectionListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private endpoint connections", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + }, + "description": "List of private endpoint connection associated with the specified storage account" + }, + "PrivateLinkResourceListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + }, + "description": "A list of private link resources" + } + }, + "parameters": { + "PrivateEndpointConnectionName": { + "name": "privateEndpointConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the private endpoint connection associated with the Azure resource", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index 59dbf1d5971a..3b98a4237d58 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -675,7 +675,7 @@ "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnectionListResult" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnectionListResult" } }, "default": { @@ -716,14 +716,14 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -759,7 +759,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" }, { "name": "privateEndpointConnection", @@ -767,7 +767,7 @@ "description": "The parameters for creating a private endpoint connection.", "required": true, "schema": { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" } } ], @@ -775,7 +775,7 @@ "201": { "description": "The request was successful; the operation will complete asynchronously.", "schema": { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -815,7 +815,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { @@ -1489,7 +1489,7 @@ "type": "object", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateLinkResourceProperties" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateLinkResourceProperties" } ], "properties": { @@ -1636,7 +1636,7 @@ }, "remotePrivateLinkServiceConnectionState": { "description": "Remote private link service connection state", - "$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" }, "remotePrivateEndpointConnection": { "description": "Remote private endpoint connection details.", From 1cfe266709a38c271806b2520311107f7647e895 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Thu, 9 Dec 2021 23:49:31 -0800 Subject: [PATCH 02/15] Added private endpoint connections to the top level resource --- .../preview/2020-03-01-preview/deviceupdate.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index 3b98a4237d58..e7543e4f8259 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -1249,7 +1249,7 @@ "readOnly": true }, "publicNetworkAccess": { - "description": "Whether or not public network access is allowed for the container registry.", + "description": "Whether or not public network access is allowed for the account.", "default": "Enabled", "enum": [ "Enabled", @@ -1260,6 +1260,13 @@ "name": "PublicNetworkAccess", "modelAsString": true } + }, + "privateEndpointConnections": { + "description": "List of private endpoint connections associated with the account.", + "type": "array", + "items": { + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" + } } } }, From e4e1afa71699241d0c2777bf0caf51bff1334de2 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Thu, 9 Dec 2021 23:52:51 -0800 Subject: [PATCH 03/15] Updated examples --- .../examples/Accounts/Accounts_Create.json | 3 ++- .../2020-03-01-preview/examples/Accounts/Accounts_Get.json | 3 ++- .../2020-03-01-preview/examples/Accounts/Accounts_List.json | 3 ++- .../examples/Accounts/Accounts_Update.json | 6 ++++-- .../PrivateEndpointConnection_CreateOrUpdate.json | 5 ++++- .../PrivateEndpointConnection_Get.json | 5 ++++- .../PrivateEndpointConnection_ListByAccount.json | 5 ++++- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Create.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Create.json index 5d0b60514caa..352033bd5667 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Create.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Create.json @@ -18,7 +18,8 @@ "type": "Microsoft.DeviceUpdate/accounts", "properties": { "provisioningState": "Accepted", - "hostName": "contoso.api.adu.microsoft.com" + "hostName": "contoso.api.adu.microsoft.com", + "privateEndpointConnections": [] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json index 4300bc6ef27c..28e389f95a45 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json @@ -14,7 +14,8 @@ "type": "Microsoft.DeviceUpdate/accounts", "properties": { "provisioningState": "Succeeded", - "hostName": "contoso.api.adu.microsoft.com" + "hostName": "contoso.api.adu.microsoft.com", + "privateEndpointConnections": [] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json index dc2ccf525818..997046bbd3ac 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json @@ -16,7 +16,8 @@ "type": "Microsoft.DeviceUpdate/accounts", "properties": { "provisioningState": "Succeeded", - "hostName": "contoso.api.adu.microsoft.com" + "hostName": "contoso.api.adu.microsoft.com", + "privateEndpointConnections": [] } } ] diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json index f171ead35391..1f323c80dbeb 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json @@ -19,7 +19,8 @@ "type": "Microsoft.DeviceUpdate/accounts", "properties": { "provisioningState": "Succeeded", - "hostName": "contoso.api.adu.microsoft.com" + "hostName": "contoso.api.adu.microsoft.com", + "privateEndpointConnections": [] }, "tags": { "tagKey": "tagValue" @@ -39,7 +40,8 @@ }, "properties": { "provisioningState": "Created", - "hostName": "contoso.api.adu.microsoft.com" + "hostName": "contoso.api.adu.microsoft.com", + "privateEndpointConnections": [] }, "tags": { "tagKey": "tagValue" diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_CreateOrUpdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_CreateOrUpdate.json index fe22aa56d128..842d7e38a2f8 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_CreateOrUpdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_CreateOrUpdate.json @@ -29,7 +29,10 @@ "status": "Approved", "description": "Auto-Approved", "actionsRequired": "None" - } + }, + "groupIds": [ + "groupId" + ] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_Get.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_Get.json index 984a101661e4..95b8b6b97e86 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_Get.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_Get.json @@ -21,7 +21,10 @@ "status": "Approved", "description": "Auto-Approved", "actionsRequired": "None" - } + }, + "groupIds": [ + "groupId" + ] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_ListByAccount.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_ListByAccount.json index f69a44476aed..cfadb137c511 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_ListByAccount.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_ListByAccount.json @@ -22,7 +22,10 @@ "status": "Approved", "description": "Auto-Approved", "actionsRequired": "None" - } + }, + "groupIds": [ + "groupId" + ] } } ] From fc7fd351984b0adcacc3402c69e1cc75384de879 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 00:06:00 -0800 Subject: [PATCH 04/15] Added types.json to commopn-types/v4 --- .../resource-management/v4/types.json | 695 ++++++++++++++++++ 1 file changed, 695 insertions(+) create mode 100644 specification/common-types/resource-management/v4/types.json diff --git a/specification/common-types/resource-management/v4/types.json b/specification/common-types/resource-management/v4/types.json new file mode 100644 index 000000000000..5df3a9ddf957 --- /dev/null +++ b/specification/common-types/resource-management/v4/types.json @@ -0,0 +1,695 @@ +{ + "swagger": "2.0", + "info": { + "version": "4.0", + "title": "Common types" + }, + "paths": {}, + "definitions": { + "Resource": { + "title": "Resource", + "description": "Common fields that are returned in the response for all Azure Resource Manager resources", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" + }, + "systemData": { + "readOnly": true, + "type": "object", + "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", + "$ref": "#/definitions/systemData" + } + }, + "x-ms-azure-resource": true + }, + "AzureEntityResource": { + "x-ms-client-name": "AzureEntityResource", + "title": "Entity Resource", + "description": "The resource model definition for an Azure Resource Manager resource with an etag.", + "type": "object", + "properties": { + "etag": { + "type": "string", + "readOnly": true, + "description": "Resource Etag." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "TrackedResource": { + "title": "Tracked Resource", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + } + }, + "required": [ + "location" + ], + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "title": "Proxy Resource", + "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ResourceModelWithAllowedPropertySet": { + "description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "x-ms-mutability": [ + "read" + ], + "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" + }, + "type": { + "readOnly": true, + "type": "string", + "x-ms-mutability": [ + "read" + ], + "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + }, + "managedBy": { + "type": "string", + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." + }, + "kind": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", + "pattern": "^[-\\w\\._,\\(\\)]+$" + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "identity": { + "allOf": [ + { + "$ref": "#/definitions/Identity" + } + ] + }, + "sku": { + "allOf": [ + { + "$ref": "#/definitions/Sku" + } + ] + }, + "plan": { + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + } + }, + "x-ms-azure-resource": true + }, + "SkuTier": { + "type": "string", + "enum": [ + "Free", + "Basic", + "Standard", + "Premium" + ], + "x-ms-enum": { + "name": "SkuTier", + "modelAsString": false + }, + "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT." + }, + "Sku": { + "description": "The resource model definition representing SKU", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The name of the SKU. Ex - P3. It is typically a letter+number code" + }, + "tier": { + "$ref": "#/definitions/SkuTier" + }, + "size": { + "type": "string", + "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. " + }, + "family": { + "type": "string", + "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here." + }, + "capacity": { + "type": "integer", + "format": "int32", + "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." + } + }, + "required": [ + "name" + ] + }, + "Identity": { + "description": "Identity for the resource.", + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal ID of resource identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant ID of resource." + }, + "type": { + "type": "string", + "description": "The identity type.", + "enum": [ + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + } + }, + "Plan": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "A user defined name of the 3rd Party Artifact that is being procured." + }, + "publisher": { + "type": "string", + "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic" + }, + "product": { + "type": "string", + "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. " + }, + "promotionCode": { + "type": "string", + "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact." + }, + "version": { + "type": "string", + "description": "The version of the desired product/artifact." + } + }, + "description": "Plan for the resource.", + "required": [ + "name", + "publisher", + "product" + ] + }, + "ErrorDetail": { + "description": "The error detail.", + "type": "object", + "properties": { + "code": { + "readOnly": true, + "type": "string", + "description": "The error code." + }, + "message": { + "readOnly": true, + "type": "string", + "description": "The error message." + }, + "target": { + "readOnly": true, + "type": "string", + "description": "The error target." + }, + "details": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" + }, + "description": "The error details." + }, + "additionalInfo": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorAdditionalInfo" + }, + "description": "The error additional info." + } + } + }, + "ErrorResponse": { + "title": "Error response", + "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", + "type": "object", + "properties": { + "error": { + "description": "The error object.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "ErrorAdditionalInfo": { + "type": "object", + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The additional info type." + }, + "info": { + "readOnly": true, + "type": "object", + "description": "The additional info." + } + }, + "description": "The resource management error additional info." + }, + "Operation": { + "title": "REST API Operation", + "description": "Details of a REST API operation, returned from the Resource Provider Operations API", + "type": "object", + "properties": { + "name": { + "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", + "type": "string", + "readOnly": true + }, + "isDataAction": { + "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", + "type": "boolean", + "readOnly": true + }, + "display": { + "description": "Localized display information for this particular operation.", + "type": "object", + "properties": { + "provider": { + "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", + "type": "string", + "readOnly": true + } + } + }, + "origin": { + "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", + "type": "string", + "readOnly": true, + "enum": [ + "user", + "system", + "user,system" + ], + "x-ms-enum": { + "name": "Origin", + "modelAsString": true + } + }, + "actionType": { + "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", + "type": "string", + "readOnly": true, + "enum": [ + "Internal" + ], + "x-ms-enum": { + "name": "ActionType", + "modelAsString": true + } + } + } + }, + "OperationListResult": { + "description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.", + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "List of operations supported by the resource provider", + "readOnly": true + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results (if there are any).", + "readOnly": true + } + } + }, + "OperationStatusResult": { + "description": "The current status of an async operation.", + "type": "object", + "required": [ + "status" + ], + "properties": { + "id": { + "description": "Fully qualified ID for the async operation.", + "type": "string" + }, + "name": { + "description": "Name of the async operation.", + "type": "string" + }, + "status": { + "description": "Operation status.", + "type": "string" + }, + "percentComplete": { + "description": "Percent of the operation that is complete.", + "type": "number", + "minimum": 0, + "maximum": 100 + }, + "startTime": { + "description": "The start time of the operation.", + "type": "string", + "format": "date-time" + }, + "endTime": { + "description": "The end time of the operation.", + "type": "string", + "format": "date-time" + }, + "operations": { + "description": "The operations list.", + "type": "array", + "items": { + "$ref": "#/definitions/OperationStatusResult" + } + }, + "error": { + "description": "If present, details of the operation error.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "locationData": { + "description": "Metadata pertaining to the geographic location of the resource.", + "type": "object", + "properties": { + "name": { + "type": "string", + "maxLength": 256, + "description": "A canonical name for the geographic or physical location." + }, + "city": { + "type": "string", + "description": "The city or locality where the resource is located." + }, + "district": { + "type": "string", + "description": "The district, state, or province where the resource is located." + }, + "countryOrRegion": { + "type": "string", + "description": "The country or region where the resource is located" + } + }, + "required": [ + "name" + ] + }, + "systemData": { + "description": "Metadata pertaining to creation and last modification of the resource.", + "type": "object", + "readOnly": true, + "properties": { + "createdBy": { + "type": "string", + "description": "The identity that created the resource." + }, + "createdByType": { + "type": "string", + "description": "The type of identity that created the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "createdAt": { + "type": "string", + "format": "date-time", + "description": "The timestamp of resource creation (UTC)." + }, + "lastModifiedBy": { + "type": "string", + "description": "The identity that last modified the resource." + }, + "lastModifiedByType": { + "type": "string", + "description": "The type of identity that last modified the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "lastModifiedAt": { + "type": "string", + "format": "date-time", + "description": "The timestamp of resource last modification (UTC)" + } + } + }, + "encryptionProperties": { + "description": "Configuration of key for data encryption", + "type": "object", + "properties": { + "status": { + "description": "Indicates whether or not the encryption is enabled for container registry.", + "enum": [ + "enabled", + "disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "EncryptionStatus", + "modelAsString": true + } + }, + "keyVaultProperties": { + "$ref": "#/definitions/KeyVaultProperties", + "description": "Key vault properties." + } + } + }, + "KeyVaultProperties": { + "type": "object", + "properties": { + "keyIdentifier": { + "description": "Key vault uri to access the encryption key.", + "type": "string" + }, + "identity": { + "description": "The client ID of the identity which will be used to access key vault.", + "type": "string" + } + } + }, + "CheckNameAvailabilityRequest": { + "description": "The check availability request body.", + "type": "object", + "properties": { + "name": { + "description": "The name of the resource for which availability needs to be checked.", + "type": "string" + }, + "type": { + "description": "The resource type.", + "type": "string" + } + } + }, + "CheckNameAvailabilityResponse": { + "description": "The check availability result.", + "type": "object", + "properties": { + "nameAvailable": { + "description": "Indicates if the resource name is available.", + "type": "boolean" + }, + "reason": { + "description": "The reason why the given name is not available.", + "type": "string", + "enum": [ + "Invalid", + "AlreadyExists" + ], + "x-ms-enum": { + "name": "CheckNameAvailabilityReason", + "modelAsString": true + } + }, + "message": { + "description": "Detailed reason why the given name is available.", + "type": "string" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The ID of the target subscription.", + "minLength": 1 + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to use for this operation.", + "minLength": 1 + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group. The name is case insensitive.", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "OperationIdParameter": { + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "description": "The ID of an ongoing async operation.", + "minLength": 1, + "x-ms-parameter-location": "method" + }, + "LocationParameter": { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The name of Azure region.", + "minLength": 1, + "x-ms-parameter-location": "method" + } + } +} From e70e052bc669c37c65729dc24f29a84e044773a3 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 01:27:43 -0800 Subject: [PATCH 05/15] Moved new version of privatelinks.json into our directory --- .../resource-management/v4/types.json | 695 ------------------ .../2020-03-01-preview/deviceupdate.json | 20 +- .../2020-03-01-preview}/privatelinks.json | 4 +- 3 files changed, 12 insertions(+), 707 deletions(-) delete mode 100644 specification/common-types/resource-management/v4/types.json rename specification/{common-types/resource-management/v4 => deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview}/privatelinks.json (96%) diff --git a/specification/common-types/resource-management/v4/types.json b/specification/common-types/resource-management/v4/types.json deleted file mode 100644 index 5df3a9ddf957..000000000000 --- a/specification/common-types/resource-management/v4/types.json +++ /dev/null @@ -1,695 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "4.0", - "title": "Common types" - }, - "paths": {}, - "definitions": { - "Resource": { - "title": "Resource", - "description": "Common fields that are returned in the response for all Azure Resource Manager resources", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" - }, - "systemData": { - "readOnly": true, - "type": "object", - "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", - "$ref": "#/definitions/systemData" - } - }, - "x-ms-azure-resource": true - }, - "AzureEntityResource": { - "x-ms-client-name": "AzureEntityResource", - "title": "Entity Resource", - "description": "The resource model definition for an Azure Resource Manager resource with an etag.", - "type": "object", - "properties": { - "etag": { - "type": "string", - "readOnly": true, - "description": "Resource Etag." - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "TrackedResource": { - "title": "Tracked Resource", - "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", - "type": "object", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The geo-location where the resource lives" - } - }, - "required": [ - "location" - ], - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "title": "Proxy Resource", - "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ResourceModelWithAllowedPropertySet": { - "description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "x-ms-mutability": [ - "read" - ], - "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "x-ms-mutability": [ - "read" - ], - "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The geo-location where the resource lives" - }, - "managedBy": { - "type": "string", - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." - }, - "kind": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", - "pattern": "^[-\\w\\._,\\(\\)]+$" - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "identity": { - "allOf": [ - { - "$ref": "#/definitions/Identity" - } - ] - }, - "sku": { - "allOf": [ - { - "$ref": "#/definitions/Sku" - } - ] - }, - "plan": { - "allOf": [ - { - "$ref": "#/definitions/Plan" - } - ] - } - }, - "x-ms-azure-resource": true - }, - "SkuTier": { - "type": "string", - "enum": [ - "Free", - "Basic", - "Standard", - "Premium" - ], - "x-ms-enum": { - "name": "SkuTier", - "modelAsString": false - }, - "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT." - }, - "Sku": { - "description": "The resource model definition representing SKU", - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "The name of the SKU. Ex - P3. It is typically a letter+number code" - }, - "tier": { - "$ref": "#/definitions/SkuTier" - }, - "size": { - "type": "string", - "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. " - }, - "family": { - "type": "string", - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here." - }, - "capacity": { - "type": "integer", - "format": "int32", - "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." - } - }, - "required": [ - "name" - ] - }, - "Identity": { - "description": "Identity for the resource.", - "type": "object", - "properties": { - "principalId": { - "readOnly": true, - "type": "string", - "description": "The principal ID of resource identity." - }, - "tenantId": { - "readOnly": true, - "type": "string", - "description": "The tenant ID of resource." - }, - "type": { - "type": "string", - "description": "The identity type.", - "enum": [ - "SystemAssigned" - ], - "x-ms-enum": { - "name": "ResourceIdentityType", - "modelAsString": false - } - } - } - }, - "Plan": { - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "A user defined name of the 3rd Party Artifact that is being procured." - }, - "publisher": { - "type": "string", - "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic" - }, - "product": { - "type": "string", - "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. " - }, - "promotionCode": { - "type": "string", - "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact." - }, - "version": { - "type": "string", - "description": "The version of the desired product/artifact." - } - }, - "description": "Plan for the resource.", - "required": [ - "name", - "publisher", - "product" - ] - }, - "ErrorDetail": { - "description": "The error detail.", - "type": "object", - "properties": { - "code": { - "readOnly": true, - "type": "string", - "description": "The error code." - }, - "message": { - "readOnly": true, - "type": "string", - "description": "The error message." - }, - "target": { - "readOnly": true, - "type": "string", - "description": "The error target." - }, - "details": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDetail" - }, - "description": "The error details." - }, - "additionalInfo": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/ErrorAdditionalInfo" - }, - "description": "The error additional info." - } - } - }, - "ErrorResponse": { - "title": "Error response", - "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", - "type": "object", - "properties": { - "error": { - "description": "The error object.", - "$ref": "#/definitions/ErrorDetail" - } - } - }, - "ErrorAdditionalInfo": { - "type": "object", - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "The additional info type." - }, - "info": { - "readOnly": true, - "type": "object", - "description": "The additional info." - } - }, - "description": "The resource management error additional info." - }, - "Operation": { - "title": "REST API Operation", - "description": "Details of a REST API operation, returned from the Resource Provider Operations API", - "type": "object", - "properties": { - "name": { - "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", - "type": "string", - "readOnly": true - }, - "isDataAction": { - "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", - "type": "boolean", - "readOnly": true - }, - "display": { - "description": "Localized display information for this particular operation.", - "type": "object", - "properties": { - "provider": { - "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", - "type": "string", - "readOnly": true - }, - "resource": { - "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", - "type": "string", - "readOnly": true - }, - "operation": { - "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", - "type": "string", - "readOnly": true - }, - "description": { - "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", - "type": "string", - "readOnly": true - } - } - }, - "origin": { - "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", - "type": "string", - "readOnly": true, - "enum": [ - "user", - "system", - "user,system" - ], - "x-ms-enum": { - "name": "Origin", - "modelAsString": true - } - }, - "actionType": { - "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", - "type": "string", - "readOnly": true, - "enum": [ - "Internal" - ], - "x-ms-enum": { - "name": "ActionType", - "modelAsString": true - } - } - } - }, - "OperationListResult": { - "description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.", - "type": "object", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "description": "List of operations supported by the resource provider", - "readOnly": true - }, - "nextLink": { - "type": "string", - "description": "URL to get the next set of operation list results (if there are any).", - "readOnly": true - } - } - }, - "OperationStatusResult": { - "description": "The current status of an async operation.", - "type": "object", - "required": [ - "status" - ], - "properties": { - "id": { - "description": "Fully qualified ID for the async operation.", - "type": "string" - }, - "name": { - "description": "Name of the async operation.", - "type": "string" - }, - "status": { - "description": "Operation status.", - "type": "string" - }, - "percentComplete": { - "description": "Percent of the operation that is complete.", - "type": "number", - "minimum": 0, - "maximum": 100 - }, - "startTime": { - "description": "The start time of the operation.", - "type": "string", - "format": "date-time" - }, - "endTime": { - "description": "The end time of the operation.", - "type": "string", - "format": "date-time" - }, - "operations": { - "description": "The operations list.", - "type": "array", - "items": { - "$ref": "#/definitions/OperationStatusResult" - } - }, - "error": { - "description": "If present, details of the operation error.", - "$ref": "#/definitions/ErrorDetail" - } - } - }, - "locationData": { - "description": "Metadata pertaining to the geographic location of the resource.", - "type": "object", - "properties": { - "name": { - "type": "string", - "maxLength": 256, - "description": "A canonical name for the geographic or physical location." - }, - "city": { - "type": "string", - "description": "The city or locality where the resource is located." - }, - "district": { - "type": "string", - "description": "The district, state, or province where the resource is located." - }, - "countryOrRegion": { - "type": "string", - "description": "The country or region where the resource is located" - } - }, - "required": [ - "name" - ] - }, - "systemData": { - "description": "Metadata pertaining to creation and last modification of the resource.", - "type": "object", - "readOnly": true, - "properties": { - "createdBy": { - "type": "string", - "description": "The identity that created the resource." - }, - "createdByType": { - "type": "string", - "description": "The type of identity that created the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], - "x-ms-enum": { - "name": "createdByType", - "modelAsString": true - } - }, - "createdAt": { - "type": "string", - "format": "date-time", - "description": "The timestamp of resource creation (UTC)." - }, - "lastModifiedBy": { - "type": "string", - "description": "The identity that last modified the resource." - }, - "lastModifiedByType": { - "type": "string", - "description": "The type of identity that last modified the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], - "x-ms-enum": { - "name": "createdByType", - "modelAsString": true - } - }, - "lastModifiedAt": { - "type": "string", - "format": "date-time", - "description": "The timestamp of resource last modification (UTC)" - } - } - }, - "encryptionProperties": { - "description": "Configuration of key for data encryption", - "type": "object", - "properties": { - "status": { - "description": "Indicates whether or not the encryption is enabled for container registry.", - "enum": [ - "enabled", - "disabled" - ], - "type": "string", - "x-ms-enum": { - "name": "EncryptionStatus", - "modelAsString": true - } - }, - "keyVaultProperties": { - "$ref": "#/definitions/KeyVaultProperties", - "description": "Key vault properties." - } - } - }, - "KeyVaultProperties": { - "type": "object", - "properties": { - "keyIdentifier": { - "description": "Key vault uri to access the encryption key.", - "type": "string" - }, - "identity": { - "description": "The client ID of the identity which will be used to access key vault.", - "type": "string" - } - } - }, - "CheckNameAvailabilityRequest": { - "description": "The check availability request body.", - "type": "object", - "properties": { - "name": { - "description": "The name of the resource for which availability needs to be checked.", - "type": "string" - }, - "type": { - "description": "The resource type.", - "type": "string" - } - } - }, - "CheckNameAvailabilityResponse": { - "description": "The check availability result.", - "type": "object", - "properties": { - "nameAvailable": { - "description": "Indicates if the resource name is available.", - "type": "boolean" - }, - "reason": { - "description": "The reason why the given name is not available.", - "type": "string", - "enum": [ - "Invalid", - "AlreadyExists" - ], - "x-ms-enum": { - "name": "CheckNameAvailabilityReason", - "modelAsString": true - } - }, - "message": { - "description": "Detailed reason why the given name is available.", - "type": "string" - } - } - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The ID of the target subscription.", - "minLength": 1 - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to use for this operation.", - "minLength": 1 - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group. The name is case insensitive.", - "minLength": 1, - "maxLength": 90, - "x-ms-parameter-location": "method" - }, - "OperationIdParameter": { - "name": "operationId", - "in": "path", - "required": true, - "type": "string", - "description": "The ID of an ongoing async operation.", - "minLength": 1, - "x-ms-parameter-location": "method" - }, - "LocationParameter": { - "name": "location", - "in": "path", - "required": true, - "type": "string", - "description": "The name of Azure region.", - "minLength": 1, - "x-ms-parameter-location": "method" - } - } -} diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index e7543e4f8259..00f3ccfada46 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -675,7 +675,7 @@ "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnectionListResult" + "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnectionListResult" } }, "default": { @@ -716,14 +716,14 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -759,7 +759,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" }, { "name": "privateEndpointConnection", @@ -767,7 +767,7 @@ "description": "The parameters for creating a private endpoint connection.", "required": true, "schema": { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" } } ], @@ -775,7 +775,7 @@ "201": { "description": "The request was successful; the operation will complete asynchronously.", "schema": { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -815,7 +815,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { @@ -1265,7 +1265,7 @@ "description": "List of private endpoint connections associated with the account.", "type": "array", "items": { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" } } } @@ -1496,7 +1496,7 @@ "type": "object", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateLinkResourceProperties" + "$ref": "../privatelinks.json#/definitions/PrivateLinkResourceProperties" } ], "properties": { @@ -1643,7 +1643,7 @@ }, "remotePrivateLinkServiceConnectionState": { "description": "Remote private link service connection state", - "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateLinkServiceConnectionState" + "$ref": "../privatelinks.json#/definitions/PrivateLinkServiceConnectionState" }, "remotePrivateEndpointConnection": { "description": "Remote private endpoint connection details.", diff --git a/specification/common-types/resource-management/v4/privatelinks.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json similarity index 96% rename from specification/common-types/resource-management/v4/privatelinks.json rename to specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json index 568566fb78d3..ebaacd8ab500 100644 --- a/specification/common-types/resource-management/v4/privatelinks.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json @@ -28,7 +28,7 @@ }, "allOf": [ { - "$ref": "./types.json#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" } ], "description": "The Private Endpoint Connection resource." @@ -118,7 +118,7 @@ }, "allOf": [ { - "$ref": "./types.json#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" } ], "description": "A private link resource" From 88f1619e970f48f04aaf6bb9b3d3ffaea4018f0d Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 01:29:06 -0800 Subject: [PATCH 06/15] Wrong level --- .../2020-03-01-preview/deviceupdate.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index 00f3ccfada46..00eb11fb22dd 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -675,7 +675,7 @@ "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnectionListResult" + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnectionListResult" } }, "default": { @@ -716,14 +716,14 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { "200": { "description": "The request was successful; the request was well-formed and received properly.", "schema": { - "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -759,7 +759,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName" }, { "name": "privateEndpointConnection", @@ -767,7 +767,7 @@ "description": "The parameters for creating a private endpoint connection.", "required": true, "schema": { - "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" } } ], @@ -775,7 +775,7 @@ "201": { "description": "The request was successful; the operation will complete asynchronously.", "schema": { - "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -815,7 +815,7 @@ "$ref": "#/parameters/AccountNameParameter" }, { - "$ref": "../privatelinks.json#/parameters/PrivateEndpointConnectionName" + "$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName" } ], "responses": { @@ -1265,7 +1265,7 @@ "description": "List of private endpoint connections associated with the account.", "type": "array", "items": { - "$ref": "../privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" } } } @@ -1496,7 +1496,7 @@ "type": "object", "allOf": [ { - "$ref": "../privatelinks.json#/definitions/PrivateLinkResourceProperties" + "$ref": "./privatelinks.json#/definitions/PrivateLinkResourceProperties" } ], "properties": { @@ -1643,7 +1643,7 @@ }, "remotePrivateLinkServiceConnectionState": { "description": "Remote private link service connection state", - "$ref": "../privatelinks.json#/definitions/PrivateLinkServiceConnectionState" + "$ref": "./privatelinks.json#/definitions/PrivateLinkServiceConnectionState" }, "remotePrivateEndpointConnection": { "description": "Remote private endpoint connection details.", From 7fbd577f0af921277b378f4f77ccb67c821235a4 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 01:32:13 -0800 Subject: [PATCH 07/15] Added period to the end of description for consistency --- .../preview/2020-03-01-preview/privatelinks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json index ebaacd8ab500..47c904ec39fb 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json @@ -46,7 +46,7 @@ }, "groupIds": { "type": "array", - "description": "Array of group IDs", + "description": "Array of group IDs.", "items": { "type": "string" } From 61ff78b36eefbf9bc1e778b12ada15d86b130a2e Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 01:42:18 -0800 Subject: [PATCH 08/15] Updated version in privatelinks.json --- .../preview/2020-03-01-preview/privatelinks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json index 47c904ec39fb..20b3a10ffd8e 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json @@ -1,8 +1,8 @@ { "swagger": "2.0", "info": { - "version": "4.0", - "title": "Common types" + "version": "2020-03-01-preview", + "title": "Common private link types" }, "paths": {}, "definitions": { From 971366b5be1fcf3f84118ae79866b5283f76b698 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Fri, 10 Dec 2021 01:44:51 -0800 Subject: [PATCH 09/15] Removed duplicate resource from privatelinks.json --- .../preview/2020-03-01-preview/privatelinks.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json index 20b3a10ffd8e..108ee3d7e815 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json @@ -161,19 +161,6 @@ } }, "description": "List of private endpoint connection associated with the specified storage account" - }, - "PrivateLinkResourceListResult": { - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } - } - }, - "description": "A list of private link resources" } }, "parameters": { From 2dce8c7766e54feb0023bffb86774d4379ee891a Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 18:19:47 -0800 Subject: [PATCH 10/15] Made PrivateEndpointConnection.properties required, added PEC payload to examples --- .../examples/Accounts/Accounts_Get.json | 22 +++++- .../examples/Accounts/Accounts_List.json | 22 +++++- .../examples/Accounts/Accounts_Update.json | 67 ++++++++++++++++++- .../2020-03-01-preview/privatelinks.json | 3 + 4 files changed, 109 insertions(+), 5 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json index 28e389f95a45..ef268b2679e6 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json @@ -15,7 +15,27 @@ "properties": { "provisioningState": "Succeeded", "hostName": "contoso.api.adu.microsoft.com", - "privateEndpointConnections": [] + "privateEndpointConnections": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + }, + "groupIds": [ + "groupId" + ] + } + } + ] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json index 997046bbd3ac..2ecf84778b8c 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json @@ -17,7 +17,27 @@ "properties": { "provisioningState": "Succeeded", "hostName": "contoso.api.adu.microsoft.com", - "privateEndpointConnections": [] + "privateEndpointConnections": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + }, + "groupIds": [ + "groupId" + ] + } + } + ] } } ] diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json index 1f323c80dbeb..b247b8890f2a 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json @@ -7,7 +7,28 @@ "accountUpdatePayload": { "tags": { "tagKey": "tagValue" - } + }, + "privateEndpointConnections": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + }, + "groupIds": [ + "groupId" + ] + } + } + ] } }, "responses": { @@ -20,7 +41,27 @@ "properties": { "provisioningState": "Succeeded", "hostName": "contoso.api.adu.microsoft.com", - "privateEndpointConnections": [] + "privateEndpointConnections": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + }, + "groupIds": [ + "groupId" + ] + } + } + ] }, "tags": { "tagKey": "tagValue" @@ -41,7 +82,27 @@ "properties": { "provisioningState": "Created", "hostName": "contoso.api.adu.microsoft.com", - "privateEndpointConnections": [] + "privateEndpointConnections": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + }, + "groupIds": [ + "groupId" + ] + } + } + ] }, "tags": { "tagKey": "tagValue" diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json index 108ee3d7e815..503c5a975f72 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/privatelinks.json @@ -31,6 +31,9 @@ "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Resource" } ], + "required": [ + "properties" + ], "description": "The Private Endpoint Connection resource." }, "PrivateEndpointConnectionProperties": { From 8e21124db105fb299b29642cb63bf5d2a2a2f6d6 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 18:48:37 -0800 Subject: [PATCH 11/15] Added Operations List example --- .../examples/Operations_List.json | 338 ++++++++++++++++++ 1 file changed, 338 insertions(+) create mode 100644 specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json new file mode 100644 index 000000000000..717b5c7d3a90 --- /dev/null +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json @@ -0,0 +1,338 @@ +{ + "parameters": { + "api-version": "2020-03-01-preview" + }, + "responses": { + "200": { + "body": { + "nextLink": "string", + "value": [ + { + "name": "Microsoft.DeviceUpdate/accounts/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Get/List Accounts", + "description": "Returns the list of Device Update Accounts" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/write", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Create/Update Account", + "description": "Creates or updates a Device Update Account" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/delete", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Delete Account", + "description": "Deletes a Device Update Account" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Instance", + "operation": "Get/List Instances", + "description": "Returns the list of Device Update Instances" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/write", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Instance", + "operation": "Create/Update Instance", + "description": "Creates or updates a Device Update Instance" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/delete", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Instance", + "operation": "Delete Instance", + "description": "Deletes a Device Update Instance" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection Proxy", + "operation": "Get/List Private Endpoint Connection Proxies", + "description": "Returns the list of Device Update Private Endpoint Connection Proxies" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/write", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection Proxy", + "operation": "Create/Update Private Endpoint Connection Proxy", + "description": "Creates or updates a Device Update Private Endpoint Connection Proxy" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/delete", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection Proxy", + "operation": "Delete Private Endpoint Connection Proxy", + "description": "Deletes a Device Update Private Endpoint Connection Proxy" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/validate/action", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection Proxy", + "operation": "Validate Private Endpoint Connection Proxy", + "description": "Validates a Device Update Private Endpoint Connection Proxy" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection", + "operation": "Get/List Private Endpoint Connections", + "description": "Returns the list of Device Update Private Endpoint Connections" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/write", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection", + "operation": "Create/Update Private Endpoint Connection", + "description": "Creates or updates a Device Update Private Endpoint Connection" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/delete", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Endpoint Connection", + "operation": "Delete Private Endpoint Connection", + "description": "Deletes a Device Update Private Endpoint Connection" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/privateLinkResources/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Private Link Resources", + "operation": "Get/List Private Link Resources", + "description": "Returns the list of Device Update Private Link Resources" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/updates/read", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Get Updates", + "description": "Performs a read operation related to updates" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/updates/write", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Write Updates", + "description": "Performs a write operation related to updates" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/updates/delete", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Delete Updates", + "description": "Performs a delete operation related to updates" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/management/read", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Management Read", + "description": "Performs a read operation related to management" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/management/write", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Management Write", + "description": "Performs a write operation related to management" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/accounts/instances/management/delete", + "isDataAction": true, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Management Delete", + "description": "Performs a delete operation related to management" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/operations/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Operation", + "operation": "List Operations", + "description": "Lists Device Update Operations" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/locations/operationStatuses/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Operation Status", + "operation": "Get Operation Status", + "description": "Gets an Operation Status" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/locations/operationStatuses/write", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Operation Status", + "operation": "Update Operation Status", + "description": "Updates an Operation Status" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/checkNameAvailability/action", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Check Name Availability", + "operation": "Checks Name Availability", + "description": "Checks Name Availability" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/register/action", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Register", + "operation": "Register Device Update", + "description": "Registers Device Update" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/unregister/action", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Unregister", + "operation": "Unregister Device Update", + "description": "Unregisters Device Update" + } + } + }, + { + "name": "Microsoft.DeviceUpdate/registeredSubscriptions/read", + "isDataAction": false, + "display": { + "default": { + "provider": "Microsoft.DeviceUpdate", + "resource": "RegisteredSubscriptions", + "operation": "Get/List registered subscriptions", + "description": "Reads registered subscriptions" + } + } + } + ] + } + } + } +} From 614d2564f6385cd5ace851e0ecd90f7b63a06677 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 18:53:15 -0800 Subject: [PATCH 12/15] Referenced Operations example file from the swagger --- .../preview/2020-03-01-preview/deviceupdate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index 00eb11fb22dd..0a9a07e70a3c 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -1207,6 +1207,11 @@ "deprecated": false, "x-ms-pageable": { "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Gets list of Operations": { + "$ref": "./examples/Operations_List.json" + } } } } From d6c313c81fca773277d52776d4c2933644bacf59 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 19:36:07 -0800 Subject: [PATCH 13/15] Reduce number of operations in the Operations_List example --- .../examples/Operations_List.json | 300 ------------------ 1 file changed, 300 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json index 717b5c7d3a90..fb2347bf3d8e 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json @@ -30,306 +30,6 @@ "description": "Creates or updates a Device Update Account" } } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/delete", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Delete Account", - "description": "Deletes a Device Update Account" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Instance", - "operation": "Get/List Instances", - "description": "Returns the list of Device Update Instances" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/write", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Instance", - "operation": "Create/Update Instance", - "description": "Creates or updates a Device Update Instance" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/delete", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Instance", - "operation": "Delete Instance", - "description": "Deletes a Device Update Instance" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection Proxy", - "operation": "Get/List Private Endpoint Connection Proxies", - "description": "Returns the list of Device Update Private Endpoint Connection Proxies" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/write", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection Proxy", - "operation": "Create/Update Private Endpoint Connection Proxy", - "description": "Creates or updates a Device Update Private Endpoint Connection Proxy" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/delete", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection Proxy", - "operation": "Delete Private Endpoint Connection Proxy", - "description": "Deletes a Device Update Private Endpoint Connection Proxy" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies/validate/action", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection Proxy", - "operation": "Validate Private Endpoint Connection Proxy", - "description": "Validates a Device Update Private Endpoint Connection Proxy" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection", - "operation": "Get/List Private Endpoint Connections", - "description": "Returns the list of Device Update Private Endpoint Connections" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/write", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection", - "operation": "Create/Update Private Endpoint Connection", - "description": "Creates or updates a Device Update Private Endpoint Connection" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections/delete", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Endpoint Connection", - "operation": "Delete Private Endpoint Connection", - "description": "Deletes a Device Update Private Endpoint Connection" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/privateLinkResources/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Private Link Resources", - "operation": "Get/List Private Link Resources", - "description": "Returns the list of Device Update Private Link Resources" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/updates/read", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Get Updates", - "description": "Performs a read operation related to updates" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/updates/write", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Write Updates", - "description": "Performs a write operation related to updates" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/updates/delete", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Delete Updates", - "description": "Performs a delete operation related to updates" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/management/read", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Management Read", - "description": "Performs a read operation related to management" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/management/write", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Management Write", - "description": "Performs a write operation related to management" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/accounts/instances/management/delete", - "isDataAction": true, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Management Delete", - "description": "Performs a delete operation related to management" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/operations/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Operation", - "operation": "List Operations", - "description": "Lists Device Update Operations" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/locations/operationStatuses/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Operation Status", - "operation": "Get Operation Status", - "description": "Gets an Operation Status" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/locations/operationStatuses/write", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Operation Status", - "operation": "Update Operation Status", - "description": "Updates an Operation Status" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/checkNameAvailability/action", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Check Name Availability", - "operation": "Checks Name Availability", - "description": "Checks Name Availability" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/register/action", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Register", - "operation": "Register Device Update", - "description": "Registers Device Update" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/unregister/action", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Unregister", - "operation": "Unregister Device Update", - "description": "Unregisters Device Update" - } - } - }, - { - "name": "Microsoft.DeviceUpdate/registeredSubscriptions/read", - "isDataAction": false, - "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "RegisteredSubscriptions", - "operation": "Get/List registered subscriptions", - "description": "Reads registered subscriptions" - } - } } ] } From 84966afa741b364b38796e8e6c8176716a8afcbc Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 19:46:25 -0800 Subject: [PATCH 14/15] Fixed Operations List example --- .../examples/Operations_List.json | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json index fb2347bf3d8e..1d89a26fe4f1 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Operations_List.json @@ -11,24 +11,20 @@ "name": "Microsoft.DeviceUpdate/accounts/read", "isDataAction": false, "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Get/List Accounts", - "description": "Returns the list of Device Update Accounts" - } + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Get/List Accounts", + "description": "Returns the list of Device Update Accounts" } }, { "name": "Microsoft.DeviceUpdate/accounts/write", "isDataAction": false, "display": { - "default": { - "provider": "Microsoft.DeviceUpdate", - "resource": "Device Update Account", - "operation": "Create/Update Account", - "description": "Creates or updates a Device Update Account" - } + "provider": "Microsoft.DeviceUpdate", + "resource": "Device Update Account", + "operation": "Create/Update Account", + "description": "Creates or updates a Device Update Account" } } ] From 02b9ae755232145451c0d55e832eb00025c50b95 Mon Sep 17 00:00:00 2001 From: Darko Aleksic Date: Sun, 12 Dec 2021 21:14:19 -0800 Subject: [PATCH 15/15] Removed PrivateEnpointConnection from Account update example --- .../examples/Accounts/Accounts_Update.json | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json index b247b8890f2a..78f452f2edaf 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json @@ -7,28 +7,7 @@ "accountUpdatePayload": { "tags": { "tagKey": "tagValue" - }, - "privateEndpointConnections": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01", - "name": "peexample01", - "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Auto-Approved", - "actionsRequired": "None" - }, - "groupIds": [ - "groupId" - ] - } - } - ] + } } }, "responses": {