From 1c3dbce456c423c229470465cbee0a98b3837dff Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 20 Apr 2021 02:54:36 +0000 Subject: [PATCH] CodeGen from PR 13985 in Azure/azure-rest-api-specs Making Offer details and User Details required properties (#13985) * Making Offer details and User Details required properties and removing abandoned tag * fix python configuration * Update readme.python.md Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> --- .../subscriptionDeploymentTemplate.json | 3 + schemas/2020-03-01/Microsoft.Confluent.json | 23 -- .../Microsoft.Confluent.json | 283 ++++++++++++++++++ schemas/common/autogeneratedResources.json | 3 + 4 files changed, 289 insertions(+), 23 deletions(-) create mode 100644 schemas/2021-03-01-preview/Microsoft.Confluent.json diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json index 15f62c1764..fbb8b90028 100644 --- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json +++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json @@ -156,6 +156,9 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements" }, + { + "$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements" + }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-30-preview/Microsoft.Consumption.json#/subscription_resourceDefinitions/budgets" }, diff --git a/schemas/2020-03-01/Microsoft.Confluent.json b/schemas/2020-03-01/Microsoft.Confluent.json index 1baa7643b8..3b581def68 100644 --- a/schemas/2020-03-01/Microsoft.Confluent.json +++ b/schemas/2020-03-01/Microsoft.Confluent.json @@ -204,29 +204,6 @@ "maxLength": 50, "description": "Publisher Id" }, - "status": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Started", - "PendingFulfillmentStart", - "InProgress", - "Subscribed", - "Suspended", - "Reinstated", - "Succeeded", - "Failed", - "Unsubscribed", - "Updating" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "SaaS Offer Status." - }, "termUnit": { "type": "string", "maxLength": 25, diff --git a/schemas/2021-03-01-preview/Microsoft.Confluent.json b/schemas/2021-03-01-preview/Microsoft.Confluent.json new file mode 100644 index 0000000000..4cc2a75b6c --- /dev/null +++ b/schemas/2021-03-01-preview/Microsoft.Confluent.json @@ -0,0 +1,283 @@ +{ + "id": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.Confluent", + "description": "Microsoft Confluent Resource Types", + "resourceDefinitions": { + "organizations": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2021-03-01-preview" + ] + }, + "location": { + "type": "string", + "description": "Location of Organization resource" + }, + "name": { + "type": "string", + "description": "Organization resource name" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/OrganizationResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Organization resource property" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Organization resource tags" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Confluent/organizations" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Confluent/organizations" + } + }, + "subscription_resourceDefinitions": { + "agreements": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2021-03-01-preview" + ] + }, + "name": { + "type": "string", + "enum": [ + "default" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ConfluentAgreementProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Terms properties for Marketplace and Confluent." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Confluent/agreements" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Confluent/agreements" + } + }, + "definitions": { + "ConfluentAgreementProperties": { + "type": "object", + "properties": { + "accepted": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "If any version of the terms have been accepted, otherwise false." + }, + "licenseTextLink": { + "type": "string", + "description": "Link to HTML with Microsoft and Publisher terms." + }, + "plan": { + "type": "string", + "description": "Plan identifier string." + }, + "privacyPolicyLink": { + "type": "string", + "description": "Link to the privacy policy of the publisher." + }, + "product": { + "type": "string", + "description": "Product identifier string." + }, + "publisher": { + "type": "string", + "description": "Publisher identifier string." + }, + "retrieveDatetime": { + "type": "string", + "format": "date-time", + "description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false." + }, + "signature": { + "type": "string", + "description": "Terms signature." + } + }, + "description": "Terms properties for Marketplace and Confluent." + }, + "OfferDetail": { + "type": "object", + "properties": { + "id": { + "type": "string", + "maxLength": 50, + "description": "Offer Id" + }, + "planId": { + "type": "string", + "maxLength": 50, + "description": "Offer Plan Id" + }, + "planName": { + "type": "string", + "maxLength": 50, + "description": "Offer Plan Name" + }, + "publisherId": { + "type": "string", + "maxLength": 50, + "description": "Publisher Id" + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Started", + "PendingFulfillmentStart", + "InProgress", + "Subscribed", + "Suspended", + "Reinstated", + "Succeeded", + "Failed", + "Unsubscribed", + "Updating" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "SaaS Offer Status." + }, + "termUnit": { + "type": "string", + "maxLength": 25, + "description": "Offer Plan Term unit" + } + }, + "required": [ + "id", + "planId", + "planName", + "publisherId", + "termUnit" + ], + "description": "Confluent Offer detail" + }, + "OrganizationResourceProperties": { + "type": "object", + "properties": { + "offerDetail": { + "oneOf": [ + { + "$ref": "#/definitions/OfferDetail" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Confluent Offer detail" + }, + "userDetail": { + "oneOf": [ + { + "$ref": "#/definitions/UserDetail" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Subscriber detail" + } + }, + "required": [ + "offerDetail", + "userDetail" + ], + "description": "Organization resource property" + }, + "UserDetail": { + "type": "object", + "properties": { + "emailAddress": { + "oneOf": [ + { + "type": "string", + "pattern": "^\\S+@\\S+\\.\\S+$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Email address" + }, + "firstName": { + "type": "string", + "maxLength": 50, + "description": "First name" + }, + "lastName": { + "type": "string", + "maxLength": 50, + "description": "Last name" + } + }, + "required": [ + "emailAddress", + "firstName", + "lastName" + ], + "description": "Subscriber detail" + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 34bbeb0370..4c060b99d9 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -2263,6 +2263,9 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations" }, + { + "$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations" + }, { "$ref": "https://schema.management.azure.com/schemas/2018-01-31/Microsoft.Consumption.json#/resourceDefinitions/budgets" },