From f0fe70b51825fdec12d01df500646be7e4dcff54 Mon Sep 17 00:00:00 2001 From: Nati Nimni Date: Mon, 4 Mar 2019 14:11:06 -0800 Subject: [PATCH 1/2] Azure Search: Resource Manager: Support 'None' Identity type --- .../Microsoft.Search/stable/2015-08-19/search.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json index 46922b618ba6..1a0e0b53e7d8 100644 --- a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json +++ b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json @@ -1064,6 +1064,7 @@ "type": "string", "description": "The identity type.", "enum": [ + "None", "SystemAssigned" ], "x-ms-enum": { From f5ba828f0b877288f085d0f5efd675d80640af0c Mon Sep 17 00:00:00 2001 From: Nati Nimni Date: Wed, 6 Mar 2019 09:55:53 -0800 Subject: [PATCH 2/2] Azure Search: Resource Manager: Adding serice identity creation\removal examples --- ...archCreateOrUpdateServiceWithIdentity.json | 81 +++++++++++++++++++ .../SearchUpdateServiceToRemoveIdentity.json | 42 ++++++++++ .../stable/2015-08-19/search.json | 6 +- 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchCreateOrUpdateServiceWithIdentity.json create mode 100644 specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchUpdateServiceToRemoveIdentity.json diff --git a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchCreateOrUpdateServiceWithIdentity.json b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchCreateOrUpdateServiceWithIdentity.json new file mode 100644 index 000000000000..4f7cdf3f1f60 --- /dev/null +++ b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchCreateOrUpdateServiceWithIdentity.json @@ -0,0 +1,81 @@ +{ + "parameters": { + "searchServiceName": "mysearchservice", + "resourceGroupName": "rg1", + "api-version": "2015-08-19", + "subscriptionId": "subid", + "service": { + "location": "westus", + "tags": { + "app-name": "My e-commerce app" + }, + "sku": { + "name": "standard" + }, + "properties": { + "replicaCount": 3, + "partitionCount": 1, + "hostingMode": "default" + }, + "identity": { + "type": "SystemAssigned" + } + } + }, + "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": 3, + "partitionCount": 1, + "status": "provisioning", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "provisioning" + }, + "identity": { + "type": "SystemAssigned", + "principalId": "9d1e1f18-2122-4988-a11c-878782e40a5c", + "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd" + } + } + }, + "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": 3, + "partitionCount": 1, + "status": "provisioning", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "provisioning" + }, + "identity": { + "type": "SystemAssigned", + "principalId": "9d1e1f18-2122-4988-a11c-878782e40a5c", + "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd" + } + } + } + } +} \ No newline at end of file diff --git a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchUpdateServiceToRemoveIdentity.json b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchUpdateServiceToRemoveIdentity.json new file mode 100644 index 000000000000..abc3c96c5c68 --- /dev/null +++ b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/examples/SearchUpdateServiceToRemoveIdentity.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "searchServiceName": "mysearchservice", + "resourceGroupName": "rg1", + "api-version": "2015-08-19", + "subscriptionId": "subid", + "service": { + "sku": { + "name": "standard" + }, + "identity": { + "type": "None" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Search/searchServices/mysearchservice", + "name": "mysearchservice", + "location": "westus", + "type": "Microsoft.Search/searchServices", + "tags": { + }, + "sku": { + "name": "standard" + }, + "properties":{ + "replicaCount": 3, + "partitionCount": 1, + "status": "running", + "statusDetails": "", + "hostingMode": "default", + "provisioningState": "succeeded" + }, + "identity": { + "type": "None" + } + } + } + } +} \ No newline at end of file diff --git a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json index 1a0e0b53e7d8..170ba677e009 100644 --- a/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json +++ b/specification/search/resource-manager/Microsoft.Search/stable/2015-08-19/search.json @@ -331,7 +331,8 @@ ], "operationId": "Services_CreateOrUpdate", "x-ms-examples": { - "SearchCreateOrUpdateService": { "$ref": "./examples/SearchCreateOrUpdateService.json" } + "SearchCreateOrUpdateService": { "$ref": "./examples/SearchCreateOrUpdateService.json" }, + "SearchCreateOrUpdateServiceWithIdentity": { "$ref": "./examples/SearchCreateOrUpdateServiceWithIdentity.json" } }, "description": "Creates or updates a Search service in the given resource group. If the Search service already exists, all properties will be updated with the given values.", "externalDocs": { @@ -395,7 +396,8 @@ ], "operationId": "Services_Update", "x-ms-examples": { - "SearchUpdateService": { "$ref": "./examples/SearchUpdateService.json" } + "SearchUpdateService": { "$ref": "./examples/SearchUpdateService.json" }, + "SearchUpdateServiceToRemoveIdentity": { "$ref": "./examples/SearchUpdateServiceToRemoveIdentity.json" } }, "description": "Updates an existing Search service in the given resource group.", "externalDocs": {