Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Srinuthati/publicnetworkplacement #13674

Merged
merged 4 commits into from
Mar 30, 2021
Merged

Srinuthati/publicnetworkplacement #13674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d451e2
Merge pull request #1 from Azure/master
srinuthati Jan 15, 2021
d9471ee
Merge https://github.com/Azure/azure-rest-api-specs
Feb 17, 2021
22eff43
Merge https://github.com/Azure/azure-rest-api-specs
Mar 26, 2021
dbad761
correcting the placement constraint of publicnetworkaccess
Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions ...esource-manager/Microsoft.Synapse/stable/2021-03-01/examples/CreateOrUpdateWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
}
}
},
"networkSettings": {
"publicNetworkAccess": "Enabled"
}
"publicNetworkAccess": "Enabled"
},
"location": "East US",
"tags": {
Expand Down Expand Up @@ -118,9 +116,7 @@
}
}
},
"networkSettings": {
"publicNetworkAccess": "Enabled"
}
"publicNetworkAccess": "Enabled"
},
"tags": {
"key": "value"
Expand Down Expand Up @@ -167,9 +163,7 @@
}
}
},
"networkSettings": {
"publicNetworkAccess": "Enabled"
}
"publicNetworkAccess": "Enabled"
},
"tags": {
"key": "value"
Expand Down
9 changes: 6 additions & 3 deletions ...ynapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/examples/UpdateWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"keyVaultUrl": "https://vault.azure.net/keys/key1"
}
}
}
},
"publicNetworkAccess": "Enabled"
}
}
},
Expand Down Expand Up @@ -82,7 +83,8 @@
"keyVaultUrl": "https://vault.azure.net/keys/key1"
}
}
}
},
"publicNetworkAccess": "Enabled"
},
"tags": {
"key": "value"
Expand Down Expand Up @@ -127,7 +129,8 @@
"keyVaultUrl": "https://vault.azure.net/keys/key1"
}
}
}
},
"publicNetworkAccess": "Enabled"
},
"tags": {
"key": "value"
Expand Down
46 changes: 22 additions & 24 deletions specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-03-01/workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
},
Expand Down Expand Up @@ -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
}
}
}
},
Expand Down Expand Up @@ -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": {
Expand Down