Skip to content

Commit

Permalink
Merge Network release branch into master (Azure#6632)
Browse files Browse the repository at this point in the history 
* Adds base for updating Microsoft.Network from version stable/2019-04-01 to version 2019-06-01

* Updates readme

* Updates API version in new specs and examples

* Add PrivateIPAddressVersion in LoadBalancerFrontendIpConfiguration pr… (Azure#6164)

* Add PrivateIPAddressVersion in LoadBalancerFrontendIpConfiguration properties.

* Fixed LB examples

* Fix examples in 2019-06-01

* Remove API version number in privateIPAddressVersion description.

* Add privateIPAddressVersion in LoadBalancer examples.

* Add privateIPAddressVersion in 2019-06-01 API version.

* Update specs to avoid readOnly in the request body (Azure#6228)

* typo: netowork May double word the (Azure#6206)

* Update cipher suites (Azure#6213)

* removing resource group name from PrepareNetworkPoliciesRequest (Azure#6232)

* Add exception for property "Conditon" in Network's webapplicationfirewall.json (Azure#6335)

* Extend long-running ops fixes to new API version; Suppression (Azure#6336)

* Update long-running for new API version

* Add suppression for new API

* Updated examples to have valid bodies for live put (Azure#6349)

* More examples fix after live testing (Azure#6382)

* Improved more examples after live testing

* Fix validations

* Improve descriptions in Network to align with Swagger guidelines (Azure#6350)

* Improve descriptions in Network to align with Swagger guidelines

* Fix for CI

* More examples improvements (Azure#6444)

* Add PATCH to Azure Firewall supported operations (Azure#6486)

* Add PATCH to Azure Firewall supported operations

* Name the parameter how validation expects it

* Patch is not a long running operation, so update the specs accordingly

* PrivateEndpoint & PrivateLinkService APIs update (Azure#6332)

* Add two properties on Subnet for privateIp. Add two new APIs to support privateIp.

Minor modify on readme.md file.

* Fix some issue found by Model Validation.

* Merge all apis relative to private end point / private link service to its json file.

* Fix a typo name from design spec that casue GetAvailablePrivateEndpointType get null property.

* Change AutoApprovedPrivateLinkService structure to fit with NRP side.

* Delete suppress for merged APIs in readme.md.

* 1. Change value to PrivateEndpointConnection when calling put PrivateEndpointConnect.
2. Change opertaion id for opertaions that relative to private endpoint and private link service.

* Minor fix for model validation.

* Revert opertion id changes for AvailablePrivateEndpointType to previous name.

* 1. Change CheckPrivateLinkServiceVisibility API, the input now has a body content that contains a private link service alias string.
2. Change both CheckPrivateLinkServiceVisibility/AutoApprovedPrivateLinkServices API to support for with/without ResourceGroup parameter.

* Improve Network's examples (Azure#6493)

* Removed read-only props from VPNGW example

* Fixed LoadBalancer examples:
* "outboundRules" array isn't returned for "Basic" SKU load balancer
* added example for external LB with outboundRules
* added missing read-only properties

* Replace "regionName" in examples with real location

* Fixed incorrect descriptions in LoadBalancer: child resource doesn't have to have a unique name within resource group, but within a set of similar resource on parent load balancer

* chore: jsonfmt network (Azure#6592)

* Adding VpnSiteLink and VpnSiteLinkConnection properties. (Azure#6528)

* Added VpnSiteLink/VpnSiteLinkConnection operations.

* Sdk changes for vpn site link.

* Fixing error.

* Fixing more comments.

* Fixing json error.

* Fixing json files.

* Fixing comments.

* Fixing more issues.

* Fixing more errors.

* Fixing more error.

* Prettify JSON in VpnConnectionGet.json

* Resolving more comments.

* Fixing typo.

* Adding type in examples of put.

* Removing Child resource type.

* chore: jsonfmt network-may

* Fix incorrect examples
  • Loading branch information
@anton-evseev @celikcigdem
anton-evseev authored and celikcigdem committed Jul 17, 2019
1 parent dc0a2ce commit cd19c2b
Show file tree
Hide file tree
Showing 477 changed files with 61,976 additions and 178 deletions.
14 changes: 1 addition & 13 deletions cSpell.json
View file
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
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
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
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",
"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
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
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

0 comments on commit cd19c2b

Please sign in to comment.