Merge pull request #7 from zhaomuzhi/spSupportForWSConnection

add serviceprincipal support
zhaomuzhi · Apr 12, 2022 · 61b8fbe · 61b8fbe
2 parents ad068ac + 7688249
commit 61b8fbe
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/...crosoft.MachineLearningServices/preview/2022-01-01-preview/examples/Workspace/update.json b/...crosoft.MachineLearningServices/preview/2022-01-01-preview/examples/Workspace/update.json
@@ -35,6 +35,7 @@
           "publicNetworkAccess": "Disabled"
         }
       }
-    }
+    },
+    "202": {}
   }
 }
diff --git a/...Microsoft.MachineLearningServices/preview/2022-01-01-preview/machineLearningServices.json b/...Microsoft.MachineLearningServices/preview/2022-01-01-preview/machineLearningServices.json
@@ -4875,7 +4875,8 @@
         "ManagedIdentity",
         "UsernamePassword",
         "None",
-        "SAS"
+        "SAS",
+        "ServicePrincipal"
       ],
       "type": "string",
       "description": "Authentication type of the connection target",
@@ -4943,6 +4944,39 @@
       "additionalProperties": false,
       "x-ms-discriminator-value": "PAT"
     },
+    "ServicePrincipal": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Credentials"
+        }
+      ],
+      "properties": {
+        "clientId": {
+          "type": "string"
+        },
+        "clientSecret": {
+          "type": "string"
+        },
+        "tenantId": {
+          "type": "string"
+        }
+      }
+    },
+    "ServicePrincipalAuthTypeWorkspaceConnectionProperties": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/WorkspaceConnectionPropertiesV2"
+        }
+      ],
+      "properties": {
+        "credentials": {
+          "$ref": "#/definitions/ServicePrincipal"
+        }
+      },
+      "x-ms-discriminator-value": "ServicePrincipal"
+    },
     "SharedAccessSignature": {
       "type": "object",
       "allOf": [
@@ -5020,6 +5054,11 @@
             "name": "ValueFormat",
             "modelAsString": true
           }
+        },
+        "metadata": {
+          "description": "Other Metadata that we would like to store with workspace connection.",
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "additionalProperties": false,
@@ -5471,4 +5510,3 @@
     }
   }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ @@
               "publicNetworkAccess": "Disabled"
             }
           }
-        }
+        },
+        "202": {}
       }
     }