Generated from a549e1823957a0c2def96950290ecac98dcd5b37

Azure · Sep 11, 2020 · 6085f15 · 6085f15
1 parent cf636b1
commit 6085f15
Show file tree

Hide file tree

Showing 13 changed files with 174 additions and 95 deletions.
diff --git a/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json b/schemas/2018-03-01-preview/Microsoft.MachineLearningServices.json
@@ -675,4 +675,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/computes"
     }
   }
-}
+}
diff --git a/schemas/2018-11-19/Microsoft.MachineLearningServices.json b/schemas/2018-11-19/Microsoft.MachineLearningServices.json
@@ -848,4 +848,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/computes"
     }
   }
-}
+}
diff --git a/schemas/2019-05-01/Microsoft.MachineLearningServices.json b/schemas/2019-05-01/Microsoft.MachineLearningServices.json
@@ -848,4 +848,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/computes"
     }
   }
-}
+}
diff --git a/schemas/2019-06-01/Microsoft.MachineLearningServices.json b/schemas/2019-06-01/Microsoft.MachineLearningServices.json
@@ -864,4 +864,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/computes"
     }
   }
-}
+}
diff --git a/schemas/2019-11-01/Microsoft.MachineLearningServices.json b/schemas/2019-11-01/Microsoft.MachineLearningServices.json
@@ -911,4 +911,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/computes"
     }
   }
-}
+}
diff --git a/schemas/2020-01-01/Microsoft.MachineLearningServices.json b/schemas/2020-01-01/Microsoft.MachineLearningServices.json
@@ -1234,4 +1234,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections"
     }
   }
-}
+}
diff --git a/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json b/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json
@@ -1421,4 +1421,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections"
     }
   }
-}
+}
diff --git a/schemas/2020-03-01/Microsoft.MachineLearningServices.json b/schemas/2020-03-01/Microsoft.MachineLearningServices.json
@@ -1322,4 +1322,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections"
     }
   }
-}
+}
diff --git a/schemas/2020-04-01/Microsoft.MachineLearningServices.json b/schemas/2020-04-01/Microsoft.MachineLearningServices.json
@@ -1379,4 +1379,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections"
     }
   }
-}
+}
diff --git a/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-05-01-preview/Microsoft.MachineLearningServices.json
@@ -2832,4 +2832,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/services"
     }
   }
-}
+}
diff --git a/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json b/schemas/2020-05-15-preview/Microsoft.MachineLearningServices.json
@@ -2894,4 +2894,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/services"
     }
   }
-}
+}
diff --git a/schemas/2020-06-01/Microsoft.MachineLearningServices.json b/schemas/2020-06-01/Microsoft.MachineLearningServices.json
@@ -228,21 +228,6 @@
             "2020-06-01"
           ]
         },
-        "identity": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Identity"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Identity for the resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "Specifies the location of the resource."
-        },
         "name": {
           "type": "string",
           "description": "The name of the private endpoint connection associated with the workspace"
@@ -258,32 +243,6 @@
           ],
           "description": "Properties of the PrivateEndpointConnectProperties."
         },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Sku"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Sku of the resource"
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource tags defined as key/value pairs."
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -1479,21 +1438,6 @@
             "2020-06-01"
           ]
         },
-        "identity": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Identity"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Identity for the resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "Specifies the location of the resource."
-        },
         "name": {
           "type": "string",
           "description": "The name of the private endpoint connection associated with the workspace"
@@ -1509,32 +1453,6 @@
           ],
           "description": "Properties of the PrivateEndpointConnectProperties."
         },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Sku"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Sku of the resource"
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Contains resource tags defined as key/value pairs."
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -1551,4 +1469,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections"
     }
   }
-}
+}
diff --git a/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json
@@ -1153,6 +1153,24 @@
       },
       "description": "AML Compute properties"
     },
+    "AssignedUser": {
+      "type": "object",
+      "properties": {
+        "objectId": {
+          "type": "string",
+          "description": "User’s AAD Object Id."
+        },
+        "tenantId": {
+          "type": "string",
+          "description": "User’s AAD Tenant Id."
+        }
+      },
+      "required": [
+        "objectId",
+        "tenantId"
+      ],
+      "description": "A user that can be assigned to a compute instance."
+    },
     "Compute": {
       "type": "object",
       "oneOf": [
@@ -1162,6 +1180,9 @@
         {
           "$ref": "#/definitions/AmlCompute"
         },
+        {
+          "$ref": "#/definitions/ComputeInstance"
+        },
         {
           "$ref": "#/definitions/VirtualMachine"
         },
@@ -1194,6 +1215,129 @@
       },
       "description": "Machine Learning compute object."
     },
+    "ComputeInstance": {
+      "type": "object",
+      "properties": {
+        "computeType": {
+          "type": "string",
+          "enum": [
+            "ComputeInstance"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ComputeInstanceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Compute Instance properties"
+        }
+      },
+      "required": [
+        "computeType"
+      ],
+      "description": "An Azure Machine Learning compute instance."
+    },
+    "ComputeInstanceProperties": {
+      "type": "object",
+      "properties": {
+        "applicationSharingPolicy": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Personal",
+                "Shared"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Policy for sharing applications on this compute instance among users of parent workspace. If Personal, only the creator can access applications on this compute instance. When Shared, any workspace user can access applications on this instance depending on his/her assigned role."
+        },
+        "computeInstanceAuthorizationType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "personal"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Compute Instance Authorization type. Available values are personal (default)."
+        },
+        "personalComputeInstanceSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PersonalComputeInstanceSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Settings for a personal compute instance."
+        },
+        "sshSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ComputeInstanceSshSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies policy and settings for SSH access."
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceId"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Represents a resource ID. For example, for a subnet, it is the resource URL for the subnet."
+        },
+        "vmSize": {
+          "type": "string",
+          "description": "Virtual Machine Size"
+        }
+      },
+      "description": "Compute Instance properties"
+    },
+    "ComputeInstanceSshSettings": {
+      "type": "object",
+      "properties": {
+        "adminPublicKey": {
+          "type": "string",
+          "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs."
+        },
+        "sshPublicAccess": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable."
+        }
+      },
+      "description": "Specifies policy and settings for SSH access."
+    },
     "ContainerResourceRequirements": {
       "type": "object",
       "properties": {
@@ -2151,6 +2295,23 @@
       },
       "description": "The configuration for a Spark environment."
     },
+    "PersonalComputeInstanceSettings": {
+      "type": "object",
+      "properties": {
+        "assignedUser": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AssignedUser"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A user that can be assigned to a compute instance."
+        }
+      },
+      "description": "Settings for a personal compute instance."
+    },
     "PrivateEndpoint": {
       "type": "object",
       "properties": {},
@@ -2947,4 +3108,4 @@
       "description": "Microsoft.MachineLearningServices/workspaces/services"
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -675,4 +675,4 @@ @@
           "description": "Microsoft.MachineLearningServices/workspaces/computes"
         }
       }
-    }
+    }