From 87a694d3be747ff96beadce4af285429ae432b8d Mon Sep 17 00:00:00 2001 From: Hari Prasad Perabattula Date: Mon, 17 May 2021 16:29:43 +0530 Subject: [PATCH 1/7] 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 8cf498ce533b7671424e9cd8af9b6c698b434e16 Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 01:34:40 -0800 Subject: [PATCH 2/7] Add the AzurePortal bypass value to enum --- .../preview/2021-04-01-preview/search.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json index e2a214bf348d..b93dcd8d1e1e 100644 --- a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json @@ -1588,7 +1588,8 @@ "bypass": { "type": "string", "enum": [ - "None" + "None", + "AzurePortal" ], "x-ms-enum": { "name": "SearchBypass", @@ -1598,10 +1599,15 @@ "value": "None", "name": "None", "description": "Indicates that no origin can bypass the rules defined in the 'ipRules' section. This is the default." + }, + { + "value": "AzurePortal", + "name": "AzurePortal", + "description": "Indicates that requests originating from the Azure portal can bypass the rules defined in the 'ipRules' section." } ] }, - "description": "A specific data exfiltration scenario that is disabled for the service." + "description": "Possible origins of inbound traffic that can bypass the rules defined in the 'ipRules' section." } }, "description": "Network specific rules that determine how the Azure Cognitive Search service may be reached." From af1809bb73074e086b4609324cb637d354ead5f3 Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 01:34:49 -0800 Subject: [PATCH 3/7] Add AzurePortal value to examples --- ...lowAccessFromPublicCustomIPsAndBypass.json | 125 ++++++++++++++++++ ...lowAccessFromPublicCustomIPsAndBypass.json | 71 ++++++++++ 2 files changed, 196 insertions(+) create mode 100644 specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json create mode 100644 specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json new file mode 100644 index 000000000000..16bc548f5cc3 --- /dev/null +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json @@ -0,0 +1,125 @@ +{ + "parameters": { + "searchServiceName": "mysearchservice", + "resourceGroupName": "rg1", + "api-version": "2021-04-01-preview", + "subscriptionId": "subid", + "service": { + "location": "westus", + "tags": { + "app-name": "My e-commerce app" + }, + "sku": { + "name": "standard" + }, + "properties": { + "replicaCount": 1, + "partitionCount": 1, + "networkRuleSet": { + "ipRules": [ + { + "value": "123.4.5.6" + }, + { + "value": "123.4.6.0/18" + } + ], + "bypass": "AzurePortal" + }, + "hostingMode": "default" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Search/searchServices/mysearchservice", + "name": "mysearchservice", + "location": "westus", + "type": "Microsoft.Search/searchServices", + "tags": { + "app-name": "My e-commerce app" + }, + "sku": { + "name": "standard" + }, + "properties": { + "replicaCount": 1, + "partitionCount": 1, + "status": "provisioning", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "provisioning", + "publicNetworkAccess": "enabled", + "networkRuleSet": { + "ipRules": [ + { + "value": "123.4.5.6" + }, + { + "value": "123.4.6.0/18" + } + ], + "bypass": "AzurePortal" + }, + "privateEndpointConnections": [], + "sharedPrivateLinkResources": [], + "encryptionWithCmk": { + "enforcement": "Unspecified", + "encryptionComplianceStatus": "Compliant" + }, + "disableLocalAuth": false, + "authOptions": { + "apiKeyOnly": {} + }, + "disabledDataExfiltrationOptions": [] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Search/searchServices/mysearchservice", + "name": "mysearchservice", + "location": "westus", + "type": "Microsoft.Search/searchServices", + "tags": { + "app-name": "My e-commerce app" + }, + "sku": { + "name": "standard" + }, + "properties": { + "replicaCount": 1, + "partitionCount": 1, + "status": "provisioning", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "provisioning", + "publicNetworkAccess": "enabled", + "networkRuleSet": { + "ipRules": [ + { + "value": "123.4.5.6" + }, + { + "value": "123.4.6.0/18" + } + ], + "bypass": "AzurePortal" + }, + "privateEndpointConnections": [], + "sharedPrivateLinkResources": [], + "encryptionWithCmk": { + "enforcement": "Unspecified", + "encryptionComplianceStatus": "Compliant" + }, + "disableLocalAuth": false, + "authOptions": { + "apiKeyOnly": {} + }, + "disabledDataExfiltrationOptions": [] + } + } + } + } +} diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json new file mode 100644 index 000000000000..98e4959c6131 --- /dev/null +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "searchServiceName": "mysearchservice", + "resourceGroupName": "rg1", + "api-version": "2021-04-01-preview", + "subscriptionId": "subid", + "service": { + "properties": { + "replicaCount": 3, + "partitionCount": 1, + "publicNetworkAccess": "enabled", + "networkRuleSet": { + "ipRules": [ + { + "value": "123.4.5.6" + }, + { + "value": "123.4.6.0/18" + } + ], + "bypass": "AzurePortal" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Search/searchServices/mysearchservice", + "name": "mysearchservice", + "location": "westus", + "type": "Microsoft.Search/searchServices", + "tags": { + "app-name": "My e-commerce app", + "new-tag": "Adding a new tag" + }, + "sku": { + "name": "standard" + }, + "properties": { + "replicaCount": 3, + "partitionCount": 1, + "status": "running", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "succeeded", + "publicNetworkAccess": "enabled", + "networkRuleSet": { + "ipRules": [ + { + "value": "10.2.3.4" + } + ], + "bypass": "AzurePortal" + }, + "privateEndpointConnections": [], + "sharedPrivateLinkResources": [], + "encryptionWithCmk": { + "enforcement": "Unspecified", + "encryptionComplianceStatus": "Compliant" + }, + "disableLocalAuth": false, + "authOptions": { + "apiKeyOnly": {} + }, + "disabledDataExfiltrationOptions": [] + } + } + } + } +} From b817303e6051fe3ed65d9dbf78451738f15bfe2c Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 02:16:22 -0800 Subject: [PATCH 4/7] Fix some validation errors --- .../examples/SearchListOperations.json | 616 ++++++++++++++++++ .../preview/2021-04-01-preview/search.json | 11 + 2 files changed, 627 insertions(+) create mode 100644 specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json new file mode 100644 index 000000000000..dd6d99b68807 --- /dev/null +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json @@ -0,0 +1,616 @@ +{ + "parameters": { + "api-version": "2021-04-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Search/operations/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "List all available operations", + "description": "Lists all of the available operations of the Microsoft.Search provider." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/register/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Register the Search Resource Provider", + "description": "Registers the subscription for the search resource provider and enables the creation of search services." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Set Search Service", + "description": "Creates or updates the search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Get Search Service", + "description": "Reads the search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Delete Search Service", + "description": "Deletes the search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/start/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Start Search Service", + "description": "Starts the search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/stop/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Stop Search Service", + "description": "Stops the search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/listAdminKeys/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Get Admin Key", + "description": "Reads the admin keys." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/regenerateAdminKey/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Regenerate Admin Key", + "description": "Regenerates the admin key." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/listQueryKeys/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "API Keys", + "operation": "Get Query Keys", + "description": "Returns the list of query API keys for the given Azure Search service." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/createQueryKey/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Search Services", + "operation": "Create Query Key", + "description": "Creates the query key." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/deleteQueryKey/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "API Keys", + "operation": "Delete Query Key", + "description": "Deletes the query key." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/checkNameAvailability/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Service Name Availability", + "operation": "Check Service Name Availability", + "description": "Checks availability of the service name." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/diagnosticSettings/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Diagnostic Settings", + "operation": "Get Diagnostic Setting", + "description": "Gets the diganostic setting read for the resource" + }, + "origin": "system" + }, + { + "name": "Microsoft.Search/searchServices/diagnosticSettings/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Diagnostic Settings", + "operation": "Set Diagnostic Setting", + "description": "Creates or updates the diganostic setting for the resource" + }, + "origin": "system" + }, + { + "name": "Microsoft.Search/searchServices/metricDefinitions/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "The metric definitions for the search service", + "operation": "Read search service metric definitions", + "description": "Gets the available metrics for the search service" + }, + "origin": "system", + "properties": { + "serviceSpecification": { + "metricSpecifications": [ + { + "name": "SearchLatency", + "displayName": "Search Latency", + "displayDescription": "Average search latency for the search service", + "unit": "Seconds", + "aggregationType": "Average", + "availabilities": [ + { + "timeGrain": "PT1M", + "blobDuration": "PT1H" + } + ] + }, + { + "name": "SearchQueriesPerSecond", + "displayName": "Search queries per second", + "displayDescription": "Search queries per second for the search service", + "unit": "CountPerSecond", + "aggregationType": "Average", + "availabilities": [ + { + "timeGrain": "PT1M", + "blobDuration": "PT1H" + } + ] + }, + { + "name": "ThrottledSearchQueriesPercentage", + "displayName": "Throttled search queries percentage", + "displayDescription": "Percentage of search queries that were throttled for the search service", + "unit": "Percent", + "aggregationType": "Average", + "availabilities": [ + { + "timeGrain": "PT1M", + "blobDuration": "PT1H" + } + ] + } + ] + } + } + }, + { + "name": "Microsoft.Search/searchServices/logDefinitions/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "The log definition for the search service", + "operation": "Read search service log definitions", + "description": "Gets the available logs for the search service" + }, + "origin": "system", + "properties": { + "serviceSpecification": { + "logSpecifications": [ + { + "name": "OperationLogs", + "displayName": "Operation Logs", + "blobDuration": "PT1H" + } + ] + } + } + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnectionProxies/validate/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection Proxy", + "operation": "Validate Private Endpoint Connection Proxy", + "description": "Validates a private endpoint connection create call from NRP side" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnectionProxies/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection Proxy", + "operation": "Create Private Endpoint Connection Proxy", + "description": "Creates a private endpoint connection proxy with the specified parameters or updates the properties or tags for the specified private endpoint connection proxy" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnectionProxies/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection Proxy", + "operation": "Get Private Endpoint Connection Proxy", + "description": "Returns the list of private endpoint connection proxies or gets the properties for the specified private endpoint connection proxy" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnectionProxies/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection Proxy", + "operation": "Delete Private Endpoint Connection Proxy", + "description": "Deletes an existing private endpoint connection proxy" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnections/write", + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection", + "operation": "Create Private Endpoint Connection", + "description": "Creates a private endpoint connections with the specified parameters or updates the properties or tags for the specified private endpoint connections" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnections/read", + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection", + "operation": "Get Private Endpoint Connection", + "description": "Returns the list of private endpoint connections or gets the properties for the specified private endpoint connections" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/privateEndpointConnections/delete", + "display": { + "provider": "Microsoft Search", + "resource": "Private Endpoint Connection", + "operation": "Delete Private Endpoint Connection", + "description": "Deletes an existing private endpoint connections" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/sharedPrivateLinkResources/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Shared Private Link Resource", + "operation": "Create Shared Private Link Resource", + "description": "Creates a new shared private link resource with the specified parameters or updates the properties for the specified shared private link resource" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/sharedPrivateLinkResources/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Shared Private Link Resource", + "operation": "Get Shared Private Link Resource", + "description": "Returns the list of shared private link resources or gets the properties for the specified shared private link resource" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/sharedPrivateLinkResources/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Shared Private Link Resource", + "operation": "Delete Shared Private Link Resource", + "description": "Deletes an existing shared private link resource" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/sharedPrivateLinkResources/operationStatuses/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Shared Private Link Resource", + "operation": "Get Operation Status", + "description": "Get the details of a long running shared private link resource operation" + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexes", + "operation": "Read Index", + "description": "Return an index or its statistics, return a list of indexes or their statistics, or test the lexical analysis components of an index." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexes", + "operation": "Create or Update Index", + "description": "Create an index or modify its properties." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexes", + "operation": "Delete Index", + "description": "Delete an index." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/synonymMaps/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Synonym Maps", + "operation": "Read Synonym Map", + "description": "Return a synonym map or a list of synonym maps." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/synonymMaps/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Synonym Maps", + "operation": "Create or Update Synonym Map", + "description": "Create a synonym map or modify its properties." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/synonymMaps/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Synonym Maps", + "operation": "Delete Synonym Map", + "description": "Delete a synonym map." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/dataSources/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Data Sources", + "operation": "Read Data Source", + "description": "Return a data source or a list of data sources." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/dataSources/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Data Sources", + "operation": "Create or Update Data Source", + "description": "Create a data source or modify its properties." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/dataSources/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Data Sources", + "operation": "Delete Data Source", + "description": "Delete a data source." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/skillsets/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Skillsets", + "operation": "Read Skillset", + "description": "Return a skillset or a list of skillsets." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/skillsets/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Skillsets", + "operation": "Create or Update Skillset", + "description": "Create a skillset or modify its properties." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/skillsets/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Skillsets", + "operation": "Delete Skillset", + "description": "Delete a skillset." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexers/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexers", + "operation": "Read Indexer", + "description": "Return an indexer or its status, or return a list of indexers or their statuses." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexers/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexers", + "operation": "Create or Manage Indexer", + "description": "Create an indexer, modify its properties, or manage its execution." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexers/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Indexers", + "operation": "Delete Indexer", + "description": "Delete an indexer." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/debugSessions/read", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Debug Sessions", + "operation": "Read Debug Session", + "description": "Return a debug session or a list of debug sessions." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/debugSessions/write", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Debug Sessions", + "operation": "Create or Update Debug Session", + "description": "Create a debug session or modify its properties." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/debugSessions/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Debug Sessions", + "operation": "Delete Debug Session", + "description": "Delete a debug session." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/debugSessions/execute/action", + "isDataAction": false, + "display": { + "provider": "Microsoft Search", + "resource": "Debug Sessions", + "operation": "Execute Debug Session", + "description": "Use a debug session, get execution data, or evaluate expressions on it." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/documents/read", + "isDataAction": true, + "display": { + "provider": "Microsoft Search", + "resource": "Documents", + "operation": "Read Documents", + "description": "Read documents or suggested query terms from an index." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/documents/write", + "isDataAction": true, + "display": { + "provider": "Microsoft Search", + "resource": "Documents", + "operation": "Write Documents", + "description": "Upload documents to an index or modify existing documents." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Search/searchServices/indexes/documents/delete", + "isDataAction": true, + "display": { + "provider": "Microsoft Search", + "resource": "Documents", + "operation": "Delete Documents", + "description": "Delete documents from an index." + }, + "origin": "user,system" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json index b93dcd8d1e1e..9d7641797c50 100644 --- a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/search.json @@ -41,6 +41,11 @@ ], "description": "Lists all of the available REST API operations of the Microsoft.Search provider.", "operationId": "Operations_List", + "x-ms-examples": { + "SearchListOperations": { + "$ref": "./examples/SearchListOperations.json" + } + }, "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -365,6 +370,9 @@ "SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPs": { "$ref": "./examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPs.json" }, + "SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass": { + "$ref": "./examples/SearchCreateOrUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json" + }, "SearchCreateOrUpdateServiceToAllowAccessFromPrivateEndpoints": { "$ref": "./examples/SearchCreateOrUpdateServiceToAllowAccessFromPrivateEndpoints.json" }, @@ -458,6 +466,9 @@ "SearchUpdateServiceToAllowAccessFromPublicCustomIPs": { "$ref": "./examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPs.json" }, + "SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass": { + "$ref": "./examples/SearchUpdateServiceToAllowAccessFromPublicCustomIPsAndBypass.json" + }, "SearchUpdateServiceToAllowAccessFromPrivateEndpoints": { "$ref": "./examples/SearchUpdateServiceToAllowAccessFromPrivateEndpoints.json" }, From 3e597ea9e2530f395c6217483dfe555bc2ebdc9e Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 02:26:36 -0800 Subject: [PATCH 5/7] Fix prettier violations --- package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c5151eca2e3..d7b70afe02de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ "@ts-common/commonmark-to-markdown": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ts-common/commonmark-to-markdown/-/commonmark-to-markdown-1.2.0.tgz", - "integrity": "sha1-Gy257ada2oNjbwcopc3sic0D08M=", + "integrity": "sha512-xFWpGZN1XzWN0egRs6gcT+tgYYw57us/Xr9euoaTsi9N+UR9ZxnG8Mrt4K/KlB54dNIED/LaGxReqRM5L7tKZA==", "dev": true, "requires": { "@ts-common/iterator": "^0.3.0", @@ -108,7 +108,7 @@ "@ts-common/fs": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@ts-common/fs/-/fs-0.2.0.tgz", - "integrity": "sha1-FMvf3smooaVjKNr1Ztm8k7iJgrk=", + "integrity": "sha512-ul1v4ZatcHuAzrwr/hGjSbk37pnfnLYDWC1yMEynQlnV8ndAcIVNYwQPPOYtLADPKTi3y74g5Q4BF3xPurDHLA==", "dev": true, "requires": { "@ts-common/async-iterator": "^0.2.0", @@ -119,7 +119,7 @@ "@ts-common/iterator": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@ts-common/iterator/-/iterator-0.3.6.tgz", - "integrity": "sha1-/6FLXYkTxIMKXSMdPssHXQLKfm0=", + "integrity": "sha512-nNdcleTj3qLlchH17HI/xqOc6sNgOqJ5DdRR0nOEVdJVZCo5bfqoQTu6+Q9ZwMhuETuR2d86MSlmaL2FVHnPjQ==", "dev": true }, "@ts-common/json": { @@ -803,7 +803,7 @@ "json-schema-ref-parser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz", - "integrity": "sha1-MK80rqtb7gQx2oBdrA6yG1dL9j0=", + "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==", "dev": true, "requires": { "call-me-maybe": "^1.0.1", @@ -1446,7 +1446,7 @@ "typescript": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha1-yDD2V/k/HqhGgZ6SkJL1/lmD6Xc=", + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", "dev": true }, "which": { From 573b153dec91d4b5bdb3601c4fd24652810a11c7 Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 02:28:08 -0800 Subject: [PATCH 6/7] Revert changes to package lock --- package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7b70afe02de..9c5151eca2e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ "@ts-common/commonmark-to-markdown": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ts-common/commonmark-to-markdown/-/commonmark-to-markdown-1.2.0.tgz", - "integrity": "sha512-xFWpGZN1XzWN0egRs6gcT+tgYYw57us/Xr9euoaTsi9N+UR9ZxnG8Mrt4K/KlB54dNIED/LaGxReqRM5L7tKZA==", + "integrity": "sha1-Gy257ada2oNjbwcopc3sic0D08M=", "dev": true, "requires": { "@ts-common/iterator": "^0.3.0", @@ -108,7 +108,7 @@ "@ts-common/fs": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@ts-common/fs/-/fs-0.2.0.tgz", - "integrity": "sha512-ul1v4ZatcHuAzrwr/hGjSbk37pnfnLYDWC1yMEynQlnV8ndAcIVNYwQPPOYtLADPKTi3y74g5Q4BF3xPurDHLA==", + "integrity": "sha1-FMvf3smooaVjKNr1Ztm8k7iJgrk=", "dev": true, "requires": { "@ts-common/async-iterator": "^0.2.0", @@ -119,7 +119,7 @@ "@ts-common/iterator": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@ts-common/iterator/-/iterator-0.3.6.tgz", - "integrity": "sha512-nNdcleTj3qLlchH17HI/xqOc6sNgOqJ5DdRR0nOEVdJVZCo5bfqoQTu6+Q9ZwMhuETuR2d86MSlmaL2FVHnPjQ==", + "integrity": "sha1-/6FLXYkTxIMKXSMdPssHXQLKfm0=", "dev": true }, "@ts-common/json": { @@ -803,7 +803,7 @@ "json-schema-ref-parser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz", - "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==", + "integrity": "sha1-MK80rqtb7gQx2oBdrA6yG1dL9j0=", "dev": true, "requires": { "call-me-maybe": "^1.0.1", @@ -1446,7 +1446,7 @@ "typescript": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", + "integrity": "sha1-yDD2V/k/HqhGgZ6SkJL1/lmD6Xc=", "dev": true }, "which": { From 9b7783ce0ebfc952c95ae3d619d57652aa0dbb85 Mon Sep 17 00:00:00 2001 From: Arvind Krishnaa Jagannathan Date: Thu, 3 Mar 2022 02:35:11 -0800 Subject: [PATCH 7/7] Examples prettier fix --- .../2021-04-01-preview/examples/SearchListOperations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json index dd6d99b68807..289cdbdf944a 100644 --- a/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json +++ b/specification/search/resource-manager/Microsoft.Search/preview/2021-04-01-preview/examples/SearchListOperations.json @@ -613,4 +613,4 @@ } } } -} \ No newline at end of file +}