From 87a694d3be747ff96beadce4af285429ae432b8d Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Mon, 17 May 2021 16:29:43 +0530 Subject: [PATCH 01/14] Defining the APIs for the new NSP resource --- .../NetworkSecurityPerimeterDelete.json | 13 + .../examples/NetworkSecurityPerimeterGet.json | 23 ++ .../NetworkSecurityPerimeterList.json | 39 ++ .../NetworkSecurityPerimeterListAll.json | 38 ++ .../examples/NetworkSecurityPerimeterPut.json | 43 +++ .../networkSecurityPerimeter.json | 350 ++++++++++++++++++ .../network/resource-manager/readme.md | 1 + 7 files changed, 507 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json new file mode 100644 index 000000000000..a8a08b56a6e2 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json @@ -0,0 +1,13 @@ +{ + "title": "Delete Network Security Perimeter", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkSecurityPerimeterName": "testNSP1" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json new file mode 100644 index 000000000000..e1873fdf1326 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json @@ -0,0 +1,23 @@ +{ + "title": "Get Network Security Perimeter", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkSecurityPerimeterName": "nsp1" + }, + "responses": { + "200": { + "body": { + "name": "nsp1", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1", + "type": "Microsoft.Network/networkSecurityPerimeters", + "properties": { + "displayName": "nsp1", + "description": "Test Network Security Periemter", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json new file mode 100644 index 000000000000..cb080535244f --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json @@ -0,0 +1,39 @@ +{ + "title": "List Network Security Perimeter", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "testNSP1", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP1", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-asdf-asdf-asdf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter1", + "description": "Description for TestNetworkSecurityPerimeter1", + "provisioningState": "Succeeded" + } + }, + { + "name": "testNSP2", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP2", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-asdf-asdf-addf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter2", + "description": "Description for TestNetworkSecurityPerimeter2", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json new file mode 100644 index 000000000000..4b05fc15ccbf --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json @@ -0,0 +1,38 @@ +{ + "title": "List all the Network Security Perimeters in a Subscription", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "testNSP1", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP1", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-asdf-asdf-asdf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter1", + "description": "Description for TestNetworkSecurityPerimeter1", + "provisioningState": "Succeeded" + } + }, + { + "name": "testNSP2", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP2", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-asdf-asdf-asdf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter2", + "description": "Description for TestNetworkSecurityPerimeter2", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": "{baseurl}/subscriptions/subId/providers/Microsoft.Network/networkSecurityPerimeters?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json new file mode 100644 index 000000000000..56cc6448a0e9 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json @@ -0,0 +1,43 @@ +{ + "title": "Create/Update Network Security Perimeter", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkSecurityPerimeterName": "nsp1", + "parameters": { + "properties": { + "displayName": "TestNetworkSecurityPerimeter", + "description": "Description of TestNetworkSecurityPerimeter" + } + } + }, + "responses": { + "200": { + "body": { + "name": "TestNetworkSecurityPerimeter", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/TestNetworkSecurityPerimeter", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-badf-sasf-basf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter", + "description": "Description of TestNetworkSecurityPerimeter", + "provisioningState": "Succeeded" + } + } + }, + "201": { + "body": { + "name": "TestNetworkSecurityPerimeter", + "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/TestNetworkSecurityPerimeter", + "type": "Microsoft.Network/networkSecurityPerimeters", + "etag": "sadf-badf-sasf-basf", + "properties": { + "displayName": "TestNetworkSecurityPerimeter", + "description": "Description of TestNetworkSecurityPerimeter", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json new file mode 100644 index 000000000000..132dd25253a2 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json @@ -0,0 +1,350 @@ +{ + "swagger": "2.0", + "info": { + "title": "NetworkSecurityPerimeter", + "description": "The Network Security Perimeter API provides a RESTful set of web services that interact with network security perimeter resource.", + "version": "2021-02-01-preview" + }, + "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}": { + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkSecurityPerimeterNameParameter" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "get": { + "tags": [ + "NetworkSecurityPerimeters" + ], + "operationId": "NetworkSecurityPerimeters_Get", + "description": "Gets the specified network security perimeter by the name.", + "responses": { + "200": { + "description": "Request is successful. Returns the resulting network security perimeter resource.", + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeter" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "NetworkSecurityPerimeterGet": { + "$ref": "./examples/NetworkSecurityPerimeterGet.json" + } + } + }, + "put": { + "tags": [ + "NetworkSecurityPerimeters" + ], + "operationId": "NetworkSecurityPerimeters_CreateOrUpdate", + "description": "Creates or updates a Network Security Perimeter.", + "parameters": [ + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeter" + }, + "description": "Parameter supplied to create or update the network security perimeter." + } + ], + "responses": { + "200": { + "description": "Resource Updated. Returns the network security perimeter.", + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeter" + } + }, + "201": { + "description": "Resource Created. Returns the network security perimeter.", + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeter" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Put Network Security Perimeter": { + "$ref": "./examples/NetworkSecurityPerimeterPut.json" + } + } + }, + "delete": { + "tags": [ + "NetworkSecurityPerimeters" + ], + "operationId": "NetworkSecurityPerimeters_Delete", + "description": "Deletes a network security perimeter.", + "responses": { + "200": { + "description": "Delete Succeed." + }, + "204": { + "description": "Request successful. The resource does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "NetworkSecurityPerimeterDelete": { + "$ref": "./examples/NetworkSecurityPerimeterDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkSecurityPerimeters": { + "get": { + "tags": [ + "NetworkSecurityPerimeters" + ], + "operationId": "NetworkSecurityPerimeters_ListBySubscription", + "description": "List all network security perimeters in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "responses": { + "200": { + "description": "Request is successful. Returns the list of the network security perimeters.", + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeterListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "NetworkSecurityPerimetersList": { + "$ref": "./examples/NetworkSecurityPerimeterListAll.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters": { + "get": { + "tags": [ + "NetworkSecurityPerimeters" + ], + "operationId": "NetworkSecurityPerimeters_List", + "description": "List network security perimeters in a resource group.", + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "responses": { + "200": { + "description": "Request is successful. Returns a list of network security perimeters.", + "schema": { + "$ref": "#/definitions/NetworkSecurityPerimeterListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List Network Security Perimeter": { + "$ref": "./examples/NetworkSecurityPerimeterList.json" + } + } + } + } + }, + "definitions": { + "NetworkSecurityPerimeter": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/NetworkSecurityPerimeterProperties", + "description": "The network security perimeter properties" + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "id": { + "readOnly": true, + "type": "string", + "description": "Network security perimeter identifier." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "The Network Security Perimeter resource" + }, + "NetworkSecurityPerimeterListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/NetworkSecurityPerimeter" + }, + "description": "Gets a page of NetworkSecurityPerimeter" + }, + "nextLink": { + "type": "string", + "description": "Gets the URL to get the next page of results." + } + }, + "description": "Result of the request to list NetworkSecurityPerimeter. It contains a list of network security perimeters and a URL link to get the next set of results." + }, + "NetworkSecurityPerimeterProperties": { + "type": "object", + "properties": { + "displayName": { + "type": "string", + "description": "A friendly name for the network security perimeter." + }, + "description": { + "type": "string", + "description": "A description of the network security perimeter." + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the scope assignment resource." + } + }, + "description": "Properties of network security perimeter." + } + }, + "parameters": { + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "NetworkSecurityPerimeterNameParameter": { + "name": "networkSecurityPerimeterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the network security perimeter.", + "x-ms-parameter-location": "method" + }, + "ListTopParameter": { + "name": "$top", + "description": "An optional query parameter which specifies the maximum number of records to be returned by the server.", + "in": "query", + "required": false, + "type": "integer", + "format": "int32", + "minimum": 1, + "maximum": 20, + "x-ms-parameter-location": "method" + }, + "ListSkipTokenParameter": { + "name": "$skipToken", + "description": "SkipToken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index fbe2820005b1..cf009614c670 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -187,6 +187,7 @@ input-file: - Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json + - Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json - Microsoft.Network/stable/2020-11-01/networkProfile.json - Microsoft.Network/stable/2020-11-01/networkSecurityGroup.json - Microsoft.Network/stable/2020-11-01/networkVirtualAppliance.json From 46cce20f32f384877c0772a5b1c2c654ca768b5d Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 15:59:16 +0530 Subject: [PATCH 02/14] Update networkSecurityPerimeter.json Adding the definition of the new location based endpoint for getting the list of resources onboarded to use the network security perimeter feature. --- .../networkSecurityPerimeter.json | 113 +++++++++++++++++- 1 file changed, 112 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index 4f8dcdf65472..d8ec5a448a04 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -238,6 +238,46 @@ } } } + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/perimeterAssociableResourceTypes": { + "get": { + "operationId": "PerimeterAssociableResourceTypes_Get", + "description": "Gets the list of resources that are onboarded with NSP. These resources can be asociated with a netwotk security perimeter", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The location of the where the association is present." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the list of resources that are onboarded with network security perimeter feature.", + "schema": { + "$ref": "#/definitions/PerimeterAssociableResourcesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Check Dns Name Availability": { + "$ref": "./examples/PerimeterAssociableResources.json" + } + } + } + } }, "definitions": { "NetworkSecurityPerimeter": { @@ -310,7 +350,78 @@ } }, "description": "Properties of network security perimeter." - } + }, + "PerimeterAssociableResource": { + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/PerimeterAssociableResourceProperties.", + "description": "Properties of the perimeter associable resource." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "id": { + "readOnly": true, + "type": "string", + "description": "Identifier of the perimeter associable resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "Resource that is onboarded to use network security perimeter. Also referred as perimeter associable resource." + }, + "PerimeterAssociableResourcesListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/PerimeterAssociableResource" + }, + "description": "Gets paged list of perimeter associable resources." + }, + "nextLink": { + "type": "string", + "description": "Gets the URL to get the next page of results." + } + }, + "description": "Paged list of perimeter associable resources." + }, + "PerimeterAssociableResourceProperties": { + "type": "object", + "properties": { + "displayName": { + "readOnly": true, + "type": "string", + "description": "A friendly name for the properties of perimeter associable resources." + }, + "resourceType": { + "readOnly": true, + "type": "string", + "description": "Resource type/provider name." + }, + "publicDNSZones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "Public DNS zone names of the resources." + } + }, + "description": "Properties of the perimeter associable resources." + }, }, "parameters": { "ResourceGroupNameParameter": { From 384f99c1a77253a82207d179213d34c861115245 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 18:02:36 +0530 Subject: [PATCH 03/14] Create PerimeterAssociableResourcesList.json Adding the example response for the resource endpoint --- .../PerimeterAssociableResourcesList.json | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json new file mode 100644 index 000000000000..b2dbf2ca371e --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json @@ -0,0 +1,44 @@ +{ + "title": "List of resources onboarded for network security perimeter feature (perimeter associable resources).", + "parameters": { + "api-version": "2021-03-01-preview", + "subscriptionId": "subId", + "location": "westus" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Sql.servers", + "id": "/subscriptions/{subscriptionID}/providers/Microsoft.Network/perimeterAssociableResourceTypes/Microsoft.Sql.servers", + "type": "Microsoft.Network/PerimeterAssociableResourceTypes", + "properties": { + "resourceType": "Microsoft.Sql/servers", + "displayName": "Microsoft.Sql/servers", + "publicDNSZones": [ + "database.windows.net" + ] + } + }, + { + "name": "Microsoft.Storage.accounts", + "id": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/perimeterAssociableResourceTypes/Microsoft.Storage.storageAccounts", + "type": "Microsoft.Network/PerimeterAssociableResourceTypes", + "properties": { + "resourceType": "Microsoft.Storage/accounts", + "displayName": "Microsoft.Storage/accounts", + "publicDNSZones": [ + "blob.core.windows.net", + "table.core.windows.net", + "queue.core.windows.net", + "file.core.windows.net" + ] + } + } + ], + "nextLink": "{baseurl}/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/perimeterAssociableResourceTypes?api-version=2021-03-01-preview&$skipToken=10" + } + } + } +} \ No newline at end of file From 883670cb3c3eb43f5ca6ee80ddf9ae6e386fdbb9 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 19:55:54 +0530 Subject: [PATCH 04/14] Deleting the NSP files from the earlier release folder --- .../NetworkSecurityPerimeterDelete.json | 13 - .../examples/NetworkSecurityPerimeterGet.json | 23 -- .../NetworkSecurityPerimeterList.json | 39 -- .../NetworkSecurityPerimeterListAll.json | 38 -- .../examples/NetworkSecurityPerimeterPut.json | 43 --- .../networkSecurityPerimeter.json | 350 ------------------ 6 files changed, 506 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json deleted file mode 100644 index a8a08b56a6e2..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterDelete.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "title": "Delete Network Security Perimeter", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkSecurityPerimeterName": "testNSP1" - }, - "responses": { - "200": {}, - "204": {} - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json deleted file mode 100644 index e1873fdf1326..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterGet.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "title": "Get Network Security Perimeter", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkSecurityPerimeterName": "nsp1" - }, - "responses": { - "200": { - "body": { - "name": "nsp1", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1", - "type": "Microsoft.Network/networkSecurityPerimeters", - "properties": { - "displayName": "nsp1", - "description": "Test Network Security Periemter", - "provisioningState": "Succeeded" - } - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json deleted file mode 100644 index cb080535244f..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterList.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "title": "List Network Security Perimeter", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "testNSP1", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP1", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-asdf-asdf-asdf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter1", - "description": "Description for TestNetworkSecurityPerimeter1", - "provisioningState": "Succeeded" - } - }, - { - "name": "testNSP2", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP2", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-asdf-asdf-addf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter2", - "description": "Description for TestNetworkSecurityPerimeter2", - "provisioningState": "Succeeded" - } - } - ], - "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters?api-version=2021-02-01-preview&$skipToken=10" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json deleted file mode 100644 index 4b05fc15ccbf..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterListAll.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "title": "List all the Network Security Perimeters in a Subscription", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "testNSP1", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP1", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-asdf-asdf-asdf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter1", - "description": "Description for TestNetworkSecurityPerimeter1", - "provisioningState": "Succeeded" - } - }, - { - "name": "testNSP2", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/testNSP2", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-asdf-asdf-asdf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter2", - "description": "Description for TestNetworkSecurityPerimeter2", - "provisioningState": "Succeeded" - } - } - ], - "nextLink": "{baseurl}/subscriptions/subId/providers/Microsoft.Network/networkSecurityPerimeters?api-version=2021-02-01-preview&$skipToken=10" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json deleted file mode 100644 index 56cc6448a0e9..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkSecurityPerimeterPut.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "title": "Create/Update Network Security Perimeter", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkSecurityPerimeterName": "nsp1", - "parameters": { - "properties": { - "displayName": "TestNetworkSecurityPerimeter", - "description": "Description of TestNetworkSecurityPerimeter" - } - } - }, - "responses": { - "200": { - "body": { - "name": "TestNetworkSecurityPerimeter", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/TestNetworkSecurityPerimeter", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-badf-sasf-basf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter", - "description": "Description of TestNetworkSecurityPerimeter", - "provisioningState": "Succeeded" - } - } - }, - "201": { - "body": { - "name": "TestNetworkSecurityPerimeter", - "id": "/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkSecurityPerimeters/TestNetworkSecurityPerimeter", - "type": "Microsoft.Network/networkSecurityPerimeters", - "etag": "sadf-badf-sasf-basf", - "properties": { - "displayName": "TestNetworkSecurityPerimeter", - "description": "Description of TestNetworkSecurityPerimeter", - "provisioningState": "Succeeded" - } - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json deleted file mode 100644 index 132dd25253a2..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json +++ /dev/null @@ -1,350 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "NetworkSecurityPerimeter", - "description": "The Network Security Perimeter API provides a RESTful set of web services that interact with network security perimeter resource.", - "version": "2021-02-01-preview" - }, - "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}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}": { - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkSecurityPerimeterNameParameter" - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - } - ], - "get": { - "tags": [ - "NetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_Get", - "description": "Gets the specified network security perimeter by the name.", - "responses": { - "200": { - "description": "Request is successful. Returns the resulting network security perimeter resource.", - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeter" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "NetworkSecurityPerimeterGet": { - "$ref": "./examples/NetworkSecurityPerimeterGet.json" - } - } - }, - "put": { - "tags": [ - "NetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_CreateOrUpdate", - "description": "Creates or updates a Network Security Perimeter.", - "parameters": [ - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeter" - }, - "description": "Parameter supplied to create or update the network security perimeter." - } - ], - "responses": { - "200": { - "description": "Resource Updated. Returns the network security perimeter.", - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeter" - } - }, - "201": { - "description": "Resource Created. Returns the network security perimeter.", - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeter" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Put Network Security Perimeter": { - "$ref": "./examples/NetworkSecurityPerimeterPut.json" - } - } - }, - "delete": { - "tags": [ - "NetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_Delete", - "description": "Deletes a network security perimeter.", - "responses": { - "200": { - "description": "Delete Succeed." - }, - "204": { - "description": "Request successful. The resource does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "NetworkSecurityPerimeterDelete": { - "$ref": "./examples/NetworkSecurityPerimeterDelete.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkSecurityPerimeters": { - "get": { - "tags": [ - "NetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_ListBySubscription", - "description": "List all network security perimeters in a subscription.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], - "responses": { - "200": { - "description": "Request is successful. Returns the list of the network security perimeters.", - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeterListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "NetworkSecurityPerimetersList": { - "$ref": "./examples/NetworkSecurityPerimeterListAll.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters": { - "get": { - "tags": [ - "NetworkSecurityPerimeters" - ], - "operationId": "NetworkSecurityPerimeters_List", - "description": "List network security perimeters in a resource group.", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], - "responses": { - "200": { - "description": "Request is successful. Returns a list of network security perimeters.", - "schema": { - "$ref": "#/definitions/NetworkSecurityPerimeterListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "List Network Security Perimeter": { - "$ref": "./examples/NetworkSecurityPerimeterList.json" - } - } - } - } - }, - "definitions": { - "NetworkSecurityPerimeter": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/NetworkSecurityPerimeterProperties", - "description": "The network security perimeter properties" - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." - }, - "name": { - "type": "string", - "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." - }, - "id": { - "readOnly": true, - "type": "string", - "description": "Network security perimeter identifier." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "allOf": [ - { - "$ref": "./network.json#/definitions/Resource" - } - ], - "description": "The Network Security Perimeter resource" - }, - "NetworkSecurityPerimeterListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkSecurityPerimeter" - }, - "description": "Gets a page of NetworkSecurityPerimeter" - }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next page of results." - } - }, - "description": "Result of the request to list NetworkSecurityPerimeter. It contains a list of network security perimeters and a URL link to get the next set of results." - }, - "NetworkSecurityPerimeterProperties": { - "type": "object", - "properties": { - "displayName": { - "type": "string", - "description": "A friendly name for the network security perimeter." - }, - "description": { - "type": "string", - "description": "A description of the network security perimeter." - }, - "provisioningState": { - "readOnly": true, - "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the scope assignment resource." - } - }, - "description": "Properties of network security perimeter." - } - }, - "parameters": { - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" - }, - "NetworkSecurityPerimeterNameParameter": { - "name": "networkSecurityPerimeterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the network security perimeter.", - "x-ms-parameter-location": "method" - }, - "ListTopParameter": { - "name": "$top", - "description": "An optional query parameter which specifies the maximum number of records to be returned by the server.", - "in": "query", - "required": false, - "type": "integer", - "format": "int32", - "minimum": 1, - "maximum": 20, - "x-ms-parameter-location": "method" - }, - "ListSkipTokenParameter": { - "name": "$skipToken", - "description": "SkipToken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls.", - "in": "query", - "required": false, - "type": "string", - "x-ms-parameter-location": "method" - } - } -} From d8358e45bc23fcc60de5b532cbc2a4e12d8ef289 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 20:01:09 +0530 Subject: [PATCH 05/14] Update readme.md --- specification/network/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index a99ad8d102a5..b1f18785f0ef 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -187,7 +187,6 @@ input-file: - Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json - - Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json - Microsoft.Network/stable/2020-11-01/networkProfile.json - Microsoft.Network/stable/2020-11-01/networkSecurityGroup.json - Microsoft.Network/stable/2020-11-01/networkVirtualAppliance.json From 2056da262ee20dfcb2e3dda76cc89dae4eeb65ba Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 20:58:12 +0530 Subject: [PATCH 06/14] Fixed validation errors --- .../networkSecurityPerimeter.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index d8ec5a448a04..0c3a0597e4cf 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -237,12 +237,15 @@ } } } - } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/perimeterAssociableResourceTypes": { "get": { "operationId": "PerimeterAssociableResourceTypes_Get", "description": "Gets the list of resources that are onboarded with NSP. These resources can be asociated with a netwotk security perimeter", "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, { "name": "location", "in": "path", @@ -252,9 +255,6 @@ }, { "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -273,7 +273,7 @@ }, "x-ms-examples": { "Check Dns Name Availability": { - "$ref": "./examples/PerimeterAssociableResources.json" + "$ref": "./examples/PerimeterAssociableResourcesList.json" } } } @@ -356,7 +356,7 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/PerimeterAssociableResourceProperties.", + "$ref": "#/definitions/PerimeterAssociableResourceProperties", "description": "Properties of the perimeter associable resource." }, "name": { @@ -421,7 +421,7 @@ } }, "description": "Properties of the perimeter associable resources." - }, + } }, "parameters": { "ResourceGroupNameParameter": { From d29f44886eac8cbc1fb13afff8fc1df3cd1b6341 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 21:00:37 +0530 Subject: [PATCH 07/14] added a custom word --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index c748372dcab1..bc61d104b7ce 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -139,6 +139,7 @@ asciifolding Asns aspnet assessmentprojects +Associable Asturian asyncinfo asyncoperation From ecabf96b1765bcee2e16dd4277fd9ce05c617b77 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 22:24:50 +0530 Subject: [PATCH 08/14] Update networkSecurityPerimeter.json --- .../preview/2021-03-01-preview/networkSecurityPerimeter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index 0c3a0597e4cf..cee679bf018d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -241,7 +241,7 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/perimeterAssociableResourceTypes": { "get": { "operationId": "PerimeterAssociableResourceTypes_Get", - "description": "Gets the list of resources that are onboarded with NSP. These resources can be asociated with a netwotk security perimeter", + "description": "Gets the list of resources that are onboarded with NSP. These resources can be associated with a network security perimeter", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" From 79ea9f878f13d7546fbb01525e1c2f1ccc8915ae Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 22:28:56 +0530 Subject: [PATCH 09/14] Update networkSecurityPerimeter.json Fixing a duplicate definition error. --- .../2021-03-01-preview/networkSecurityPerimeter.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index cee679bf018d..d22ca1b146d8 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -307,12 +307,7 @@ "type": "string", "description": "Resource type." } - }, - "allOf": [ - { - "$ref": "./network.json#/definitions/Resource" - } - ], + } "description": "The Network Security Perimeter resource" }, "NetworkSecurityPerimeterListResult": { @@ -374,11 +369,6 @@ "description": "Resource type." } }, - "allOf": [ - { - "$ref": "./network.json#/definitions/Resource" - } - ], "description": "Resource that is onboarded to use network security perimeter. Also referred as perimeter associable resource." }, "PerimeterAssociableResourcesListResult": { From cf02f969d7449f29c9c2124e6f7e85b3c04974c6 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 22:41:23 +0530 Subject: [PATCH 10/14] Update networkSecurityPerimeter.json --- .../preview/2021-03-01-preview/networkSecurityPerimeter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index d22ca1b146d8..6a2ee115b17b 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -245,7 +245,7 @@ "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, + }, { "name": "location", "in": "path", @@ -307,7 +307,7 @@ "type": "string", "description": "Resource type." } - } + }, "description": "The Network Security Perimeter resource" }, "NetworkSecurityPerimeterListResult": { From 5cc66a32053ab5329aad0a24d2e9a5d9c8e779c8 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 22:47:24 +0530 Subject: [PATCH 11/14] Fixing the prettier check --- .../examples/PerimeterAssociableResourcesList.json | 4 ++-- .../preview/2021-03-01-preview/networkSecurityPerimeter.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json index b2dbf2ca371e..7189e60df00a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json @@ -16,7 +16,7 @@ "properties": { "resourceType": "Microsoft.Sql/servers", "displayName": "Microsoft.Sql/servers", - "publicDNSZones": [ + "publicDnsZones": [ "database.windows.net" ] } @@ -28,7 +28,7 @@ "properties": { "resourceType": "Microsoft.Storage/accounts", "displayName": "Microsoft.Storage/accounts", - "publicDNSZones": [ + "publicDnsZones": [ "blob.core.windows.net", "table.core.windows.net", "queue.core.windows.net", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index 6a2ee115b17b..77a72874b89d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -401,7 +401,7 @@ "type": "string", "description": "Resource type/provider name." }, - "publicDNSZones": { + "publicDnsZones": { "readOnly": true, "type": "array", "items": { From 33cd203a979a5ba00ab91561df0dcca38ea40bd1 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 22:54:40 +0530 Subject: [PATCH 12/14] Update PerimeterAssociableResourcesList.json --- .../examples/PerimeterAssociableResourcesList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json index 7189e60df00a..1fb3df61055c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/examples/PerimeterAssociableResourcesList.json @@ -41,4 +41,4 @@ } } } -} \ No newline at end of file +} From 06602e68a6a25b7845b8b50c57368bfd3a9739c1 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 23:07:43 +0530 Subject: [PATCH 13/14] Update networkSecurityPerimeter.json --- .../2021-03-01-preview/networkSecurityPerimeter.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index 77a72874b89d..b5b9c0ecc4d4 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -308,6 +308,11 @@ "description": "Resource type." } }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], "description": "The Network Security Perimeter resource" }, "NetworkSecurityPerimeterListResult": { @@ -369,6 +374,11 @@ "description": "Resource type." } }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], "description": "Resource that is onboarded to use network security perimeter. Also referred as perimeter associable resource." }, "PerimeterAssociableResourcesListResult": { From 5c4da62663d0eda225bf0ec458ccce0e2f3b0d31 Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Fri, 16 Jul 2021 23:17:15 +0530 Subject: [PATCH 14/14] Update networkSecurityPerimeter.json --- .../preview/2021-03-01-preview/networkSecurityPerimeter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json index b5b9c0ecc4d4..995edc156847 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-03-01-preview/networkSecurityPerimeter.json @@ -378,7 +378,7 @@ { "$ref": "./network.json#/definitions/Resource" } - ], + ], "description": "Resource that is onboarded to use network security perimeter. Also referred as perimeter associable resource." }, "PerimeterAssociableResourcesListResult": {