From 56692dab940e40aa01353a5f5159947725632421 Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 13:36:29 -0700 Subject: [PATCH 1/6] Add client names for ResetSkills and ResetDocs --- .../Azure.Search/preview/2021-04-30-Preview/searchservice.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json index 1287bbc7ace0..18a3f1c3e092 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json @@ -361,6 +361,7 @@ "required": false, "schema": { "type": "object", + "x-ms-client-name": "DocumentKeysOrIds", "properties": { "documentKeys": { "type": "array", @@ -1061,6 +1062,8 @@ "in": "body", "required": true, "schema": { + "type": "object", + "x-ms-client-name": "SkillNames", "properties": { "skillNames": { "type": "array", From 439d1aee97d60b89bee5b8698d8b08200855cdeb Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 14:36:08 -0700 Subject: [PATCH 2/6] Make 'skillNames' a list of items and not a class with a list property --- .../preview/2021-04-30-Preview/searchservice.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json index 18a3f1c3e092..926b47a3d66f 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json @@ -1062,16 +1062,9 @@ "in": "body", "required": true, "schema": { - "type": "object", - "x-ms-client-name": "SkillNames", - "properties": { - "skillNames": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the names of skills to be reset." - } + "type": "array", + "items": { + "type": "string" } }, "description": "The names of skills to reset." From 6731185a66691122137632f4fadba19e6f2b9735 Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 15:00:24 -0700 Subject: [PATCH 3/6] Revert "Make 'skillNames' a list of items and not a class with a list property" This reverts commit 439d1aee97d60b89bee5b8698d8b08200855cdeb. --- .../preview/2021-04-30-Preview/searchservice.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json index 926b47a3d66f..18a3f1c3e092 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json @@ -1062,9 +1062,16 @@ "in": "body", "required": true, "schema": { - "type": "array", - "items": { - "type": "string" + "type": "object", + "x-ms-client-name": "SkillNames", + "properties": { + "skillNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the names of skills to be reset." + } } }, "description": "The names of skills to reset." From f2896cd738db9c9855cf65bc88836aa73b3bc710 Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 16:15:18 -0700 Subject: [PATCH 4/6] Remove outer 'description' property --- .../Azure.Search/preview/2021-04-30-Preview/searchservice.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json index 18a3f1c3e092..6d409bdb4a8a 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json @@ -1073,8 +1073,7 @@ "description": "the names of skills to be reset." } } - }, - "description": "The names of skills to reset." + } }, { "$ref": "#/parameters/ClientRequestIdParameter" From f996c1638e2013301604e8a07fab9a2c80e07af8 Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 16:21:30 -0700 Subject: [PATCH 5/6] Revert "Remove outer 'description' property" This reverts commit f2896cd738db9c9855cf65bc88836aa73b3bc710. --- .../Azure.Search/preview/2021-04-30-Preview/searchservice.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json index 6d409bdb4a8a..18a3f1c3e092 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/searchservice.json @@ -1073,7 +1073,8 @@ "description": "the names of skills to be reset." } } - } + }, + "description": "The names of skills to reset." }, { "$ref": "#/parameters/ClientRequestIdParameter" From 8e1a301b8ccc0b3e5053b35dfb80b1cc039ad5cc Mon Sep 17 00:00:00 2001 From: Mohit Chakraborty Date: Wed, 29 Sep 2021 17:17:46 -0700 Subject: [PATCH 6/6] Try to fix the example as per the spec --- .../examples/SearchServiceResetSkills.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/examples/SearchServiceResetSkills.json b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/examples/SearchServiceResetSkills.json index b301274e722b..1cb05724a302 100644 --- a/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/examples/SearchServiceResetSkills.json +++ b/specification/search/data-plane/Azure.Search/preview/2021-04-30-Preview/examples/SearchServiceResetSkills.json @@ -3,10 +3,12 @@ "endpoint": "https://myservice.search.windows.net", "skillsetName": "mySkillset", "api-version": "2021-04-30-preview", - "skillNames": [ - "skillName1", - "skillName2" - ] + "skillNames": { + "skillNames": [ + "skillName1", + "skillName2" + ] + } }, "responses": { "204": {}