Merge pull request #52 from VachaShah/upgrade-smithy

Upgrading to Smithy 2
opensearch-project · Oct 19, 2022 · af08988 · af08988
2 parents ac03650 + 7d61bb9
commit af08988
Show file tree

Hide file tree

Showing 31 changed files with 95 additions and 111 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,5 @@ build/
 
 # osx stuff
 .DS_Store
+
+.smithy.lsp.log
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,14 +17,14 @@ repositories {
 
 buildscript {
     dependencies {
-        val smithyVersion = "1.21.0"
+        val smithyVersion = "1.25.2"
         classpath("software.amazon.smithy:smithy-openapi:$smithyVersion")
         classpath("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
         classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
     }
 }
 
 dependencies {
-    implementation("software.amazon.smithy:smithy-model:1.21.0")
-    implementation("software.amazon.smithy:smithy-aws-traits:1.21.0")
+    implementation("software.amazon.smithy:smithy-model:1.25.2")
+    implementation("software.amazon.smithy:smithy-aws-traits:1.25.2")
 }
diff --git a/model/_global/ping/operations.smithy b/model/_global/ping/operations.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @readonly

diff --git a/model/_global/ping/structures.smithy b/model/_global/ping/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure GetPingClusterInput {

diff --git a/model/_global/search/operations.smithy b/model/_global/search/operations.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(

diff --git a/model/_global/search/structures.smithy b/model/_global/search/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure PostSearchInput {

diff --git a/model/_types/query_dsl/abstractions.smithy b/model/_types/query_dsl/abstractions.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure UserDefinedObjectStructure {

diff --git a/model/cat/indices/cat_indicies/operations.smithy b/model/cat/indices/cat_indicies/operations.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(

diff --git a/model/cat/indices/cat_indicies/structures.smithy b/model/cat/indices/cat_indicies/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 // 
 
+$version: "2"
 namespace OpenSearch
 
 structure GetCatIndicesInput {

diff --git a/model/cat/nodes/cat_nodes/operations.smithy b/model/cat/nodes/cat_nodes/operations.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(

diff --git a/model/cat/nodes/cat_nodes/structures.smithy b/model/cat/nodes/cat_nodes/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure GetCatNodesInput {

diff --git a/model/cluster/get_cluster_settings/operations.smithy b/model/cluster/get_cluster_settings/operations.smithy
@@ -4,12 +4,14 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(
     "OpenSearch Documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/cluster-settings/"
 )
 
+@readonly
 @suppress(["HttpUriConflict"])
 @http(method: "GET", uri: "/_cluster/settings")
 @documentation("Returns cluster settings.")

diff --git a/model/cluster/get_cluster_settings/structures.smithy b/model/cluster/get_cluster_settings/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure GetClusterSettingsInput {

diff --git a/model/cluster/put_update_cluster_settings/operations.smithy b/model/cluster/put_update_cluster_settings/operations.smithy
@@ -4,12 +4,14 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(
     "OpenSearch Documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/cluster-settings/"
 )
 
+@idempotent
 @suppress(["HttpUriConflict"])
 @http(method: "PUT", uri: "/_cluster/settings")
 @documentation("Updates the cluster settings.")

diff --git a/model/cluster/put_update_cluster_settings/structures.smithy b/model/cluster/put_update_cluster_settings/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure PutUpdateClusterSettingsInput {

diff --git a/model/common_datatypes.smithy b/model/common_datatypes.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @pattern("^[^+_\\-\\.][^\\\\, /*?\"<>| ,#\\nA-Z]+$")
@@ -21,18 +22,11 @@ map UserDefinedValueMap{
 
 document UserDefinedValue
 
-@enum([
-    {
-     value: "transient",
-     name: "transient"},
-    {
-     value: "persistent",
-     name: "persistent"},
-    {
-     value: "defaults",
-     name: "defaults"}
-])
-string SettingType
+enum SettingType {
+    TRANSIENT = "transient"
+    PERSISTENT = "persistent"
+    DEFAULTS = "defaults"
+}
 
 list UserDefinedValueList{
     member: String

diff --git a/model/common_enums.smithy b/model/common_enums.smithy
@@ -4,101 +4,55 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
-@enum([
-    {
-     value: "all",
-     name: "all",
-     documentation:"Match any data stream or index, including hidden ones."},
-    {
-     value: "open",
-     name: "open",
-     documentation:"Match open, non-hidden indices. Also matches any non-hidden data stream."},
-    {
-     value: "closed",
-     name: "closed",
-     documentation:"Match closed, non-hidden indices. Also matches any non-hidden data stream. Data streams cannot be closed."},
-    {
-     value: "hidden",
-     name: "hidden",
-     documentation:"Match hidden data streams and hidden indices. Must be combined with open, closed, or both."},
-    {
-     value: "none",
-     name: "none",
-     documentation:"Wildcard expressions are not accepted."}
-])
-string ExpandWildcards
-
-@enum([
-    {
-     value: "AND",
-     name: "AND"},
-    {
-     value: "OR",
-     name: "OR"}
-])
-string DefaultOperator
-
-@enum([
-    {
-     value: "0",
-     name: "query_then_fetch",
-     documentation:"Documents are scored using local term and document frequencies for the shard. This is usually faster but less accurate."},
-    {
-     value: "1",
-     name: "dfs_query_then_fetch",
-     documentation:"Documents are scored using global term and document frequencies across all shards. This is usually slower but more accurate."}
-])
-string SearchType
-
-@enum([
-    {
-     value: "0",
-     name: "missing"},
-    {
-     value: "1",
-     name: "popular"},
-    {
-     value: "2",
-     name: "always"}
-])
-string SuggestMode
-
-@enum([
-    {
-     value: "internal",
-     name: "internal"},
-     {
-     value: "external",
-     name: "external"},
-    {
-     value: "external_gte",
-     name: "external_gte"}
-])
-string VersionType
-
-@enum([
-    {
-     value: "green",
-     name: "green"},
-     {
-     value: "yellow",
-     name: "yellow"},
-    {
-     value: "red",
-     name: "red"}
-])
-string HealthStatus
-
-@enum([
-    {
-     value: "eq",
-     name: "eq",
-     documentation:"Accurate"},
-     {
-     value: "gte",
-     name: "gte",
-     documentation:"Lower bound, including returned documents"}
-])
-string Relation
+enum ExpandWildcards {
+    @documentation("Match any data stream or index, including hidden ones.")
+    ALL = "all"
+    @documentation("Match open, non-hidden indices. Also matches any non-hidden data stream.")
+    OPEN = "open"
+    @documentation("Match closed, non-hidden indices. Also matches any non-hidden data stream. Data streams cannot be closed.")
+    CLOSED = "closed"
+    @documentation("Match hidden data streams and hidden indices. Must be combined with open, closed, or both.")
+    HIDDEN = "hidden"
+    @documentation("Wildcard expressions are not accepted.")
+    NONE = "none"
+}
+
+enum DefaultOperator {
+    AND = "AND"
+    OR = "OR"
+}
+
+enum SearchType {
+    @documentation("Documents are scored using local term and document frequencies for the shard. This is usually faster but less accurate.")
+    QUERY_THEN_FETCH = "0"
+    @documentation("Documents are scored using global term and document frequencies across all shards. This is usually slower but more accurate.")
+    DFS_QUERY_THEN_FETCH = "1"
+}
+
+enum SuggestMode {
+    MISSING = "0"
+    POPULAR = "1"
+    ALWAYS = "2"
+}
+
+enum VersionType {
+    INTERNAL = "internal"
+    EXTERNAL = "external"
+    EXTERNAL_GTE = "external_gte"
+}
+
+enum HealthStatus {
+    GREEN = "green"
+    YELLOW = "yellow"
+    RED = "red"
+}
+
+enum Relation {
+    @documentation("Accurate")
+    EQ = "eq"
+    @documentation("Lower bound, including returned documents")
+    GTE = "gte"
+}
diff --git a/model/common_structures.smithy b/model/common_structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure ShardStatistics{

diff --git a/model/indices/aliases/operations.smithy b/model/indices/aliases/operations.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(

diff --git a/model/indices/aliases/structures.smithy b/model/indices/aliases/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure PostAliasesInput {

diff --git a/model/indices/create/operations.smithy b/model/indices/create/operations.smithy
@@ -4,12 +4,14 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(
     "OpenSearch Documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/create-index/"
 )
 
+@idempotent
 @suppress(["HttpUriConflict"])
 @http(method: "PUT", uri: "/{index}")
 @documentation("Creates index mappings.")

diff --git a/model/indices/create/structures.smithy b/model/indices/create/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure PutCreateIndexInput {

diff --git a/model/indices/delete/operations.smithy b/model/indices/delete/operations.smithy
@@ -4,12 +4,14 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 @externalDocumentation(
     "OpenSearch Documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/delete-index/"
 )
 
+@idempotent
 @http(method: "DELETE", uri: "/{index}")
 @suppress(["HttpUriConflict"])
 @documentation("Removes a document from the index.")

diff --git a/model/indices/delete/structures.smithy b/model/indices/delete/structures.smithy
@@ -4,6 +4,7 @@
 //  this file be licensed under the Apache-2.0 license or a
 //  compatible open source license.
 
+$version: "2"
 namespace OpenSearch
 
 structure DeleteIndexInput {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,5 @@ build/

		# osx stuff
		.DS_Store

		.smithy.lsp.log