correcting the placement constraint of publicnetworkaccess (#13674)

Co-authored-by: srinivas thatipamula <[email protected]>
Azure · Mar 30, 2021 · 9cbb172 · 9cbb172
1 parent 148997e
commit 9cbb172
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 36 deletions.
diff --git a/...esource-manager/Microsoft.Synapse/stable/2021-03-01/examples/CreateOrUpdateWorkspace.json b/...esource-manager/Microsoft.Synapse/stable/2021-03-01/examples/CreateOrUpdateWorkspace.json
@@ -44,9 +44,7 @@
             }
           }
         },
-        "networkSettings": {
-          "publicNetworkAccess": "Enabled"
-        }
+        "publicNetworkAccess": "Enabled"
       },
       "location": "East US",
       "tags": {
@@ -118,9 +116,7 @@
               }
             }
           },
-          "networkSettings": {
-            "publicNetworkAccess": "Enabled"
-          }
+          "publicNetworkAccess": "Enabled"
         },
         "tags": {
           "key": "value"
@@ -167,9 +163,7 @@
               }
             }
           },
-          "networkSettings": {
-            "publicNetworkAccess": "Enabled"
-          }
+          "publicNetworkAccess": "Enabled"
         },
         "tags": {
           "key": "value"

diff --git a/...ynapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/examples/UpdateWorkspace.json b/...ynapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/examples/UpdateWorkspace.json
@@ -39,7 +39,8 @@
               "keyVaultUrl": "https://vault.azure.net/keys/key1"
             }
           }
-        }
+        },
+        "publicNetworkAccess": "Enabled"
       }
     }
   },
@@ -82,7 +83,8 @@
                 "keyVaultUrl": "https://vault.azure.net/keys/key1"
               }
             }
-          }
+          },
+          "publicNetworkAccess": "Enabled"
         },
         "tags": {
           "key": "value"
@@ -127,7 +129,8 @@
                 "keyVaultUrl": "https://vault.azure.net/keys/key1"
               }
             }
-          }
+          },
+          "publicNetworkAccess": "Enabled"
         },
         "tags": {
           "key": "value"

diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/workspace.json
@@ -1211,9 +1211,17 @@
           "type": "string",
           "readOnly": true
         },
-        "networkSettings": {
-          "description": "Network Settings",
-          "$ref": "#/definitions/NetworkSettings"
+        "publicNetworkAccess": {
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "description": "Enable or Disable pubic network access to workspace",
+          "type": "string",
+          "x-ms-enum": {
+            "name": "WorkspacePublicNetworkAccess",
+            "modelAsString": true
+          }
         }
       }
     },
@@ -1268,9 +1276,17 @@
           "description": "The encryption details of the workspace",
           "$ref": "#/definitions/EncryptionDetails"
         },
-        "networkSettings": {
-          "description": "Network Settings",
-          "$ref": "#/definitions/NetworkSettings"
+        "publicNetworkAccess": {
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "description": "Enable or Disable pubic network access to workspace",
+          "type": "string",
+          "x-ms-enum": {
+            "name": "WorkspacePublicNetworkAccess",
+            "modelAsString": true
+          }
         }
       }
     },
@@ -1401,24 +1417,6 @@
         "value"
       ],
       "description": "The response to a list restorable dropped Sql pools request"
-    },
-    "NetworkSettings": {
-      "description": "Network Settings",
-      "type": "object",
-      "properties": {
-        "publicNetworkAccess": {
-          "enum": [
-            "Enabled",
-            "Disabled"
-          ],
-          "description": "Enable or Disable pubic network access to workspace",
-          "type": "string",
-          "x-ms-enum": {
-            "name": "WorkspacePublicNetworkAccess",
-            "modelAsString": true
-          }
-        }
-      }
     }
   },
   "parameters": {