From e3f1fb38f6d8c2b317734216116eb692d860b0eb Mon Sep 17 00:00:00 2001 From: Harsh Jain Date: Fri, 16 Apr 2021 17:47:29 +0530 Subject: [PATCH 1/3] Making Offer details and User Details required properties and removing abandoned tag --- .../preview/2021-03-01-preview/confluent.json | 19 ++++++++++++++ .../confluent/resource-manager/readme.md | 26 ------------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json index cde91fc023d3..1b757cc1367e 100644 --- a/specification/confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json +++ b/specification/confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json @@ -697,6 +697,13 @@ "OfferDetail": { "description": "Confluent Offer detail", "type": "object", + "required": [ + "publisherId", + "id", + "planId", + "planName", + "termUnit" + ], "properties": { "publisherId": { "description": "Publisher Id", @@ -732,6 +739,11 @@ "UserDetail": { "description": "Subscriber detail", "type": "object", + "required": [ + "firstName", + "lastName", + "emailAddress" + ], "properties": { "firstName": { "description": "First name", @@ -753,6 +765,10 @@ "OrganizationResourceProperties": { "description": "Organization resource property", "type": "object", + "required": [ + "offerDetail", + "userDetail" + ], "properties": { "createdTime": { "format": "date-time", @@ -789,6 +805,9 @@ "description": "Organization resource.", "type": "object", "x-ms-azure-resource": true, + "required": [ + "properties" + ], "properties": { "id": { "description": "The ARM id of the resource.", diff --git a/specification/confluent/resource-manager/readme.md b/specification/confluent/resource-manager/readme.md index d3f7016c102a..2ae157e08dbf 100644 --- a/specification/confluent/resource-manager/readme.md +++ b/specification/confluent/resource-manager/readme.md @@ -113,29 +113,3 @@ See configuration in [readme.typescript.md](./readme.typescript.md) ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) - -## Multi-API/Profile support for AutoRest v3 generators - -AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. - -This block is updated by an automatic script. Edits may be lost! - -``` yaml $(tag) == 'all-api-versions' /* autogenerated */ -# include the azure profile definitions from the standard location -require: $(this-folder)/../../../profiles/readme.md - -# all the input files across all versions -input-file: - - $(this-folder)/Microsoft.Confluent/stable/2020-03-01/confluent.json - - $(this-folder)/Microsoft.Confluent/preview/2020-03-01-preview/confluent.json - - $(this-folder)/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json - -``` - -If there are files that should not be in the `all-api-versions` set, -uncomment the `exclude-file` section below and add the file paths. - -``` yaml $(tag) == 'all-api-versions' -#exclude-file: -# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json -``` \ No newline at end of file From 34d4e3d41b0fce419a19295859cd9a77f21d8598 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Mon, 19 Apr 2021 14:26:01 +0800 Subject: [PATCH 2/3] fix python configuration --- specification/confluent/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/confluent/resource-manager/readme.md b/specification/confluent/resource-manager/readme.md index 2ae157e08dbf..cf949448c761 100644 --- a/specification/confluent/resource-manager/readme.md +++ b/specification/confluent/resource-manager/readme.md @@ -68,7 +68,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net - - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js From 73dfd0770e656d0d7d35bb2845408ed5c13f31de Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Mon, 19 Apr 2021 14:43:29 +0800 Subject: [PATCH 3/3] Update readme.python.md --- specification/confluent/resource-manager/readme.python.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/confluent/resource-manager/readme.python.md b/specification/confluent/resource-manager/readme.python.md index b7652ef0ee6d..f1ba121d7ba2 100644 --- a/specification/confluent/resource-manager/readme.python.md +++ b/specification/confluent/resource-manager/readme.python.md @@ -11,6 +11,8 @@ namespace: azure.mgmt.confluent package-name: azure-mgmt-confluent package-version: 1.0.0b1 clear-output-folder: true +modelerfour: + lenient-model-deduplication: true ``` ``` yaml $(python) && $(python-mode) == 'update'