Skip to content

Commit

Permalink
Adding force delete flag for Network Manager resources (Azure#17692)
Browse files Browse the repository at this point in the history
* base commit for PR reviewer

* add force delete flags and remove recursive delete flags

* security configuration split into admin/user

* split rule collection into admin/user rule collection

* updating examples for security config resources

* update api version

* fix parameter types for security admin conf/rule collection

* removing display name from all definitions and examples

* fix properties of security config examples

* fix network manager connection path

* update readme with complete spec list

Co-authored-by: Jared Gorthy <jaredgorthy@microsoft.com>
  • Loading branch information
2 people authored and FredericHeem committed May 16, 2022
1 parent 4f62abd commit a39d2a4
Show file tree
Hide file tree
Showing 78 changed files with 9,134 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"title": "Get Azure Virtual Network Manager Active Connectivity Configuration",
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subscriptionA",
"resourceGroupName": "myResourceGroup",
"networkManagerName": "testNetworkManager",
"parameters": {
"regions": [
"westus"
],
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
"200": {
"body": {
"value": [
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig",
"properties": {
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubs": [
{
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"isGlobal": "True",
"deleteExistingPeering": "True",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "False"
}
],
"provisioningState": "Succeeded"
},
"configurationGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"description": "A group for all test Virtual Networks",
"memberType": "Microsoft.Network/virtualNetworks",
"provisioningState": "Succeeded"
}
}
]
}
],
"skipToken": "FakeSkipTokenCode"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"title": "Get Azure Virtual Network Manager Active Security Admin Rules",
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subscriptionA",
"resourceGroupName": "myResourceGroup",
"networkManagerName": "testNetworkManager",
"parameters": {
"regions": [
"westus"
],
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
"200": {
"body": {
"value": [
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule",
"configurationDescription": "SampleDescription",
"ruleCollectionDescription": "SampleRuleCollectionDescription",
"ruleCollectionAppliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
],
"kind": "Default",
"properties": {
"description": "Sample Admin Rule",
"flag": "AllowVnetInbound",
"protocol": "Tcp",
"sources": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"destinations": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"access": "Deny",
"priority": 1,
"provisioningState": "Succeeded"
},
"ruleGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"description": "A group for all test Virtual Networks",
"memberType": "Microsoft.Network/virtualNetworks",
"provisioningState": "Succeeded"
}
}
]
}
],
"skipToken": "FakeSkipTokenCode"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"title": "Get Azure Virtual Network Manager Active Security User Rules",
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subscriptionA",
"resourceGroupName": "myResourceGroup",
"networkManagerName": "testNetworkManager",
"parameters": {
"regions": [
"westus"
],
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
"200": {
"body": {
"value": [
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule",
"configurationDescription": "SampleDescription",
"ruleCollectionDescription": "SampleRuleCollectionDescription",
"ruleCollectionAppliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
],
"kind": "Custom",
"properties": {
"description": "Sample User Rule",
"protocol": "Tcp",
"sources": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"destinations": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"provisioningState": "Succeeded"
},
"ruleGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"description": "A group for all test Virtual Networks",
"memberType": "Microsoft.Network/virtualNetworks",
"provisioningState": "Succeeded"
}
}
]
}
],
"skipToken": "FakeSkipTokenCode"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"configurationName": "myTestSecurityConfig",
"ruleCollectionName": "testRuleCollection"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"ruleCollectionName": "testRuleCollection",
"configurationName": "myTestSecurityConfig"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"configurationName": "myTestSecurityConfig"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
],
"nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections?api-version=2021-05-01-preview&$skipToken=10"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"configurationName": "myTestSecurityConfig",
"ruleCollectionName": "testRuleCollection",
"ruleCollection": {
"properties": {
"description": "A sample policy",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "myTestSecurityConfig",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"description": "A sample policy",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
},
"201": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig",
"name": "myTestSecurityConfig",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"description": "A sample policy",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"parameters": {
"api-version": "2022-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"configurationName": "myTestSecurityConfig",
"networkManagerName": "testNetworkManager",
"ruleCollectionName": "testRuleCollection",
"ruleName": "SampleAdminRule"
},
"responses": {
"200": {},
"204": {}
}
}
Loading

0 comments on commit a39d2a4

Please sign in to comment.