Removing Private Preview features from Swagger (#9046)

Azure · Apr 15, 2020 · 0ea15aa · 0ea15aa
1 parent b929095
commit 0ea15aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 118 deletions.
diff --git a/...cation/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/...cation/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json
@@ -586,10 +586,6 @@
     },
     "WorkspaceCustomParameters": {
       "properties": {
-        "amlWorkspaceId": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The Workspace ID of an Azure Machine Learning Workspace"
-        },
         "customVirtualNetworkId": {
           "$ref": "#/definitions/WorkspaceCustomStringParameter",
           "description": "The ID of a Virtual Network where this Databricks Cluster should be created"
@@ -601,38 +597,6 @@
         "customPrivateSubnetName": {
           "$ref": "#/definitions/WorkspaceCustomStringParameter",
           "description": "The name of the Private Subnet within the Virtual Network"
-        },
-        "enableNoPublicIp": {
-          "$ref": "#/definitions/WorkspaceCustomBooleanParameter",
-          "description": "Should the Public IP be Disabled?"
-        },
-        "loadBalancerBackendPoolName": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The name of a Backend Address Pool within an Azure Load Balancer"
-        },
-        "loadBalancerId": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The Resource ID of an Azure Load Balancer"
-        },
-        "relayNamespaceName": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The name of an Azure Relay Namespace"
-        },
-        "storageAccountName": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The name which should be used for the Storage Account"
-        },
-        "storageAccountSkuName": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The SKU which should be used for this Storage Account"
-        },
-        "resourceTags": {
-          "$ref": "#/definitions/WorkspaceCustomObjectParameter",
-          "description": "A map of Tags which should be applied to the resources used by this Databricks Cluster."
-        },
-        "vnetAddressPrefix": {
-          "$ref": "#/definitions/WorkspaceCustomStringParameter",
-          "description": "The first 2 octets of the virtual network /16 address range (e.g., '10.139' for the address range 10.139.0.0/16)."
         }
       },
       "description": "Custom Parameters used for Cluster Creation."

diff --git a/...anager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/...anager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json
@@ -8,8 +8,14 @@
       "properties": {
         "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
         "parameters": {
-          "storageAccountName": {
-            "value": "myStorageAccount"
+          "customVirtualNetworkId": {
+            "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
+          },
+          "customPublicSubnetName": {
+            "value": "myPublicSubnet"
+          },
+          "customPrivateSubnetName": {
+            "value": "myPrivateSubnet"
           }
         }
       },
@@ -30,55 +36,17 @@
         "properties": {
           "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
           "parameters": {
-            "amlWorkspaceId": {
-              "type": "String",
-              "value": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.MachineLearningServices/workspaces/myAmlWorkspace"
-            },
             "customPrivateSubnetName": {
               "type": "String",
-              "value": "PrivateBob"
+              "value": "myPrivateSubnet"
             },
             "customPublicSubnetName": {
               "type": "String",
-              "value": "PublicSarah"
+              "value": "myPublicSubnet"
             },
             "customVirtualNetworkId": {
               "type": "String",
               "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
-            },
-            "enableNoPublicIp": {
-              "type": "Bool",
-              "value": true
-            },
-            "loadBalancerBackendPoolName": {
-              "type": "String",
-              "value": "CustomBackendAddressPool"
-            },
-            "loadBalancerId": {
-              "type": "String",
-              "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/loadBalancers/lb1"
-            },
-            "relayNamespaceName": {
-              "type": "String",
-              "value": "test"
-            },
-            "resourceTags": {
-              "type": "Object",
-              "value": {
-                "hello": "world"
-              }
-            },
-            "storageAccountName": {
-              "type": "String",
-              "value": "mysa999"
-            },
-            "storageAccountSkuName": {
-              "type": "String",
-              "value": "Standard_GRS"
-            },
-            "vnetAddressPrefix": {
-              "type": "String",
-              "value": "10.139"
             }
           },
           "provisioningState": "Succeeded",

diff --git a/...ource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/...ource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json
@@ -30,46 +30,6 @@
             "customVirtualNetworkId": {
               "type": "String",
               "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
-            },
-            "enableNoPublicIp": {
-              "type": "Bool",
-              "value": true
-            },
-            "loadBalancerBackendPoolName": {
-              "type": "String",
-              "value": ""
-            },
-            "loadBalancerId": {
-              "type": "String",
-              "value": ""
-            },
-            "relayNamespaceName": {
-              "type": "String",
-              "value": "test"
-            },
-            "storageAccountName": {
-              "type": "String",
-              "value": "examplesa99"
-            },
-            "storageAccountSkuName": {
-              "type": "String",
-              "value": "Standard_GRS"
-            },
-            "vnetAddressPrefix": {
-              "type": "String",
-              "value": "10.139"
-            },
-            "resourceTags": {
-              "type": "Object",
-              "value": {
-                "application": "databricks",
-                "databricks-environment": "true",
-                "Environment": "Production"
-              }
-            },
-            "amlWorkspaceId": {
-              "type": "String",
-              "value": ""
             }
           },
           "provisioningState": "Succeeded",