Changed all rest-spec definitions of expand_wildcards to be an enum

clintongormley · clintongormley · commit fc4b99ec9b82 · 2015-01-23T16:03:17.000+01:00
with values: open, closed, none, all Relates to #9295
diff --git a/rest-api-spec/api/cluster.state.json b/rest-api-spec/api/cluster.state.json
@@ -42,8 +42,10 @@
             "description" : "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"
         },
         "expand_wildcards":{
-          "type":"list",
-          "description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)"
+          "type" : "enum",
+          "options" : ["open","closed","none","all"],
+          "default" : "open",
+          "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
       }
     },
diff --git a/rest-api-spec/api/count.json b/rest-api-spec/api/count.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/count_percolate.json b/rest-api-spec/api/count_percolate.json
@@ -41,7 +41,7 @@
         },
         "expand_wildcards": {
           "type": "enum",
-          "options": ["open", "closed"],
+          "options": ["open", "closed","none","all"],
           "default": "open",
           "description": "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/delete_by_query.json b/rest-api-spec/api/delete_by_query.json
@@ -46,7 +46,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.clear_cache.json b/rest-api-spec/api/indices.clear_cache.json
@@ -54,7 +54,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.close.json b/rest-api-spec/api/indices.close.json
@@ -31,7 +31,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/indices.exists.json b/rest-api-spec/api/indices.exists.json
@@ -23,7 +23,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.exists_alias.json b/rest-api-spec/api/indices.exists_alias.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
            "type" : "enum",
-           "options" : ["open","closed"],
+           "options" : ["open","closed","none","all"],
            "default" : ["open", "closed"],
            "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.exists_type.json b/rest-api-spec/api/indices.exists_type.json
@@ -28,7 +28,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.flush.json b/rest-api-spec/api/indices.flush.json
@@ -34,7 +34,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/indices.get.json b/rest-api-spec/api/indices.get.json
@@ -30,7 +30,9 @@
           "description":"Ignore if a wildcard expression resolves to no concrete indices (default: false)"
         },
         "expand_wildcards":{
-          "type":"list",
+          "type" : "enum",
+          "options" : ["open","closed","none","all"],
+          "default" : "open",
           "description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)"
         }
       }
diff --git a/rest-api-spec/api/indices.get_alias.json b/rest-api-spec/api/indices.get_alias.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.get_field_mapping.json b/rest-api-spec/api/indices.get_field_mapping.json
@@ -35,7 +35,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.get_mapping.json b/rest-api-spec/api/indices.get_mapping.json
@@ -25,8 +25,8 @@
             "description" : "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"
         },
         "expand_wildcards": {
-            "type" : "list",
-            "options" : ["open","closed"],
+            "type" : "enum",
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.get_settings.json b/rest-api-spec/api/indices.get_settings.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : ["open","closed"],
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.get_upgrade.json b/rest-api-spec/api/indices.get_upgrade.json
@@ -22,7 +22,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.get_warmer.json b/rest-api-spec/api/indices.get_warmer.json
@@ -30,7 +30,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.open.json b/rest-api-spec/api/indices.open.json
@@ -31,7 +31,7 @@
         },
         "expand_wildcards": {
            "type" : "enum",
-           "options" : ["open","closed"],
+           "options" : ["open","closed","none","all"],
            "default" : "closed",
            "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/indices.optimize.json b/rest-api-spec/api/indices.optimize.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.put_mapping.json b/rest-api-spec/api/indices.put_mapping.json
@@ -39,7 +39,7 @@
         },
         "expand_wildcards": {
           "type" : "enum",
-          "options" : ["open","closed"],
+          "options" : ["open","closed","none","all"],
           "default" : "open",
           "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/indices.put_settings.json b/rest-api-spec/api/indices.put_settings.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
           "type": "enum",
-          "options": ["open", "closed"],
+          "options": ["open", "closed","none","all"],
           "default": "open",
           "description": "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.put_warmer.json b/rest-api-spec/api/indices.put_warmer.json
@@ -35,7 +35,7 @@
         },
         "expand_wildcards": {
           "type" : "enum",
-          "options" : ["open","closed"],
+          "options" : ["open","closed","none","all"],
           "default" : "open",
           "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both, in the search request to warm."
         }
