From 2ba50ece213c9757f505129c68d7660059e757bc Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 8 Sep 2021 02:51:28 +0000 Subject: [PATCH] CodeGen from PR 15861 in Azure/azure-rest-api-specs [Hub Generated] Review request for Microsoft.Aadiam to add version preview/2020-03-01-preview and stable/2020-03-01 (#15861) * Adds base for updating Microsoft.Aadiam from version preview/2020-03-01-preview to version 2020-03-01 * Updates readme * Updates API version in new specs and examples * Adding changes from previous PR * Ran prettier, fixed types.json reference * Remove changes to preview version * Fix python failure * Try switching error locations * Change error location back * fix old examples * Try to fix python check --- schemas/2020-03-01/Microsoft.Aadiam.json | 300 +++++++++++++++++++++ schemas/common/autogeneratedResources.json | 6 + 2 files changed, 306 insertions(+) create mode 100644 schemas/2020-03-01/Microsoft.Aadiam.json diff --git a/schemas/2020-03-01/Microsoft.Aadiam.json b/schemas/2020-03-01/Microsoft.Aadiam.json new file mode 100644 index 0000000000..a0fc876356 --- /dev/null +++ b/schemas/2020-03-01/Microsoft.Aadiam.json @@ -0,0 +1,300 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Aadiam.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "microsoft.aadiam", + "description": "microsoft aadiam Resource Types", + "resourceDefinitions": { + "privateLinkForAzureAd": { + "type": "object", + "properties": { + "allTenants": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Flag indicating whether all tenants are allowed" + }, + "apiVersion": { + "type": "string", + "enum": [ + "2020-03-01" + ] + }, + "name": { + "type": "string", + "description": "The name of the private link policy in Azure AD." + }, + "ownerTenantId": { + "type": "string", + "description": "Guid of the owner tenant" + }, + "resourceGroup": { + "type": "string", + "description": "Name of the resource group" + }, + "resourceName": { + "type": "string", + "description": "Name of the private link policy resource" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/privateLinkForAzureAd_privateEndpointConnections_childResource" + } + ] + } + }, + "subscriptionId": { + "type": "string", + "description": "Subscription Identifier" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "tenants": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of tenantIds." + }, + "type": { + "type": "string", + "enum": [ + "microsoft.aadiam/privateLinkForAzureAd" + ] + } + }, + "required": [ + "apiVersion", + "name", + "type" + ], + "description": "microsoft.aadiam/privateLinkForAzureAd" + }, + "privateLinkForAzureAd_privateEndpointConnections": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-03-01" + ] + }, + "name": { + "type": "string", + "minLength": 1, + "description": "The PrivateEndpointConnection name." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the private endpoint connection resource." + }, + "type": { + "type": "string", + "enum": [ + "microsoft.aadiam/privateLinkForAzureAd/privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "microsoft.aadiam/privateLinkForAzureAd/privateEndpointConnections" + } + }, + "definitions": { + "PrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Full identifier of the private endpoint resource." + } + }, + "description": "Private endpoint object properties." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Private endpoint object properties." + }, + "privateLinkConnectionTags": { + "oneOf": [ + { + "$ref": "#/definitions/TagsResource" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A container holding only the Tags for a resource, allowing the user to update the tags on a PrivateLinkConnection instance." + }, + "privateLinkServiceConnectionState": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "An object that represents the approval state of the private link connection." + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Succeeded", + "Provisioning", + "Failed" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Provisioning state of the private endpoint connection." + } + }, + "description": "Properties of the private endpoint connection resource." + }, + "privateLinkForAzureAd_privateEndpointConnections_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-03-01" + ] + }, + "name": { + "type": "string", + "minLength": 1, + "description": "The PrivateEndpointConnection name." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the private endpoint connection resource." + }, + "type": { + "type": "string", + "enum": [ + "privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "microsoft.aadiam/privateLinkForAzureAd/privateEndpointConnections" + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "actionsRequired": { + "type": "string", + "description": "A message indicating if changes on the service provider require any updates on the consumer." + }, + "description": { + "type": "string", + "description": "The reason for approval or rejection." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Approved", + "Pending", + "Rejected", + "Disconnected" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the connection has been approved, rejected or removed by the given policy owner." + } + }, + "description": "An object that represents the approval state of the private link connection." + }, + "TagsResource": { + "type": "object", + "properties": { + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + } + }, + "description": "A container holding only the Tags for a resource, allowing the user to update the tags on a PrivateLinkConnection instance." + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 71ebfa4851..476bb303ae 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -31,6 +31,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.AAD.json#/resourceDefinitions/domainServices_ouContainer" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Aadiam.json#/resourceDefinitions/privateLinkForAzureAd" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-03-01/Microsoft.Aadiam.json#/resourceDefinitions/privateLinkForAzureAd_privateEndpointConnections" + }, { "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Aadiam.json#/resourceDefinitions/privateLinkForAzureAd" },