merge from azure

Azure · Oct 19, 2020 · fbdf7d6 · fbdf7d6
1 parent 5a78911
commit fbdf7d6
Show file tree

Hide file tree

Showing 17 changed files with 553 additions and 12 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1676,6 +1676,7 @@ Unregistering
 Unregisters
 unrestorable
 unsubstituted
+Unsynced
 untagged
 Untracked
 unvalidated

diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2020-07-01/azureWebCategory.json b/...cation/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-07-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": [
+          "WebCategories"
+        ],
+        "operationId": "WebCategories_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/CloudError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Get Azure Web Category by name": {
+            "$ref": "./examples/AzureWebCategoryGet.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories": {
+      "get": {
+        "tags": [
+          "WebCategories"
+        ],
+        "operationId": "WebCategories_ListBySubscription",
+        "description": "Gets all the Azure Web Categories 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": "Unexpected Error.",
+            "schema": {
+              "$ref": "./network.json#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "List all Azure Web Categories 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 Categories for a given Subscription."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListAzureWebCategories API service call."
+    }
+  }
+}
diff --git a/...er/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoriesListBySubscription.json b/...er/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"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/...rk/resource-manager/Microsoft.Network/stable/2020-07-01/examples/AzureWebCategoryGet.json b/...rk/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"
+        }
+      }
+    }
+  }
+}
diff --git a/...ork/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json b/...ork/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"
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...rk/stable/2020-07-01/examples/FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json b/...rk/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"
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}