From 8672bb01171fd30ae6bea3576c62e69546f5e463 Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Tue, 7 Aug 2018 14:59:44 +0300 Subject: [PATCH 1/7] Added allowed connections to security.json --- .../preview/2015-06-01-preview/security.json | 243 ++++++++++++++++++ 1 file changed, 243 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json index 393f66b40116..8078d216a629 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json @@ -1437,6 +1437,132 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/allowedConnections": { + "get": { + "x-ms-examples": { + "Get allowed connections on a subscription": { + "$ref": "./examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a list of allowed connections for the subscription.", + "operationId": "AllowedConnections_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections": { + "get": { + "x-ms-examples": { + "Get allowed connections on a subscription from security data location": { + "$ref": "./examples/Topology/GetAllowedConnectionsSubscriptionLocation_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a list of allowed connections for the subscription and location.", + "operationId": "AllowedConnections_ListByHomeRegion", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/AscLocation" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections/{connectionsType}": { + "get": { + "x-ms-examples": { + "Get topology": { + "$ref": "./examples/Topology/GetAllowedConnections_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a specific allowed connections component.", + "operationId": "AllowedConnections_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/AscLocation" + }, + { + "$ref": "#/parameters/ConnectionsType" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } } }, "definitions": { @@ -2491,6 +2617,111 @@ "$ref": "#/definitions/ExternalSecuritySolutionProperties" } ] + }, + "AllowedConnectionsList": { + "type": "object", + "description": "List of allowed connections", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/AllowedConnectionsResource" + } + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page." + } + } + }, + "AllowedConnectionsResource": { + "type": "object", + "description": "Describes an allowed connections resource", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "readOnly": true, + "$ref": "#/definitions/AllowedConnectionsResourceProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "$ref": "#/definitions/Location" + } + ] + }, + "AllowedConnectionsResourceProperties": { + "type": "object", + "description": "Describes properties of an allowed connections resource", + "properties": { + "calculatedDateTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The UTC time on which the allowed connections resource was calculated" + }, + "connectableResources": { + "type": "array", + "readOnly": true, + "description": "List of connectable resources", + "items": { + "$ref": "#/definitions/ConnectableResource" + } + } + } + }, + "ConnectableResource": { + "type": "object", + "description": "Describes properties of a connectable resource", + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "The azure resource id" + }, + "inboundConnectedResources": { + "type": "array", + "readOnly": true, + "description": "The list of azure resources that the resource has inbound allowed connection from", + "items": { + "$ref": "#/definitions/ConnectedResource" + } + }, + "outboundConnectedResources": { + "type": "array", + "readOnly": true, + "description": "The list of azure resources that the resource has outbound allowed connection to", + "items": { + "$ref": "#/definitions/ConnectedResource" + } + } + } + }, + "ConnectedResource": { + "type": "object", + "description": "Describes properties of a connected resource", + "properties": { + "connectedResourceId": { + "type": "string", + "readOnly": true, + "description": "The azure resource id of the connected resource" + }, + "tcpPorts": { + "type": "string", + "readOnly": true, + "description": "The allowed tcp ports" + }, + "udpPorts": { + "type": "string", + "readOnly": true, + "description": "The allowed udp ports" + } + } } }, "parameters": { @@ -2674,6 +2905,18 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "ConnectionsType": { + "name": "connectionsType", + "type": "string", + "in": "path", + "description": "The type of allowed connections.", + "required": true, + "enum": [ + "Internal", + "External" + ], + "x-ms-parameter-location": "method" } } } From 53c48d2ef1908c695b222991d38c0669b34e5af3 Mon Sep 17 00:00:00 2001 From: snhaphil <41613474+snhaphil@users.noreply.github.com> Date: Tue, 7 Aug 2018 15:09:52 +0300 Subject: [PATCH 2/7] Added allowed connections to security.json --- .../preview/2015-06-01-preview/security.json | 243 ++++++++++++++++++ 1 file changed, 243 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json index 393f66b40116..8078d216a629 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json @@ -1437,6 +1437,132 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/allowedConnections": { + "get": { + "x-ms-examples": { + "Get allowed connections on a subscription": { + "$ref": "./examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a list of allowed connections for the subscription.", + "operationId": "AllowedConnections_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections": { + "get": { + "x-ms-examples": { + "Get allowed connections on a subscription from security data location": { + "$ref": "./examples/Topology/GetAllowedConnectionsSubscriptionLocation_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a list of allowed connections for the subscription and location.", + "operationId": "AllowedConnections_ListByHomeRegion", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/AscLocation" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections/{connectionsType}": { + "get": { + "x-ms-examples": { + "Get topology": { + "$ref": "./examples/Topology/GetAllowedConnections_example.json" + } + }, + "tags": [ + "AllowedConnections" + ], + "description": "Gets a specific allowed connections component.", + "operationId": "AllowedConnections_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/AscLocation" + }, + { + "$ref": "#/parameters/ConnectionsType" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AllowedConnectionsResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } } }, "definitions": { @@ -2491,6 +2617,111 @@ "$ref": "#/definitions/ExternalSecuritySolutionProperties" } ] + }, + "AllowedConnectionsList": { + "type": "object", + "description": "List of allowed connections", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/AllowedConnectionsResource" + } + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page." + } + } + }, + "AllowedConnectionsResource": { + "type": "object", + "description": "Describes an allowed connections resource", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "readOnly": true, + "$ref": "#/definitions/AllowedConnectionsResourceProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "$ref": "#/definitions/Location" + } + ] + }, + "AllowedConnectionsResourceProperties": { + "type": "object", + "description": "Describes properties of an allowed connections resource", + "properties": { + "calculatedDateTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The UTC time on which the allowed connections resource was calculated" + }, + "connectableResources": { + "type": "array", + "readOnly": true, + "description": "List of connectable resources", + "items": { + "$ref": "#/definitions/ConnectableResource" + } + } + } + }, + "ConnectableResource": { + "type": "object", + "description": "Describes properties of a connectable resource", + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "The azure resource id" + }, + "inboundConnectedResources": { + "type": "array", + "readOnly": true, + "description": "The list of azure resources that the resource has inbound allowed connection from", + "items": { + "$ref": "#/definitions/ConnectedResource" + } + }, + "outboundConnectedResources": { + "type": "array", + "readOnly": true, + "description": "The list of azure resources that the resource has outbound allowed connection to", + "items": { + "$ref": "#/definitions/ConnectedResource" + } + } + } + }, + "ConnectedResource": { + "type": "object", + "description": "Describes properties of a connected resource", + "properties": { + "connectedResourceId": { + "type": "string", + "readOnly": true, + "description": "The azure resource id of the connected resource" + }, + "tcpPorts": { + "type": "string", + "readOnly": true, + "description": "The allowed tcp ports" + }, + "udpPorts": { + "type": "string", + "readOnly": true, + "description": "The allowed udp ports" + } + } } }, "parameters": { @@ -2674,6 +2905,18 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "ConnectionsType": { + "name": "connectionsType", + "type": "string", + "in": "path", + "description": "The type of allowed connections.", + "required": true, + "enum": [ + "Internal", + "External" + ], + "x-ms-parameter-location": "method" } } } From 749cc7cac6553374914b80cad04ac9976eaf4688 Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Tue, 7 Aug 2018 16:09:44 +0300 Subject: [PATCH 3/7] added examples --- ...nnectionsSubscriptionLocation_example.json | 65 ++++++++++++++++++ ...llowedConnectionsSubscription_example.json | 64 ++++++++++++++++++ .../GetAllowedConnections_example.json | 67 +++++++++++++++++++ 3 files changed, 196 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json new file mode 100644 index 000000000000..e3a9e82a1d84 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json @@ -0,0 +1,65 @@ +{ + "parameters": { + "api-version": "2015-06-01-preview", + "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad", + "ascLocation": "centralus" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "type": "Microsoft.Security/locations/allowedConnections", + "properties": { + "calculatedDateTime": "2018-08-06T14:55:32.3518545Z", + "connectableResources": [ + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/amit-va/providers/Microsoft.Compute/virtualMachines/Amit-Win", + "inboundConnectedResources": [], + "outboundConnectedResources": [] + } + ] + }, + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "name": "Internal", + "location": "centralus" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json new file mode 100644 index 000000000000..74a8c296298c --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json @@ -0,0 +1,64 @@ +{ + "parameters": { + "api-version": "2015-06-01-preview", + "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "type": "Microsoft.Security/locations/allowedConnections", + "properties": { + "calculatedDateTime": "2018-08-06T14:55:32.3518545Z", + "connectableResources": [ + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine3", + "inboundConnectedResources": [], + "outboundConnectedResources": [] + } + ] + }, + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "name": "Internal", + "location": "centralus" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json new file mode 100644 index 000000000000..eda06f393e51 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "api-version": "2015-06-01-preview", + "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad", + "resourceGroupName": "myResourceGroup", + "ascLocation": "centralus", + "topologyResourceName": "Internal" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "type": "Microsoft.Security/locations/allowedConnections", + "properties": { + "calculatedDateTime": "2018-08-06T14:55:32.3518545Z", + "connectableResources": [ + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", + "inboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ], + "outboundConnectedResources": [ + { + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", + "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", + "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" + } + ] + }, + { + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine3", + "inboundConnectedResources": [], + "outboundConnectedResources": [] + } + ] + }, + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "name": "Internal", + "location": "centralus" + } + ] + } + } + } +} \ No newline at end of file From 63bd3e6278632767b99a70db5d02a7a9550170a5 Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Thu, 9 Aug 2018 15:26:43 +0300 Subject: [PATCH 4/7] modified the examples resources name --- ...dConnectionsSubscriptionLocation_example.json | 16 ++++++++-------- .../GetAllowedConnections_example.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json index e3a9e82a1d84..9d82f0b1e765 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json @@ -14,47 +14,47 @@ "calculatedDateTime": "2018-08-06T14:55:32.3518545Z", "connectableResources": [ { - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", "inboundConnectedResources": [ { - "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" } ], "outboundConnectedResources": [ { - "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" } ] }, { - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Linux-PG", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine2", "inboundConnectedResources": [ { - "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" } ], "outboundConnectedResources": [ { - "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Compute/virtualMachines/Amit-Baracuda-Test", + "connectedResourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine1", "tcpPorts": "[0-21,23-3388,3390-5984,5987-65535]", "udpPorts": "[0-21,23-3388,3390-5984,5987-65535]" } ] }, { - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/amit-va/providers/Microsoft.Compute/virtualMachines/Amit-Win", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/virtaulMachine3", "inboundConnectedResources": [], "outboundConnectedResources": [] } ] }, - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/Amit-VA/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", "name": "Internal", "location": "centralus" } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json index eda06f393e51..db56c8f1c8ad 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json @@ -1,4 +1,4 @@ -{ + { "parameters": { "api-version": "2015-06-01-preview", "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad", From 1b32e8aaac900ae9ae4e2921aafc6c55f1dfe487 Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Thu, 9 Aug 2018 15:42:16 +0300 Subject: [PATCH 5/7] Modified the asclocation in the examples file --- .../GetAllowedConnectionsSubscriptionLocation_example.json | 2 +- .../GetAllowedConnectionsSubscription_example.json | 2 +- .../AllowedConnections/GetAllowedConnections_example.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json index 9d82f0b1e765..713598323202 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json @@ -54,7 +54,7 @@ } ] }, - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/centralus/allowedConnections/Internal", "name": "Internal", "location": "centralus" } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json index 74a8c296298c..bacc23308579 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json @@ -53,7 +53,7 @@ } ] }, - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/centralus/allowedConnections/Internal", "name": "Internal", "location": "centralus" } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json index db56c8f1c8ad..3c368cf90927 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json @@ -56,7 +56,7 @@ } ] }, - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/centralus/allowedConnections/Internal", "name": "Internal", "location": "centralus" } From 81ffdfeb70675bf209546262b10260677c977754 Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Thu, 9 Aug 2018 17:21:21 +0300 Subject: [PATCH 6/7] reformatted and added newline at the EOF --- ...AllowedConnectionsSubscriptionLocation_example.json | 2 +- .../GetAllowedConnectionsSubscription_example.json | 2 +- .../GetAllowedConnections_example.json | 6 +++--- .../preview/2015-06-01-preview/security.json | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json index 713598323202..6fdbab08e2c8 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json @@ -62,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json index bacc23308579..6ed76ac9eac4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnectionsSubscription_example.json @@ -61,4 +61,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json index 3c368cf90927..b17fb57c4038 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/AllowedConnections/GetAllowedConnections_example.json @@ -1,4 +1,4 @@ - { +{ "parameters": { "api-version": "2015-06-01-preview", "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad", @@ -56,7 +56,7 @@ } ] }, - "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/centralus/allowedConnections/Internal", + "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154baf/resourceGroups/myResourceGroup/providers/Microsoft.Security/locations/westcentralus/allowedConnections/Internal", "name": "Internal", "location": "centralus" } @@ -64,4 +64,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json index 8078d216a629..5127c736f2dc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json @@ -2620,7 +2620,7 @@ }, "AllowedConnectionsList": { "type": "object", - "description": "List of allowed connections", + "description": "List of allowed connections", "properties": { "value": { "type": "array", @@ -2638,7 +2638,7 @@ }, "AllowedConnectionsResource": { "type": "object", - "description": "Describes an allowed connections resource", + "description": "Describes an allowed connections resource", "properties": { "properties": { "x-ms-client-flatten": true, @@ -2657,7 +2657,7 @@ }, "AllowedConnectionsResourceProperties": { "type": "object", - "description": "Describes properties of an allowed connections resource", + "description": "Describes properties of an allowed connections resource", "properties": { "calculatedDateTime": { "type": "string", @@ -2677,7 +2677,7 @@ }, "ConnectableResource": { "type": "object", - "description": "Describes properties of a connectable resource", + "description": "Describes properties of a connectable resource", "properties": { "id": { "type": "string", @@ -2704,7 +2704,7 @@ }, "ConnectedResource": { "type": "object", - "description": "Describes properties of a connected resource", + "description": "Describes properties of a connected resource", "properties": { "connectedResourceId": { "type": "string", From 6bebd1b59defc5683267260650de1822b2ff457c Mon Sep 17 00:00:00 2001 From: Snir Haphiloni Date: Thu, 9 Aug 2018 17:48:16 +0300 Subject: [PATCH 7/7] modified examples description in security.json --- .../preview/2015-06-01-preview/security.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json index 5127c736f2dc..a36664ba33df 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json @@ -1481,7 +1481,7 @@ "get": { "x-ms-examples": { "Get allowed connections on a subscription from security data location": { - "$ref": "./examples/Topology/GetAllowedConnectionsSubscriptionLocation_example.json" + "$ref": "./examples/AllowedConnections/GetAllowedConnectionsSubscriptionLocation_example.json" } }, "tags": [ @@ -1522,8 +1522,8 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections/{connectionsType}": { "get": { "x-ms-examples": { - "Get topology": { - "$ref": "./examples/Topology/GetAllowedConnections_example.json" + "Get allowed connections": { + "$ref": "./examples/AllowedConnections/GetAllowedConnections_example.json" } }, "tags": [