Azure Search: Resource Manager: Support 'None' Identity type (#5319)

* Azure Search: Resource Manager: Support 'None' Identity type * Azure Search: Resource Manager: Adding serice identity creation\removal examples
Azure · Mar 7, 2019 · 04d09a9 · 04d09a9
1 parent 27ad7f3
commit 04d09a9
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 2 deletions.
diff --git a/.../Microsoft.Search/stable/2015-08-19/examples/SearchCreateOrUpdateServiceWithIdentity.json b/.../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"
+                }
+            }
+        }
+    }
+}
diff --git a/...ager/Microsoft.Search/stable/2015-08-19/examples/SearchUpdateServiceToRemoveIdentity.json b/...ager/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"
+                }
+            }
+        }
+    }
+}
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
@@ -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": {
@@ -1064,6 +1066,7 @@
           "type": "string",
           "description": "The identity type.",
           "enum": [
+            "None",
             "SystemAssigned"
           ],
           "x-ms-enum": {