Making Offer details and User Details required properties (Azure#13985)

* Making Offer details and User Details required properties and removing abandoned tag * fix python configuration * Update readme.python.md Co-authored-by: msyyc <[email protected]>
test-repo-tih · Apr 20, 2021 · 6010c74 · 6010c74
1 parent da8568e
commit 6010c74
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/.../confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json b/.../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
@@ -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
@@ -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
-```
diff --git 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'