From f545a22cf8e10a9f5fff87d697eb48d270a030e4 Mon Sep 17 00:00:00 2001
From: ZhidaLiu <86350902+ZhidaLiu@users.noreply.github.com>
Date: Tue, 30 Aug 2022 23:53:11 -0700
Subject: [PATCH 1/3] Update connection type and auth type

---
 .../machineLearningServices.json              | 67 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
index 94234006e4d8..555b9ee8abd7 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
@@ -5684,7 +5684,9 @@
         "ManagedIdentity",
         "UsernamePassword",
         "None",
-        "SAS"
+        "SAS",
+        "ServicePrincipal",
+        "AccessKey"
       ],
       "type": "string",
       "description": "Authentication type of the connection target",
@@ -5697,7 +5699,11 @@
       "enum": [
         "PythonFeed",
         "ContainerRegistry",
-        "Git"
+        "Git",
+        "FeatureStore",
+        "S3",
+        "AzureSqlDb",
+        "AzureSynapseAnalytics"
       ],
       "type": "string",
       "description": "Category of the connection",
@@ -5781,6 +5787,63 @@
       "additionalProperties": false,
       "x-ms-discriminator-value": "UsernamePassword"
     },
+    "WorkspaceConnectionAccessKey": {
+      "type": "object",
+      "properties": {
+        "accessKeyId": {
+          "type": "string"
+        },
+        "secretAccessKey": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "AccessKeyAuthTypeWorkspaceConnectionProperties": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/WorkspaceConnectionPropertiesV2"
+        }
+      ],
+      "properties": {
+        "credentials": {
+          "$ref": "#/definitions/WorkspaceConnectionAccessKey"
+        }
+      },
+      "additionalProperties": false,
+      "x-ms-discriminator-value": "AccessKey"
+    },
+    "WorkspaceConnectionServicePrincipal": {
+      "type": "object",
+      "properties": {
+        "clientId": {
+          "type": "string"
+        },
+        "clientSecret": {
+          "type": "string"
+        },
+        "tenantId": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "ServicePrincipalAuthTypeWorkspaceConnectionProperties": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/WorkspaceConnectionPropertiesV2"
+        }
+      ],
+      "properties": {
+        "credentials": {
+          "$ref": "#/definitions/WorkspaceConnectionServicePrincipal"
+        }
+      },
+      "additionalProperties": false,
+      "x-ms-discriminator-value": "ServicePrincipal"
+    },
     "WorkspaceConnectionPropertiesV2": {
       "required": [
         "authType"

From 1b5794dca219b98a8140eaaf00129f6a1d66f3a5 Mon Sep 17 00:00:00 2001
From: ZhidaLiu <86350902+ZhidaLiu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 15:37:46 -0700
Subject: [PATCH 2/3] update connection category

---
 .../machineLearningServices.json                  | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
index 8a54f99d935a..c790f190cd20 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
@@ -5849,21 +5849,8 @@
       }
     },
     "ConnectionCategory": {
-      "enum": [
-        "PythonFeed",
-        "ContainerRegistry",
-        "Git",
-        "FeatureStore",
-        "S3",
-        "AzureSqlDb",
-        "AzureSynapseAnalytics"
-      ],
       "type": "string",
-      "description": "Category of the connection",
-      "x-ms-enum": {
-        "name": "ConnectionCategory",
-        "modelAsString": true
-      }
+      "description": "Category of the connection"
     },
     "WorkspaceConnectionUsernamePassword": {
       "type": "object",

From 1389b974e6ce5aaa1c80847cc83222c46305f1a3 Mon Sep 17 00:00:00 2001
From: ZhidaLiu <86350902+ZhidaLiu@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:55:22 -0700
Subject: [PATCH 3/3] update x-ms-secret tag

---
 .../preview/2022-10-01-preview/machineLearningServices.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
index 5ec5545a7001..733bff52b38f 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-10-01-preview/machineLearningServices.json
@@ -5935,7 +5935,8 @@
           "type": "string"
         },
         "secretAccessKey": {
-          "type": "string"
+          "type": "string",
+          "x-ms-secret": true
         }
       },
       "additionalProperties": false
@@ -5962,7 +5963,8 @@
           "type": "string"
         },
         "clientSecret": {
-          "type": "string"
+          "type": "string",
+          "x-ms-secret": true
         },
         "tenantId": {
           "type": "string"