From b8d624004cf29998a6f3caf37f69d90e6a9968be Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 25 Jul 2022 01:43:37 +0000 Subject: [PATCH] CodeGen from PR 19870 in Azure/azure-rest-api-specs Merge 11546a10cbf4ef5f8be828443e068b859cd98547 into 226c70f75acef9073d7634dd1506605a9b1db6c7 --- .../Microsoft.Subscription.json | 68 ------ .../2019-08-01/tenantDeploymentTemplate.json | 15 -- .../Microsoft.Subscription.json | 88 -------- .../2020-09-01/Microsoft.Subscription.json | 87 -------- .../2021-10-01/Microsoft.Subscription.json | 196 ------------------ 5 files changed, 454 deletions(-) delete mode 100644 schemas/2017-11-01-preview/Microsoft.Subscription.json delete mode 100644 schemas/2019-10-01-preview/Microsoft.Subscription.json delete mode 100644 schemas/2020-09-01/Microsoft.Subscription.json delete mode 100644 schemas/2021-10-01/Microsoft.Subscription.json diff --git a/schemas/2017-11-01-preview/Microsoft.Subscription.json b/schemas/2017-11-01-preview/Microsoft.Subscription.json deleted file mode 100644 index de574c1606..0000000000 --- a/schemas/2017-11-01-preview/Microsoft.Subscription.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Subscription.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Subscription", - "description": "Microsoft Subscription Resource Types", - "resourceDefinitions": {}, - "tenant_resourceDefinitions": { - "subscriptionDefinitions": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2017-11-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the Azure subscription definition." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/SubscriptionDefinitionProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The subscription definition properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Subscription/subscriptionDefinitions" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Subscription/subscriptionDefinitions" - } - }, - "definitions": { - "SubscriptionDefinitionProperties": { - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "The etag the subscription definition." - }, - "offerType": { - "type": "string", - "description": "The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available." - }, - "subscriptionDisplayName": { - "type": "string", - "description": "The display name of the subscription." - } - }, - "description": "The subscription definition properties." - } - } -} \ No newline at end of file diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json index 8201c6b4a7..7c97297a8f 100644 --- a/schemas/2019-08-01/tenantDeploymentTemplate.json +++ b/schemas/2019-08-01/tenantDeploymentTemplate.json @@ -751,21 +751,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2021-04-01/Microsoft.Resources.json#/tenant_resourceDefinitions/deployments" }, - { - "$ref": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/subscriptionDefinitions" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Subscription.json#/tenant_resourceDefinitions/policies" - }, { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Web.json#/tenant_resourceDefinitions/publishingUsers" }, diff --git a/schemas/2019-10-01-preview/Microsoft.Subscription.json b/schemas/2019-10-01-preview/Microsoft.Subscription.json deleted file mode 100644 index 6d1179cb5a..0000000000 --- a/schemas/2019-10-01-preview/Microsoft.Subscription.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Subscription.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Subscription", - "description": "Microsoft Subscription Resource Types", - "resourceDefinitions": {}, - "tenant_resourceDefinitions": { - "aliases": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2019-10-01-preview" - ] - }, - "name": { - "type": "string", - "description": "Name for this subscription creation request also known as alias. Note that this is not the same as subscription name and this doesn’t have any other lifecycle need beyond the request for subscription creation." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/PutAliasRequestProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Put subscription properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Subscription/aliases" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Subscription/aliases" - } - }, - "definitions": { - "PutAliasRequestProperties": { - "type": "object", - "properties": { - "billingScope": { - "type": "string", - "description": "Determines whether subscription is fieldLed, partnerLed or LegacyEA" - }, - "displayName": { - "type": "string", - "description": "The friendly name of the subscription." - }, - "subscriptionId": { - "type": "string", - "description": "This parameter can be used to create alias for existing subscription Id" - }, - "workload": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Production", - "DevTest" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The workload type of the subscription. It can be either Production or DevTest." - } - }, - "required": [ - "billingScope", - "displayName", - "workload" - ], - "description": "Put subscription properties." - } - } -} \ No newline at end of file diff --git a/schemas/2020-09-01/Microsoft.Subscription.json b/schemas/2020-09-01/Microsoft.Subscription.json deleted file mode 100644 index 15c4cbd510..0000000000 --- a/schemas/2020-09-01/Microsoft.Subscription.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Subscription.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Subscription", - "description": "Microsoft Subscription Resource Types", - "resourceDefinitions": {}, - "tenant_resourceDefinitions": { - "aliases": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2020-09-01" - ] - }, - "name": { - "type": "string", - "description": "Name for this subscription creation request also known as alias. Note that this is not the same as subscription name and this doesn’t have any other lifecycle need beyond the request for subscription creation." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/PutAliasRequestProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Put subscription properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Subscription/aliases" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Subscription/aliases" - } - }, - "definitions": { - "PutAliasRequestProperties": { - "type": "object", - "properties": { - "billingScope": { - "type": "string", - "description": "Determines whether subscription is fieldLed, partnerLed or LegacyEA" - }, - "displayName": { - "type": "string", - "description": "The friendly name of the subscription." - }, - "resellerId": { - "type": "string", - "description": "Reseller ID, basically MPN Id" - }, - "subscriptionId": { - "type": "string", - "description": "This parameter can be used to create alias for existing subscription Id" - }, - "workload": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Production", - "DevTest" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The workload type of the subscription. It can be either Production or DevTest." - } - }, - "description": "Put subscription properties." - } - } -} \ No newline at end of file diff --git a/schemas/2021-10-01/Microsoft.Subscription.json b/schemas/2021-10-01/Microsoft.Subscription.json deleted file mode 100644 index 970e522324..0000000000 --- a/schemas/2021-10-01/Microsoft.Subscription.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Subscription.json#", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Subscription", - "description": "Microsoft Subscription Resource Types", - "resourceDefinitions": {}, - "tenant_resourceDefinitions": { - "aliases": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2021-10-01" - ] - }, - "name": { - "type": "string", - "description": "AliasName is the name for the subscription creation request. Note that this is not the same as subscription name and this doesn’t have any other lifecycle need beyond the request for subscription creation." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/PutAliasRequestProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Put subscription properties." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Subscription/aliases" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Subscription/aliases" - }, - "policies": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2021-10-01" - ] - }, - "blockSubscriptionsIntoTenant": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Blocks the entering of subscriptions into user's tenant." - }, - "blockSubscriptionsLeavingTenant": { - "oneOf": [ - { - "type": "boolean" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Blocks the leaving of subscriptions from user's tenant." - }, - "exemptedPrincipals": { - "oneOf": [ - { - "type": "array", - "items": { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "List of user objectIds that are exempted from the set subscription tenant policies for the user's tenant." - }, - "name": { - "type": "string", - "enum": [ - "default" - ] - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Subscription/policies" - ] - } - }, - "required": [ - "apiVersion", - "name", - "type" - ], - "description": "Microsoft.Subscription/policies" - } - }, - "definitions": { - "PutAliasRequestAdditionalProperties": { - "type": "object", - "properties": { - "managementGroupId": { - "type": "string", - "description": "Management group Id for the subscription." - }, - "subscriptionOwnerId": { - "type": "string", - "description": "Owner Id of the subscription" - }, - "subscriptionTenantId": { - "type": "string", - "description": "Tenant Id of the subscription" - }, - "tags": { - "oneOf": [ - { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "properties": {} - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Tags for the subscription" - } - }, - "description": "Put subscription additional properties." - }, - "PutAliasRequestProperties": { - "type": "object", - "properties": { - "additionalProperties": { - "oneOf": [ - { - "$ref": "#/definitions/PutAliasRequestAdditionalProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Put subscription additional properties." - }, - "billingScope": { - "type": "string", - "description": "Billing scope of the subscription.\nFor CustomerLed and FieldLed - /billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}\nFor PartnerLed - /billingAccounts/{billingAccountName}/customers/{customerName}\nFor Legacy EA - /billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}" - }, - "displayName": { - "type": "string", - "description": "The friendly name of the subscription." - }, - "resellerId": { - "type": "string", - "description": "Reseller Id" - }, - "subscriptionId": { - "type": "string", - "description": "This parameter can be used to create alias for existing subscription Id" - }, - "workload": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Production", - "DevTest" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - } - }, - "description": "Put subscription properties." - } - } -} \ No newline at end of file