diff --git a/rest-api-spec/api/indices.refresh.json b/rest-api-spec/api/indices.refresh.json
@@ -22,7 +22,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.segments.json b/rest-api-spec/api/indices.segments.json
@@ -22,7 +22,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.status.json b/rest-api-spec/api/indices.status.json
@@ -22,7 +22,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.upgrade.json b/rest-api-spec/api/indices.upgrade.json
@@ -18,7 +18,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/indices.validate_query.json b/rest-api-spec/api/indices.validate_query.json
@@ -30,7 +30,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/mpercolate.json b/rest-api-spec/api/mpercolate.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
           "type": "enum",
-          "options": ["open", "closed"],
+          "options": ["open", "closed","none","all"],
           "default": "open",
           "description": "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/percolate.json b/rest-api-spec/api/percolate.json
@@ -41,7 +41,7 @@
         },
         "expand_wildcards": {
           "type" : "enum",
-          "options" : ["open","closed"],
+          "options" : ["open","closed","none","all"],
           "default" : "open",
           "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/search.json b/rest-api-spec/api/search.json
@@ -56,7 +56,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/search_exists.json b/rest-api-spec/api/search_exists.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/search_shards.json b/rest-api-spec/api/search_shards.json
@@ -40,7 +40,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         }
diff --git a/rest-api-spec/api/search_template.json b/rest-api-spec/api/search_template.json
@@ -26,7 +26,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },
diff --git a/rest-api-spec/api/suggest.json b/rest-api-spec/api/suggest.json
@@ -22,7 +22,7 @@
         },
         "expand_wildcards": {
             "type" : "enum",
-            "options" : ["open","closed"],
+            "options" : ["open","closed","none","all"],
             "default" : "open",
             "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
         },

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,10 @@`
`42`	`42`	"description" : "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"
`43`	`43`	`},`
`44`	`44`	`"expand_wildcards":{`
`45`		`- "type":"list",`
`46`		`- "description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)"`
	`45`	`+ "type" : "enum",`
	`46`	`+ "options" : ["open","closed","none","all"],`
	`47`	`+ "default" : "open",`
	`48`	`+ "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`},`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`},`
`32`	`32`	`"expand_wildcards": {`
`33`	`33`	`"type" : "enum",`
`34`		`- "options" : ["open","closed"],`
	`34`	`+ "options" : ["open","closed","none","all"],`
`35`	`35`	`"default" : "open",`
`36`	`36`	`"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`},`
`35`	`35`	`"expand_wildcards": {`
`36`	`36`	`"type" : "enum",`
`37`		`- "options" : ["open","closed"],`
	`37`	`+ "options" : ["open","closed","none","all"],`
`38`	`38`	`"default" : "open",`
`39`	`39`	`"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@`
`30`	`30`	`"description":"Ignore if a wildcard expression resolves to no concrete indices (default: false)"`
`31`	`31`	`},`
`32`	`32`	`"expand_wildcards":{`
`33`		`- "type":"list",`
	`33`	`+ "type" : "enum",`
	`34`	`+ "options" : ["open","closed","none","all"],`
	`35`	`+ "default" : "open",`
`34`	`36`	`"description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)"`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`},`
`40`	`40`	`"expand_wildcards": {`
`41`	`41`	`"type" : "enum",`
`42`		`- "options" : ["open","closed"],`
	`42`	`+ "options" : ["open","closed","none","all"],`
`43`	`43`	`"default" : "open",`
`44`	`44`	`"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`},`
`36`	`36`	`"expand_wildcards": {`
`37`	`37`	`"type" : "enum",`
`38`		`- "options" : ["open","closed"],`
	`38`	`+ "options" : ["open","closed","none","all"],`
`39`	`39`	`"default" : "open",`
`40`	`40`	`"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both, in the search request to warm."`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`"expand_wildcards": {`
`28`	`28`	`"type": "enum",`
`29`		`- "options": ["open", "closed"],`
	`29`	`+ "options": ["open", "closed","none","all"],`
`30`	`30`	`"default": "open",`
`31`	`31`	`"description": "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`},`
`41`	`41`	`"expand_wildcards": {`
`42`	`42`	`"type" : "enum",`
`43`		`- "options" : ["open","closed"],`
	`43`	`+ "options" : ["open","closed","none","all"],`
`44`	`44`	`"default" : "open",`
`45`	`45`	`"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."`
`46`	`46`	`}`