From 38a8e58ba6e83e58ecdf1c62d782a828fd78ced3 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Mon, 5 Oct 2020 21:59:36 -0700 Subject: [PATCH 01/13] FirewallPolicy Application Rule with WebCategories --- ...leCollectionGroupWithWebCategoriesGet.json | 52 ++++++++ ...eCollectionGroupWithWebCategoriesList.json | 55 ++++++++ ...leCollectionGroupWithWebCategoriesPut.json | 125 ++++++++++++++++++ .../stable/2020-07-01/firewallPolicy.json | 17 ++- 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json new file mode 100644 index 000000000000..c8e0b25284ca --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "ruleCollectionGroupName": "ruleCollectionGroup1", + "firewallPolicyName": "firewallPolicy", + "resourceGroupName": "rg1", + "api-version": "2020-08-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "priority": 200, + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json new file mode 100644 index 000000000000..81b5cc18bae6 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "firewallPolicyName": "firewallPolicy", + "resourceGroupName": "rg1", + "api-version": "2020-08-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "name": "Example-Filter-Rule-Collection", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "priority": 120, + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json new file mode 100644 index 000000000000..7e7c5a4b5c12 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json @@ -0,0 +1,125 @@ +{ + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2", + "resourceGroupName": "rg1", + "firewallPolicyName": "firewallPolicy", + "ruleCollectionGroupName": "ruleCollectionGroup1", + "parameters": { + "properties": { + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + }, + "201": { + "body": { + "name": "firewallPolicy", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json index 0a09be99e76f..ccfffa2f5764 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json @@ -419,6 +419,9 @@ }, "Get FirewallPolicyNatRuleCollectionGroup": { "$ref": "./examples/FirewallPolicyNatRuleCollectionGroupGet.json" + }, + "Get FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json" } } }, @@ -495,6 +498,9 @@ }, "Create FirewallPolicyNatRuleCollectionGroup": { "$ref": "./examples/FirewallPolicyNatRuleCollectionGroupPut.json" + }, + "Create FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json" } }, "x-ms-long-running-operation": true, @@ -552,6 +558,9 @@ }, "List all FirewallPolicyRuleCollectionGroups with IpGroups for a given FirewallPolicy": { "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json" + }, + "List all FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json" } }, "x-ms-pageable": { @@ -867,7 +876,13 @@ "terminateTLS": { "type": "boolean", "description": "Terminate TLS connections for this rule." - } + }, + "webCategories": { + "type": "array", + "description": "List of destination azure web categories.", + "items": { + "type": "string" + } }, "description": "Rule of type application." }, From 4a5e53193199cddda85e3028fd207429d1aaa0d9 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Mon, 5 Oct 2020 22:07:24 -0700 Subject: [PATCH 02/13] azureWebCategories --- ...leCollectionGroupWithWebCategoriesGet.json | 2 +- ...eCollectionGroupWithWebCategoriesList.json | 2 +- ...leCollectionGroupWithWebCategoriesPut.json | 2 +- .../stable/2020-07-01/azureWebCategory.json | 184 ++++++++++++++++++ .../AzureWebCategoriesListBySubscription.json | 23 +++ .../examples/AzureWebCategoryGet.json | 20 ++ .../network/resource-manager/readme.md | 1 + 7 files changed, 231 insertions(+), 3 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json index c8e0b25284ca..fd846d5aaeae 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json @@ -3,7 +3,7 @@ "ruleCollectionGroupName": "ruleCollectionGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", - "api-version": "2020-08-01", + "api-version": "2020-07-01", "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json index 81b5cc18bae6..69cb5044022a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json @@ -2,7 +2,7 @@ "parameters": { "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", - "api-version": "2020-08-01", + "api-version": "2020-07-01", "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json index 7e7c5a4b5c12..61a577e93f2c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-08-01", + "api-version": "2020-07-01", "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2", "resourceGroupName": "rg1", "firewallPolicyName": "firewallPolicy", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json new file mode 100644 index 000000000000..ac709f65072d --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -0,0 +1,184 @@ +{ + "swagger": "2.0", + "info": { + "title": "NetworkManagementClient", + "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", + "version": "2020-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories/{name}": { + "get": { + "tags": [ + "AzureWebCategories" + ], + "operationId": "AzureWebCategories_Get", + "description": "Gets the specified Azure Web Category.", + "parameters": [ + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the azureWebCategory." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "Expands resourceIds back referenced by the azureWebCategory resource." + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the resulting azureWebCategory resource.", + "schema": { + "$ref": "#/definitions/AzureWebCategory" + } + }, + "default": { + "description": "Unexpected error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Get_azureWebCategory": { + "$ref": "./examples/azureWebCategoryGet.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories": { + "get": { + "tags": [ + "AzureWebCategories" + ], + "operationId": "AzureWebCategories_ListAll", + "description": "Gets all the Azure Web Categorys in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success. The operation returns a list of Azure Web Category resources.", + "schema": { + "$ref": "#/definitions/AzureWebCategoryListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List all Azure Web Categorys for a given subscription": { + "$ref": "./examples/AzureWebCategoriesListBySubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "AzureWebCategoryPropertiesFormat": { + "properties": { + "group": { + "type": "string", + "readOnly": true, + "description": "The name of the group that the category belongs to." + } + }, + "description": "Azure Web Category Properties." + }, + "AzureWebCategory": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureWebCategoryPropertiesFormat", + "description": "Properties of the Azure Web Category." + }, + "id": { + "type": "string", + "description": "Resource ID." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "description": "Azure Web Category Resource." + }, + "AzureWebCategoryListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/AzureWebCategory" + }, + "description": "List of Azure Web Categorys for a given Subscription." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of results." + } + }, + "description": "Response for ListAzureWebCategories API service call." + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json new file mode 100644 index 000000000000..0bd10464c9ca --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "4de8428a-4a92-4cea-90ff-b47128b8cab8" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Arts", + "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", + "type": "Microsoft.Network/azureWebCategories", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "group": "General" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json new file mode 100644 index 000000000000..12a46f04c53d --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "4de8428a-4a92-4cea-90ff-b47128b8cab8", + "name": "Arts" + }, + "responses": { + "200": { + "body": { + "name": "Arts", + "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", + "type": "Microsoft.Network/azureWebCategories", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "group": "General" + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index eb73513e8666..64ed94248f10 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -44,6 +44,7 @@ input-file: - Microsoft.Network/stable/2020-07-01/availableServiceAliases.json - Microsoft.Network/stable/2020-07-01/azureFirewall.json - Microsoft.Network/stable/2020-07-01/azureFirewallFqdnTag.json + - Microsoft.Network/stable/2020-07-01/azureWebCategory.json - Microsoft.Network/stable/2020-07-01/bastionHost.json - Microsoft.Network/stable/2020-07-01/checkDnsAvailability.json - Microsoft.Network/stable/2020-07-01/customIpPrefix.json From aca8dff127ba76c3ab24a907cab427ada47a76b9 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Mon, 5 Oct 2020 22:19:20 -0700 Subject: [PATCH 03/13] validated models/examples --- .../stable/2020-07-01/azureWebCategory.json | 184 ++++++++++++++++++ .../AzureWebCategoriesListBySubscription.json | 23 +++ .../examples/AzureWebCategoryGet.json | 20 ++ ...rewallPolicyNatRuleCollectionGroupGet.json | 54 +++++ ...rewallPolicyNatRuleCollectionGroupPut.json | 133 +++++++++++++ .../FirewallPolicyRuleCollectionGroupPut.json | 9 +- ...leCollectionGroupWithWebCategoriesGet.json | 52 +++++ ...eCollectionGroupWithWebCategoriesList.json | 55 ++++++ ...leCollectionGroupWithWebCategoriesPut.json | 125 ++++++++++++ .../stable/2020-07-01/firewallPolicy.json | 30 ++- .../network/resource-manager/readme.md | 1 + 11 files changed, 681 insertions(+), 5 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupPut.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json new file mode 100644 index 000000000000..ac709f65072d --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -0,0 +1,184 @@ +{ + "swagger": "2.0", + "info": { + "title": "NetworkManagementClient", + "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", + "version": "2020-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories/{name}": { + "get": { + "tags": [ + "AzureWebCategories" + ], + "operationId": "AzureWebCategories_Get", + "description": "Gets the specified Azure Web Category.", + "parameters": [ + { + "name": "name", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the azureWebCategory." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "Expands resourceIds back referenced by the azureWebCategory resource." + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the resulting azureWebCategory resource.", + "schema": { + "$ref": "#/definitions/AzureWebCategory" + } + }, + "default": { + "description": "Unexpected error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Get_azureWebCategory": { + "$ref": "./examples/azureWebCategoryGet.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories": { + "get": { + "tags": [ + "AzureWebCategories" + ], + "operationId": "AzureWebCategories_ListAll", + "description": "Gets all the Azure Web Categorys in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Success. The operation returns a list of Azure Web Category resources.", + "schema": { + "$ref": "#/definitions/AzureWebCategoryListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List all Azure Web Categorys for a given subscription": { + "$ref": "./examples/AzureWebCategoriesListBySubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "AzureWebCategoryPropertiesFormat": { + "properties": { + "group": { + "type": "string", + "readOnly": true, + "description": "The name of the group that the category belongs to." + } + }, + "description": "Azure Web Category Properties." + }, + "AzureWebCategory": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureWebCategoryPropertiesFormat", + "description": "Properties of the Azure Web Category." + }, + "id": { + "type": "string", + "description": "Resource ID." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "description": "Azure Web Category Resource." + }, + "AzureWebCategoryListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/AzureWebCategory" + }, + "description": "List of Azure Web Categorys for a given Subscription." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of results." + } + }, + "description": "Response for ListAzureWebCategories API service call." + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json new file mode 100644 index 000000000000..0bd10464c9ca --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "4de8428a-4a92-4cea-90ff-b47128b8cab8" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Arts", + "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", + "type": "Microsoft.Network/azureWebCategories", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "group": "General" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json new file mode 100644 index 000000000000..12a46f04c53d --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "4de8428a-4a92-4cea-90ff-b47128b8cab8", + "name": "Arts" + }, + "responses": { + "200": { + "body": { + "name": "Arts", + "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", + "type": "Microsoft.Network/azureWebCategories", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "group": "General" + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupGet.json new file mode 100644 index 000000000000..5365417b95df --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupGet.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "ruleCollectionGroupName": "ruleCollectionGroup1", + "firewallPolicyName": "firewallPolicy", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "priority": 100, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyNatRuleCollection", + "action": { + "type": "DNAT" + }, + "rules": [ + { + "ruleType": "NatRule", + "name": "NatRule1", + "translatedFqdn": "internalhttpserver", + "translatedPort": "8080", + "ipProtocols": [ + "TCP", + "UDP" + ], + "sourceAddresses": [ + "2.2.2.2" + ], + "sourceIpGroups": [], + "destinationAddresses": [ + "152.23.32.23" + ], + "destinationPorts": [ + "8080" + ] + } + ], + "name": "NatRC", + "priority": 100 + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupPut.json new file mode 100644 index 000000000000..a32d9110dcdb --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyNatRuleCollectionGroupPut.json @@ -0,0 +1,133 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "firewallPolicyName": "firewallPolicy", + "ruleCollectionGroupName": "ruleCollectionGroup1", + "parameters": { + "properties": { + "priority": 100, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyNatRuleCollection", + "priority": 100, + "name": "Example-Nat-Rule-Collection", + "action": { + "type": "DNAT" + }, + "rules": [ + { + "ruleType": "NatRule", + "name": "nat-rule1", + "translatedFqdn": "internalhttp.server.net", + "translatedPort": "8080", + "ipProtocols": [ + "TCP", + "UDP" + ], + "sourceAddresses": [ + "2.2.2.2" + ], + "sourceIpGroups": [], + "destinationAddresses": [ + "152.23.32.23" + ], + "destinationPorts": [ + "8080" + ] + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "priority": 100, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyNatRuleCollection", + "name": "Example-Nat-Rule-Collection", + "priority": 100, + "action": { + "type": "DNAT" + }, + "rules": [ + { + "ruleType": "NatRule", + "name": "nat-rule1", + "translatedFqdn": "internalhttp.server.net", + "translatedPort": "8080", + "ipProtocols": [ + "TCP", + "UDP" + ], + "sourceAddresses": [ + "2.2.2.2" + ], + "sourceIpGroups": [], + "destinationAddresses": [ + "152.23.32.23" + ], + "destinationPorts": [ + "8080" + ] + } + ] + } + ] + } + } + }, + "201": { + "body": { + "name": "firewallPolicy", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyNatRuleCollection", + "name": "Example-Nat-Rule-Collection", + "priority": 100, + "action": { + "type": "DNAT" + }, + "rules": [ + { + "ruleType": "NatRule", + "name": "nat-rule1", + "translatedFqdn": "internalhttp.server.net", + "translatedPort": "8080", + "ipProtocols": [ + "TCP", + "UDP" + ], + "sourceAddresses": [ + "2.2.2.2" + ], + "sourceIpGroups": [], + "destinationAddresses": [ + "152.23.32.23" + ], + "destinationPorts": [ + "8080" + ] + } + ] + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupPut.json index c7d056a79b87..c2ca3790b438 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupPut.json @@ -7,11 +7,12 @@ "ruleCollectionGroupName": "ruleCollectionGroup1", "parameters": { "properties": { - "priority": 110, + "priority": 100, "ruleCollections": [ { "ruleCollectionType": "FirewallPolicyFilterRuleCollection", "name": "Example-Filter-Rule-Collection", + "priority": 100, "action": { "type": "Deny" }, @@ -46,11 +47,12 @@ "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", - "priority": 110, + "priority": 100, "ruleCollections": [ { "ruleCollectionType": "FirewallPolicyFilterRuleCollection", "name": "Example-Filter-Rule-Collection", + "priority": 100, "action": { "type": "Deny" }, @@ -84,11 +86,12 @@ "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", - "priority": 110, + "priority": 100, "ruleCollections": [ { "ruleCollectionType": "FirewallPolicyFilterRuleCollection", "name": "Example-Filter-Rule-Collection", + "priority": 100, "action": { "type": "Deny" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json new file mode 100644 index 000000000000..fd846d5aaeae --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "ruleCollectionGroupName": "ruleCollectionGroup1", + "firewallPolicyName": "firewallPolicy", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "priority": 200, + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json new file mode 100644 index 000000000000..69cb5044022a --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "firewallPolicyName": "firewallPolicy", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "name": "Example-Filter-Rule-Collection", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "priority": 120, + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json new file mode 100644 index 000000000000..61a577e93f2c --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json @@ -0,0 +1,125 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2", + "resourceGroupName": "rg1", + "firewallPolicyName": "firewallPolicy", + "ruleCollectionGroupName": "ruleCollectionGroup1", + "parameters": { + "properties": { + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "ruleCollectionGroup1", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + }, + "201": { + "body": { + "name": "firewallPolicy", + "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "priority": 110, + "ruleCollections": [ + { + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", + "action": { + "type": "Deny" + }, + "rules": [ + { + "ruleType": "ApplicationRule", + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ], + "webCategories": [ + "Hacking" + ] + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json index a8a9d62dcef5..361ac054befb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json @@ -416,6 +416,12 @@ }, "Get FirewallPolicyRuleCollectionGroup With IpGroups": { "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json" + }, + "Get FirewallPolicyNatRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyNatRuleCollectionGroupGet.json" + }, + "Get FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json" } } }, @@ -489,6 +495,12 @@ }, "Create FirewallPolicyRuleCollectionGroup With IpGroups": { "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json" + }, + "Create FirewallPolicyNatRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyNatRuleCollectionGroupPut.json" + }, + "Create FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json" } }, "x-ms-long-running-operation": true, @@ -546,6 +558,9 @@ }, "List all FirewallPolicyRuleCollectionGroups with IpGroups for a given FirewallPolicy": { "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json" + }, + "List all FirewallPolicyRuleCollectionGroup With Web Categories": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json" } }, "x-ms-pageable": { @@ -861,7 +876,14 @@ "terminateTLS": { "type": "boolean", "description": "Terminate TLS connections for this rule." - } + }, + "webCategories": { + "type": "array", + "description": "List of destination azure web categories.", + "items": { + "type": "string" + } + } }, "description": "Rule of type application." }, @@ -916,6 +938,10 @@ "items": { "type": "string" } + }, + "translatedFqdn": { + "type": "string", + "description": "The translated FQDN for this NAT rule." } } }, @@ -1187,7 +1213,7 @@ "properties": { "id": { "type": "string", - "description": "Signature id" + "description": "Signature id." }, "mode": { "$ref": "#/definitions/FirewallPolicyIntrusionDetectionStateOptions", diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index eb73513e8666..64ed94248f10 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -44,6 +44,7 @@ input-file: - Microsoft.Network/stable/2020-07-01/availableServiceAliases.json - Microsoft.Network/stable/2020-07-01/azureFirewall.json - Microsoft.Network/stable/2020-07-01/azureFirewallFqdnTag.json + - Microsoft.Network/stable/2020-07-01/azureWebCategory.json - Microsoft.Network/stable/2020-07-01/bastionHost.json - Microsoft.Network/stable/2020-07-01/checkDnsAvailability.json - Microsoft.Network/stable/2020-07-01/customIpPrefix.json From 9d27c1c228108dbdef3bb68978eebe23a0aff19e Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Mon, 5 Oct 2020 22:23:00 -0700 Subject: [PATCH 04/13] fix json --- .../stable/2020-07-01/firewallPolicy.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json index ccfffa2f5764..361ac054befb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json @@ -878,10 +878,11 @@ "description": "Terminate TLS connections for this rule." }, "webCategories": { - "type": "array", - "description": "List of destination azure web categories.", - "items": { - "type": "string" + "type": "array", + "description": "List of destination azure web categories.", + "items": { + "type": "string" + } } }, "description": "Rule of type application." From e2c348fa78e5c1c06125df1a80a0e48c8cf0db1f Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Thu, 8 Oct 2020 22:55:52 -0700 Subject: [PATCH 05/13] Remove redundant files --- ...leCollectionGroupWithWebCategoriesGet.json | 52 -------- ...eCollectionGroupWithWebCategoriesList.json | 55 -------- ...leCollectionGroupWithWebCategoriesPut.json | 125 ------------------ 3 files changed, 232 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json deleted file mode 100644 index fd846d5aaeae..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "parameters": { - "ruleCollectionGroupName": "ruleCollectionGroup1", - "firewallPolicyName": "firewallPolicy", - "resourceGroupName": "rg1", - "api-version": "2020-07-01", - "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" - }, - "responses": { - "200": { - "body": { - "name": "ruleCollectionGroup1", - "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", - "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", - "properties": { - "provisioningState": "Succeeded", - "priority": 110, - "ruleCollections": [ - { - "ruleCollectionType": "FirewallPolicyFilterRuleCollection", - "name": "Example-Filter-Rule-Collection", - "priority": 200, - "action": { - "type": "Deny" - }, - "rules": [ - { - "ruleType": "ApplicationRule", - "name": "rule1", - "description": "Deny inbound rule", - "protocols": [ - { - "protocolType": "Https", - "port": 443 - } - ], - "sourceAddresses": [ - "216.58.216.164", - "10.0.0.0/24" - ], - "webCategories": [ - "Hacking" - ] - } - ] - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json deleted file mode 100644 index 69cb5044022a..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "parameters": { - "firewallPolicyName": "firewallPolicy", - "resourceGroupName": "rg1", - "api-version": "2020-07-01", - "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "ruleCollectionGroup1", - "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", - "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", - "properties": { - "provisioningState": "Succeeded", - "priority": 110, - "ruleCollections": [ - { - "name": "Example-Filter-Rule-Collection", - "ruleCollectionType": "FirewallPolicyFilterRuleCollection", - "priority": 120, - "action": { - "type": "Deny" - }, - "rules": [ - { - "ruleType": "ApplicationRule", - "name": "rule1", - "description": "Deny inbound rule", - "protocols": [ - { - "protocolType": "Https", - "port": 443 - } - ], - "sourceAddresses": [ - "216.58.216.164", - "10.0.0.0/24" - ], - "webCategories": [ - "Hacking" - ] - } - ] - } - ] - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json deleted file mode 100644 index 61a577e93f2c..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "parameters": { - "api-version": "2020-07-01", - "subscriptionId": "e747cc13-97d4-4a79-b463-42d7f4e558f2", - "resourceGroupName": "rg1", - "firewallPolicyName": "firewallPolicy", - "ruleCollectionGroupName": "ruleCollectionGroup1", - "parameters": { - "properties": { - "priority": 110, - "ruleCollections": [ - { - "ruleCollectionType": "FirewallPolicyFilterRuleCollection", - "name": "Example-Filter-Rule-Collection", - "action": { - "type": "Deny" - }, - "rules": [ - { - "ruleType": "ApplicationRule", - "name": "rule1", - "description": "Deny inbound rule", - "protocols": [ - { - "protocolType": "Https", - "port": 443 - } - ], - "sourceAddresses": [ - "216.58.216.164", - "10.0.0.0/24" - ], - "webCategories": [ - "Hacking" - ] - } - ] - } - ] - } - } - }, - "responses": { - "200": { - "body": { - "name": "ruleCollectionGroup1", - "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "priority": 110, - "ruleCollections": [ - { - "ruleCollectionType": "FirewallPolicyFilterRuleCollection", - "name": "Example-Filter-Rule-Collection", - "action": { - "type": "Deny" - }, - "rules": [ - { - "ruleType": "ApplicationRule", - "name": "rule1", - "description": "Deny inbound rule", - "protocols": [ - { - "protocolType": "Https", - "port": 443 - } - ], - "sourceAddresses": [ - "216.58.216.164", - "10.0.0.0/24" - ], - "webCategories": [ - "Hacking" - ] - } - ] - } - ] - } - } - }, - "201": { - "body": { - "name": "firewallPolicy", - "id": "/subscriptions/e747cc13-97d4-4a79-b463-42d7f4e558f2/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "priority": 110, - "ruleCollections": [ - { - "ruleCollectionType": "FirewallPolicyFilterRuleCollection", - "name": "Example-Filter-Rule-Collection", - "action": { - "type": "Deny" - }, - "rules": [ - { - "ruleType": "ApplicationRule", - "name": "rule1", - "description": "Deny inbound rule", - "protocols": [ - { - "protocolType": "Https", - "port": 443 - } - ], - "sourceAddresses": [ - "216.58.216.164", - "10.0.0.0/24" - ], - "webCategories": [ - "Hacking" - ] - } - ] - } - ] - } - } - } - } -} \ No newline at end of file From 723bd683853c0e07b207dd081a16bc235d359d2d Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Thu, 8 Oct 2020 23:11:09 -0700 Subject: [PATCH 06/13] prettier --- .../stable/2020-07-01/azureWebCategory.json | 40 +++++++++---------- .../AzureWebCategoriesListBySubscription.json | 2 +- .../examples/AzureWebCategoryGet.json | 16 ++++---- ...leCollectionGroupWithWebCategoriesGet.json | 2 +- ...eCollectionGroupWithWebCategoriesList.json | 2 +- ...leCollectionGroupWithWebCategoriesPut.json | 2 +- .../stable/2020-07-01/firewallPolicy.json | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index ac709f65072d..1d9c06230a36 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -82,7 +82,7 @@ "$ref": "./examples/azureWebCategoryGet.json" } } - } + } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories": { "get": { @@ -143,24 +143,24 @@ "description": "Properties of the Azure Web Category." }, "id": { - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." - } + "type": "string", + "description": "Resource ID." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } }, "description": "Azure Web Category Resource." }, @@ -181,4 +181,4 @@ "description": "Response for ListAzureWebCategories API service call." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json index 0bd10464c9ca..d03e3a0c89b5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json index 12a46f04c53d..e2986f38c247 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json @@ -7,14 +7,14 @@ "responses": { "200": { "body": { - "name": "Arts", - "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", - "type": "Microsoft.Network/azureWebCategories", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "group": "General" - } + "name": "Arts", + "id": "/subscriptions/4de8428a-4a92-4cea-90ff-b47128b8cab8/providers/Microsoft.Network/azureWebCategories/Arts", + "type": "Microsoft.Network/azureWebCategories", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "group": "General" + } } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json index fd846d5aaeae..62fe0684caf4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json @@ -49,4 +49,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json index 69cb5044022a..5c2c0fb3eede 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json index 61a577e93f2c..85d2498ba21e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json @@ -122,4 +122,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json index 361ac054befb..83a82248c556 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json @@ -883,7 +883,7 @@ "items": { "type": "string" } - } + } }, "description": "Rule of type application." }, From 0f0cfde79951421cc9dde1d98be1b35fecc0b3a5 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Sat, 10 Oct 2020 21:52:26 -0700 Subject: [PATCH 07/13] Fix PR comments --- .../stable/2020-07-01/azureWebCategory.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 1d9c06230a36..5ba2162e759f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -3,7 +3,7 @@ "info": { "title": "NetworkManagementClient", "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", - "version": "2020-06-01" + "version": "2020-07-01" }, "host": "management.azure.com", "schemes": [ @@ -78,7 +78,7 @@ } }, "x-ms-examples": { - "Get_azureWebCategory": { + "Get Azure Web Category by name": { "$ref": "./examples/azureWebCategoryGet.json" } } @@ -89,7 +89,7 @@ "tags": [ "AzureWebCategories" ], - "operationId": "AzureWebCategories_ListAll", + "operationId": "AzureWebCategories_ListBySubscription", "description": "Gets all the Azure Web Categorys in a subscription.", "parameters": [ { @@ -109,7 +109,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./network.json#/definitions/CloudError" + "$ref": "./network.json#/definitions/Error" } } }, From b75d51a5435d3851168387bb8a0833cd20c9b6cc Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Tue, 13 Oct 2020 15:48:11 -0700 Subject: [PATCH 08/13] Fixed file name --- .../Microsoft.Network/stable/2020-07-01/azureWebCategory.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 5ba2162e759f..0478efba9de4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -79,7 +79,7 @@ }, "x-ms-examples": { "Get Azure Web Category by name": { - "$ref": "./examples/azureWebCategoryGet.json" + "$ref": "./examples/AzureWebCategoryGet.json" } } } From 163973da3b3f620f7837c04b77c8bb69da4a1135 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Wed, 14 Oct 2020 21:18:44 -0700 Subject: [PATCH 09/13] Fixing error --- .../stable/2020-07-01/azureWebCategory.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 0478efba9de4..3db0b3ab3fd2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -73,7 +73,7 @@ "default": { "description": "Unexpected error.", "schema": { - "$ref": "./network.json#/definitions/Error" + "$ref": "./network.json#/definitions/CloudError" } } }, @@ -107,9 +107,9 @@ } }, "default": { - "description": "Error response describing why the operation failed.", + "description": "Unexpected Error.", "schema": { - "$ref": "./network.json#/definitions/Error" + "$ref": "./network.json#/definitions/CloudError" } } }, From 77c30edb309401c529388afd8b580fe63257f715 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Wed, 14 Oct 2020 23:48:38 -0700 Subject: [PATCH 10/13] Spell Check fix --- .../stable/2020-07-01/azureWebCategory.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 3db0b3ab3fd2..4529ce69d6f5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -90,7 +90,7 @@ "AzureWebCategories" ], "operationId": "AzureWebCategories_ListBySubscription", - "description": "Gets all the Azure Web Categorys in a subscription.", + "description": "Gets all the Azure Web Categories in a subscription.", "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -114,7 +114,7 @@ } }, "x-ms-examples": { - "List all Azure Web Categorys for a given subscription": { + "List all Azure Web Categories for a given subscription": { "$ref": "./examples/AzureWebCategoriesListBySubscription.json" } }, @@ -171,7 +171,7 @@ "items": { "$ref": "#/definitions/AzureWebCategory" }, - "description": "List of Azure Web Categorys for a given Subscription." + "description": "List of Azure Web Categories for a given Subscription." }, "nextLink": { "type": "string", From 094740d131486f01f881b6f18f6ab7d61a04e9bf Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Thu, 15 Oct 2020 11:47:57 -0700 Subject: [PATCH 11/13] Changed operationId/Tags --- .../stable/2020-07-01/azureWebCategory.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 4529ce69d6f5..79b4e22f62b3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -37,9 +37,9 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories/{name}": { "get": { "tags": [ - "AzureWebCategories" + "WebCategories" ], - "operationId": "AzureWebCategories_Get", + "operationId": "WebCategories_Get", "description": "Gets the specified Azure Web Category.", "parameters": [ { @@ -87,9 +87,9 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories": { "get": { "tags": [ - "AzureWebCategories" + "WebCategories" ], - "operationId": "AzureWebCategories_ListBySubscription", + "operationId": "WebCategories_ListBySubscription", "description": "Gets all the Azure Web Categories in a subscription.", "parameters": [ { From e360800711970e11485cf69bca35c38d29489314 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Thu, 15 Oct 2020 12:22:57 -0700 Subject: [PATCH 12/13] "x-ms-azure-resource": true --- .../Microsoft.Network/stable/2020-07-01/azureWebCategory.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index 79b4e22f62b3..b2c49320ec9b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -162,7 +162,8 @@ "description": "A unique read-only string that changes whenever the resource is updated." } }, - "description": "Azure Web Category Resource." + "description": "Azure Web Category Resource.", + "x-ms-azure-resource": true }, "AzureWebCategoryListResult": { "properties": { From ffe304a02976c49ac4e2706acc0434f34d8d9a07 Mon Sep 17 00:00:00 2001 From: Sudharsan Sripadham Date: Thu, 15 Oct 2020 16:05:06 -0700 Subject: [PATCH 13/13] Revert ""x-ms-azure-resource": true" This reverts commit e360800711970e11485cf69bca35c38d29489314. --- .../Microsoft.Network/stable/2020-07-01/azureWebCategory.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json index b2c49320ec9b..79b4e22f62b3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json @@ -162,8 +162,7 @@ "description": "A unique read-only string that changes whenever the resource is updated." } }, - "description": "Azure Web Category Resource.", - "x-ms-azure-resource": true + "description": "Azure Web Category Resource." }, "AzureWebCategoryListResult": { "properties": {