Skip to content

Merge Network release branch into master #6632

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

Merged
sergey-shandar merged 22 commits into from
Jul 16, 2019
Merged

Merge Network release branch into master #6632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f1a22bb
Adds base for updating Microsoft.Network from version stable/2019-04-…
anton-evseev May 30, 2019
7a4766f
Updates readme
anton-evseev May 30, 2019
9a90b66
Updates API version in new specs and examples
anton-evseev May 30, 2019
92c5e0e
Add PrivateIPAddressVersion in LoadBalancerFrontendIpConfiguration pr…
jaepark08 Jun 5, 2019
d7a0b28
Update specs to avoid readOnly in the request body (#6228)
EvgenyAgafonchikov Jun 6, 2019
57ae4ca
typo: netowork May double word the (#6206)
nschonni Jun 6, 2019
83bd6e4
Update cipher suites (#6213)
EvgenyAgafonchikov Jun 10, 2019
86778f1
removing resource group name from PrepareNetworkPoliciesRequest (#6232)
mvvsubbu Jun 11, 2019
138e2b4
Add exception for property "Conditon" in Network's webapplicationfire…
anton-evseev Jun 13, 2019
e579a86
Extend long-running ops fixes to new API version; Suppression (#6336)
EvgenyAgafonchikov Jun 17, 2019
27d0083
Updated examples to have valid bodies for live put (#6349)
EvgenyAgafonchikov Jun 17, 2019
0334e5b
More examples fix after live testing (#6382)
EvgenyAgafonchikov Jun 19, 2019
c22ce34
Improve descriptions in Network to align with Swagger guidelines (#6350)
anton-evseev Jun 24, 2019
d19ecfd
More examples improvements (#6444)
EvgenyAgafonchikov Jun 25, 2019
1874de9
Add PATCH to Azure Firewall supported operations (#6486)
fanymanea Jul 2, 2019
bf45d1d
PrivateEndpoint & PrivateLinkService APIs update (#6332)
bowen0106 Jul 3, 2019
d3acd59
Improve Network's examples (#6493)
anton-evseev Jul 9, 2019
33dbdc1
chore: jsonfmt network (#6592)
nschonni Jul 15, 2019
293c053
Adding VpnSiteLink and VpnSiteLinkConnection properties. (#6528)
nalinrajgupta Jul 16, 2019
7c89fec
Merge branch 'network-may-release' into network-merge
anton-evseev Jul 16, 2019
9f64beb
chore: jsonfmt network-may
nschonni Jul 16, 2019
1eb6920
Fix incorrect examples
anton-evseev Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 1 addition & 13 deletions cSpell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
]
},
{
"filename": "**/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/webapplicationfirewall.json",
"filename": "**/specification/network/resource-manager/Microsoft.Network/stable/**/webapplicationfirewall.json",
"words": [
"Conditon"
]
Expand Down Expand Up @@ -623,18 +623,6 @@
"networkrulesets",
"Setget"
]
},
{
"filename": "**/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/webapplicationfirewall.json",
"words": [
"Conditon"
]
},
{
"filename": "**/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/webapplicationfirewall.json",
"words": [
"Conditon"
]
}
]
}
3 changes: 3 additions & 0 deletions ...tion/network/resource-manager/Microsoft.Network/stable/2019-04-01/applicationGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@
}
},
"x-ms-examples": {
"Create Application Gateway Without Certificates": {
"$ref": "./examples/ApplicationGatewayNoCertificatesCreate.json"
},
"Create Application Gateway": {
"$ref": "./examples/ApplicationGatewayCreate.json"
}
Expand Down
1 change: 0 additions & 1 deletion specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/bastionHost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@
},
"name": {
"type": "string",
"readOnly": true,
"description": "Name of the resource that is unique within a resource group. This name can be used to access the resource."
},
"etag": {
Expand Down
57 changes: 56 additions & 1 deletion ...icrosoft.Network/stable/2019-04-01/examples/ApplicationGatewayAvailableSslOptionsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,61 @@
"subscriptionId": "subid"
},
"responses": {
"200": {}
"200": {
"body": {
"name": "default",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default",
Copy link
Contributor

@nschonni nschonni Jul 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think the resourceGroup// needs to be removed from these ids. Another 16 hits below

Suggested change
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default",
"id": "/subscriptions/subid/providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default",

Copy link
Contributor Author

@anton-evseev anton-evseev Jul 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I got from the server
image

Copy link
Contributor

@nschonni nschonni Jul 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd, the url in the spec is /subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGatewayAvailableSslOptions/default"

Copy link
Contributor Author

@anton-evseev anton-evseev Jul 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible error on server's side. I'll try to follow up with AppGw team

"type": "Microsoft.Network/ApplicationGatewayAvailableSslOptions",
"properties": {
"predefinedPolicies": [
{
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501"
},
{
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401"
},
{
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S"
}
],
"defaultPolicy": "AppGwSslPolicy20150501",
"availableCipherSuites": [
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_3DES_EDE_CBC_SHA",
"TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
],
"availableProtocols": [
"TLSv1_0",
"TLSv1_1",
"TLSv1_2"
]
}
}
}
}
}
94 changes: 93 additions & 1 deletion ...table/2019-04-01/examples/ApplicationGatewayAvailableSslOptionsPredefinedPoliciesGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,98 @@
"subscriptionId": "subid"
},
"responses": {
"200": {}
"200": {
"body": {
"value": [
{
"name": "AppGwSslPolicy20150501",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
"properties": {
"cipherSuites": [
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_3DES_EDE_CBC_SHA",
"TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
],
"minProtocolVersion": "TLSv1_0"
}
},
{
"name": "AppGwSslPolicy20170401",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401",
"properties": {
"cipherSuites": [
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA"
],
"minProtocolVersion": "TLSv1_1"
}
},
{
"name": "AppGwSslPolicy20170401S",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S",
"properties": {
"cipherSuites": [
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA"
],
"minProtocolVersion": "TLSv1_2"
}
}
]
}
}
}
}
40 changes: 39 additions & 1 deletion .../stable/2019-04-01/examples/ApplicationGatewayAvailableSslOptionsPredefinedPolicyGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,44 @@
"predefinedPolicyName": "AppGwSslPolicy20150501"
},
"responses": {
"200": {}
"200": {
"body": {
"name": "AppGwSslPolicy20150501",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
"properties": {
"cipherSuites": [
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA256",
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
"TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
"TLS_RSA_WITH_3DES_EDE_CBC_SHA",
"TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
],
"minProtocolVersion": "TLSv1_0"
}
}
}
}
}
Loading