From 0031cae613fe4eaa91865d1cd7e1e0ba60d7abd4 Mon Sep 17 00:00:00 2001
From: Teddy Todorov <thtodoro@microsoft.com>
Date: Thu, 27 May 2021 01:12:17 -0400
Subject: [PATCH] [MFE] Discriminator definitions have "additionalProperties"
 (#14554)

* Enabling java client (#1)

* Revert "Enabling java client (#1)" (#2)

This reverts commit 26873d33199c64732735a5c0f92fe90f4044453e.

* discriminators have additionalProperties

* Revert "Revert "Enabling java client (#1)" (#2)"

This reverts commit 41d5801adebc54d36fba114398c84848e4b4b112.

* Revert "Enabling java client (#1)"

This reverts commit 7537c824c3620b67e18acdfe5ea650fe9c18d962.

Co-authored-by: Harneet Virk <harnvir@microsoft.com>
---
 .../preview/2021-03-01-preview/mfe.json       | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json
index 37f27aca3551..e46c592dda02 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2021-03-01-preview/mfe.json
@@ -5068,8 +5068,7 @@
           "$ref": "#/definitions/ReferenceType"
         }
       },
-      "discriminator": "referenceType",
-      "additionalProperties": false
+      "discriminator": "referenceType"
     },
     "IdAssetReference": {
       "description": "Reference to an asset via its ARM resource ID.",
@@ -5799,8 +5798,7 @@
           "$ref": "#/definitions/SecretsType"
         }
       },
-      "discriminator": "secretsType",
-      "additionalProperties": false
+      "discriminator": "secretsType"
     },
     "AccountKeyDatastoreSecrets": {
       "description": "Datastore account key secrets.",
@@ -5831,8 +5829,7 @@
           "$ref": "#/definitions/CredentialsType"
         }
       },
-      "discriminator": "credentialsType",
-      "additionalProperties": false
+      "discriminator": "credentialsType"
     },
     "AccountKeyDatastoreCredentials": {
       "description": "Account key datastore credentials configuration.",
@@ -6115,8 +6112,7 @@
           "$ref": "#/definitions/ContentsType"
         }
       },
-      "discriminator": "contentsType",
-      "additionalProperties": false
+      "discriminator": "contentsType"
     },
     "AzureBlobContents": {
       "description": "Azure Blob datastore configuration.",
@@ -6865,8 +6861,7 @@
           ]
         }
       },
-      "discriminator": "dockerSpecificationType",
-      "additionalProperties": false
+      "discriminator": "dockerSpecificationType"
     },
     "DockerImage": {
       "description": "Class to represent configuration settings for Docker Build",
@@ -7235,8 +7230,7 @@
           ]
         }
       },
-      "discriminator": "distributionType",
-      "additionalProperties": false
+      "discriminator": "distributionType"
     },
     "TensorFlow": {
       "description": "TensorFlow distribution configuration.",
@@ -7336,8 +7330,7 @@
           ]
         }
       },
-      "discriminator": "identityType",
-      "additionalProperties": false
+      "discriminator": "identityType"
     },
     "AmlToken": {
       "description": "AML Token identity configuration.",
@@ -7493,8 +7486,7 @@
           }
         }
       },
-      "discriminator": "jobType",
-      "additionalProperties": false
+      "discriminator": "jobType"
     },
     "CommandJob": {
       "description": "Command job definition.",
@@ -7689,8 +7681,7 @@
           "type": "integer"
         }
       },
-      "discriminator": "policyType",
-      "additionalProperties": false
+      "discriminator": "policyType"
     },
     "BanditPolicy": {
       "description": "Defines an early termination policy based on slack criteria, and a frequency and delay interval for evaluation",
@@ -8184,8 +8175,7 @@
           ]
         }
       },
-      "discriminator": "mediaType",
-      "additionalProperties": false
+      "discriminator": "mediaType"
     },
     "LabelingJobImageProperties": {
       "description": "Properties of a labeling job for image data",
@@ -8585,8 +8575,7 @@
           ]
         }
       },
-      "discriminator": "format",
-      "additionalProperties": false
+      "discriminator": "format"
     },
     "CocoExportSummary": {
       "type": "object",
@@ -8884,8 +8873,7 @@
           "type": "integer"
         }
       },
-      "discriminator": "scaleType",
-      "additionalProperties": false
+      "discriminator": "scaleType"
     },
     "ManualScaleSettings": {
       "type": "object",
@@ -9054,8 +9042,7 @@
           }
         }
       },
-      "discriminator": "endpointComputeType",
-      "additionalProperties": false
+      "discriminator": "endpointComputeType"
     },
     "K8sOnlineDeployment": {
       "type": "object",
@@ -9169,8 +9156,7 @@
           "$ref": "#/definitions/ProbeSettings"
         }
       },
-      "discriminator": "endpointComputeType",
-      "additionalProperties": false
+      "discriminator": "endpointComputeType"
     },
     "PartialAksOnlineDeployment": {
       "type": "object",