Generate all missing low-level methods (opensearch-project#813)

* Generate all missing low-level methods Signed-off-by: Thomas Farr <[email protected]> * Enable search pipelines on 2.8.0 Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Sep 24, 2024 · 49f4b01 · 49f4b01
1 parent cb2ef42
commit 49f4b01
Show file tree

Hide file tree

Showing 42 changed files with 10,290 additions and 70 deletions.
diff --git a/.github/actions/run-released-opensearch/action.yml b/.github/actions/run-released-opensearch/action.yml
@@ -7,6 +7,9 @@ inputs:
   secured:
     description: Whether to enable the security plugin
     required: true
+  opensearch_args:
+    description: Additional arguments to pass to the OpenSearch process
+    default: ''
 outputs:
   opensearch_url:
     description: The URL where the OpenSearch node is accessible
@@ -49,4 +52,5 @@ runs:
       id: opensearch
       uses: ./client/.github/actions/start-opensearch
       with:
+        opensearch_args: ${{ inputs.opensearch_args }}
         secured: ${{ inputs.secured }}
diff --git a/.github/actions/start-opensearch/action.yml b/.github/actions/start-opensearch/action.yml
@@ -1,6 +1,9 @@
 name: Start OpenSearch
 description: Configures and starts an OpenSearch daemon
 inputs:
+  opensearch_args:
+    description: Additional arguments to pass to the OpenSearch process
+    default: ''
   secured:
     description: Whether to enable the security plugin
     default: 'false'
@@ -74,9 +77,9 @@ runs:
         fi
 
         if [[ "$RUNNER_OS" != "Windows" ]]; then
-          $OPENSEARCH_HOME/bin/opensearch &
+          $OPENSEARCH_HOME/bin/opensearch ${OPENSEARCH_ARGS} &
         else
-          $OPENSEARCH_HOME/bin/opensearch.bat -d &
+          $OPENSEARCH_HOME/bin/opensearch.bat ${OPENSEARCH_ARGS} -d &
         fi
 
         for attempt in {1..20}; do
@@ -91,3 +94,4 @@ runs:
       env:
         SECURED: ${{ inputs.secured }}
         RUNNER_OS: ${{ runner.os }}
+        OPENSEARCH_ARGS: ${{ inputs.opensearch_args }}
diff --git a/.github/workflows/integration-yaml-tests.yml b/.github/workflows/integration-yaml-tests.yml
@@ -52,6 +52,7 @@ jobs:
         with:
           version: ${{ matrix.version }}
           secured: true
+          opensearch_args: ${{ matrix.version == '2.8.0' && '-Eopensearch.experimental.feature.search_pipeline.enabled=true' || '' }}
 
       - name: Run YAML tests
         working-directory: client

diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs
@@ -39,17 +39,10 @@ public static class CodeConfiguration
 	{
 		private static readonly Glob[] OperationsToInclude =
         [
-			new("cat.*"),
-			new("cluster.*"),
-			new("dangling_indices.*"),
-            new("indices.*"),
-			new("ingest.*"),
-            new("nodes.*"),
-			new("snapshot.*"),
-			new("tasks.*")
+			new("*")
         ];
 
-		public static bool IncludeOperation(string name) => !name.Contains('.') || OperationsToInclude.Any(g => g.IsMatch(name));
+		public static bool IncludeOperation(string name) => OperationsToInclude.Any(g => g.IsMatch(name));
 
 		/// <summary>
         /// Map API default names for API's we are only supporting on the low level client first

diff --git a/src/ApiGenerator/Domain/Code/CsharpNames.cs b/src/ApiGenerator/Domain/Code/CsharpNames.cs
@@ -123,14 +123,17 @@ public string PerPathMethodName(string path)
             var method = MethodName;
             // This is temporary for transition period
             // TODO: remove in branch once it in opensearch is scrubbed
-            if (path.Contains("{type}") && !method.Contains("Type")) method += "UsingType";
+            if (pc("{type}") && !method.Contains("Type")) method += "UsingType";
 
             if (ms("Indices") && !pc("{index}"))
                 return (method + "ForAll").Replace("AsyncForAll", "ForAllAsync");
 
             if (ms("Nodes") && !pc("{node_id}"))
                 return (method + "ForAll").Replace("AsyncForAll", "ForAllAsync");
 
+            if (Namespace == "Knn" && method.StartsWith("Stats") && !pc("{node_id}"))
+                return method.Replace("Stats", "StatsForAll");
+
             return method;
         }
 

diff --git a/src/ApiGenerator/Generator/ApiEndpointFactory.cs b/src/ApiGenerator/Generator/ApiEndpointFactory.cs
@@ -238,14 +238,17 @@ private static string GetOpenSearchType(JsonSchema schema, Action<string, bool>
                     if (first.EndsWith("?")) return first;
                     if (first == second) return first;
 
-                    switch (first, second)
+                    return (first, second) switch
                     {
-                        case ("string", "list"): return second;
-                        case ("boolean", "string"): return first;
-                        case ("number", _): return "string";
-                        case (_,"number"): return "string";
-                    }
+                        (_, "list") => second,
+                        ("boolean", "string") => first,
+                        ("number", _) => "string",
+                        (_, "number") => "string",
+                        (_, _) => throw new Exception($"Unable to determine type of: {first} and {second}")
+                    };
                 }
+
+                throw new Exception("Unable to determine type of oneOf");
             }
 
             var enumOptions = schema.Enumeration.Where(e => e != null).Select(e => e.ToString()).ToList();
@@ -259,7 +262,19 @@ private static string GetOpenSearchType(JsonSchema schema, Action<string, bool>
             if (schema.Type == JsonObjectType.Array && (schema.Item?.HasReference ?? false))
                 _ = GetOpenSearchType(schema.Item, trackEnumToGenerate, true);
 
-            return schema.Type switch
+            var types = Enum.GetValues<JsonObjectType>()
+                .Where(t => t != JsonObjectType.None && schema.Type.HasFlag(t))
+                .ToHashSet();
+
+            var type = types.Count switch
+            {
+                0 => throw new Exception("No type specified"),
+                1 => types.First(),
+                2 when types.Contains(JsonObjectType.Boolean) && types.Contains(JsonObjectType.String) => JsonObjectType.String,
+                _ => throw new Exception($"Unable to determine type of: {string.Join(", ", types)}")
+            };
+
+            return type switch
             {
                 JsonObjectType.Integer => "number",
                 JsonObjectType.Array => "list",

diff --git a/src/ApiGenerator/Views/HighLevel/Requests/PlainRequestBase.cshtml b/src/ApiGenerator/Views/HighLevel/Requests/PlainRequestBase.cshtml
@@ -1,21 +1,9 @@
 @using ApiGenerator.Domain
 @inherits ApiGenerator.CodeTemplatePage<RestApiSpec>
 @{ await IncludeLegacyGeneratorNotice(); }
-// ReSharper disable RedundantUsingDirective
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using System.Runtime.Serialization;
-using OpenSearch.Net;
-using OpenSearch.Net.Utf8Json;
-@{ await IncludeAsync("LowLevel/Client/Usings.cshtml", Model);}
 
-// ReSharper disable UnusedTypeParameter
-namespace OpenSearch.Client
+namespace OpenSearch.Client;
+
+public abstract partial class @Raw("PlainRequestBase<TParameters>")
 {
-    public abstract partial class @Raw("PlainRequestBase<TParameters>")
-    {
-    }
 }
diff --git a/src/OpenSearch.Client/_Generated/Requests.cs b/src/OpenSearch.Client/_Generated/Requests.cs
@@ -41,27 +41,7 @@
 //      Windows     :   build.bat codegen
 //
 // -----------------------------------------------
-// ReSharper disable RedundantUsingDirective
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Runtime.Serialization;
-using System.Text;
-using OpenSearch.Net;
-using OpenSearch.Net.Specification.CatApi;
-using OpenSearch.Net.Specification.ClusterApi;
-using OpenSearch.Net.Specification.DanglingIndicesApi;
-using OpenSearch.Net.Specification.HttpApi;
-using OpenSearch.Net.Specification.IndicesApi;
-using OpenSearch.Net.Specification.IngestApi;
-using OpenSearch.Net.Specification.NodesApi;
-using OpenSearch.Net.Specification.SnapshotApi;
-using OpenSearch.Net.Specification.TasksApi;
-using OpenSearch.Net.Utf8Json;
 
-// ReSharper disable UnusedTypeParameter
-namespace OpenSearch.Client
-{
-    public abstract partial class PlainRequestBase<TParameters> { }
-}
+namespace OpenSearch.Client;
+
+public abstract partial class PlainRequestBase<TParameters> { }
diff --git a/src/OpenSearch.Net/_Generated/Api/Enums.cs b/src/OpenSearch.Net/_Generated/Api/Enums.cs
@@ -309,6 +309,39 @@ public enum IndicesStatsMetric
         All = 1 << 17,
     }
 
+    [StringEnum]
+    public enum KnnDefaultOperator
+    {
+        [EnumMember(Value = "AND")]
+        And,
+
+        [EnumMember(Value = "OR")]
+        Or,
+    }
+
+    [StringEnum]
+    public enum KnnSearchType
+    {
+        [EnumMember(Value = "dfs_query_then_fetch")]
+        DfsQueryThenFetch,
+
+        [EnumMember(Value = "query_then_fetch")]
+        QueryThenFetch,
+    }
+
+    [StringEnum]
+    public enum KnnSuggestMode
+    {
+        [EnumMember(Value = "always")]
+        Always,
+
+        [EnumMember(Value = "missing")]
+        Missing,
+
+        [EnumMember(Value = "popular")]
+        Popular,
+    }
+
     [StringEnum]
     public enum Level
     {
@@ -534,6 +567,37 @@ public enum NodesUsageMetric
         All = 1 << 1,
     }
 
+    [StringEnum]
+    public enum NotificationsNotificationConfigType
+    {
+        [EnumMember(Value = "chime")]
+        Chime,
+
+        [EnumMember(Value = "email")]
+        Email,
+
+        [EnumMember(Value = "email_group")]
+        EmailGroup,
+
+        [EnumMember(Value = "microsoft_teams")]
+        MicrosoftTeams,
+
+        [EnumMember(Value = "ses_account")]
+        SesAccount,
+
+        [EnumMember(Value = "slack")]
+        Slack,
+
+        [EnumMember(Value = "smtp_account")]
+        SmtpAccount,
+
+        [EnumMember(Value = "sns")]
+        Sns,
+
+        [EnumMember(Value = "webhook")]
+        Webhook,
+    }
+
     [StringEnum]
     public enum OpType
     {
@@ -688,12 +752,16 @@ static partial void RegisterEnumStringResolvers()
             AddEnumStringResolver<IndexApiBlock>(GetStringValue);
             AddEnumStringResolver<IndicesShardStoresStatus>(GetStringValue);
             AddEnumStringResolver<IndicesStatsMetric>(GetStringValue);
+            AddEnumStringResolver<KnnDefaultOperator>(GetStringValue);
+            AddEnumStringResolver<KnnSearchType>(GetStringValue);
+            AddEnumStringResolver<KnnSuggestMode>(GetStringValue);
             AddEnumStringResolver<Level>(GetStringValue);
             AddEnumStringResolver<NodesInfoMetric>(GetStringValue);
             AddEnumStringResolver<NodesSampleType>(GetStringValue);
             AddEnumStringResolver<NodesStatsIndexMetric>(GetStringValue);
             AddEnumStringResolver<NodesStatsMetric>(GetStringValue);
             AddEnumStringResolver<NodesUsageMetric>(GetStringValue);
+            AddEnumStringResolver<NotificationsNotificationConfigType>(GetStringValue);
             AddEnumStringResolver<OpType>(GetStringValue);
             AddEnumStringResolver<Refresh>(GetStringValue);
             AddEnumStringResolver<SearchType>(GetStringValue);
@@ -900,6 +968,37 @@ public static string GetStringValue(this IndicesStatsMetric enumValue)
             return string.Join(",", list);
         }
 
+        public static string GetStringValue(this KnnDefaultOperator enumValue) =>
+            enumValue switch
+            {
+                KnnDefaultOperator.And => "AND",
+                KnnDefaultOperator.Or => "OR",
+                _ => throw new ArgumentException(
+                    $"'{enumValue.ToString()}' is not a valid value for enum 'KnnDefaultOperator'"
+                ),
+            };
+
+        public static string GetStringValue(this KnnSearchType enumValue) =>
+            enumValue switch
+            {
+                KnnSearchType.DfsQueryThenFetch => "dfs_query_then_fetch",
+                KnnSearchType.QueryThenFetch => "query_then_fetch",
+                _ => throw new ArgumentException(
+                    $"'{enumValue.ToString()}' is not a valid value for enum 'KnnSearchType'"
+                ),
+            };
+
+        public static string GetStringValue(this KnnSuggestMode enumValue) =>
+            enumValue switch
+            {
+                KnnSuggestMode.Always => "always",
+                KnnSuggestMode.Missing => "missing",
+                KnnSuggestMode.Popular => "popular",
+                _ => throw new ArgumentException(
+                    $"'{enumValue.ToString()}' is not a valid value for enum 'KnnSuggestMode'"
+                ),
+            };
+
         public static string GetStringValue(this Level enumValue) =>
             enumValue switch
             {
@@ -1068,6 +1167,23 @@ public static string GetStringValue(this NodesUsageMetric enumValue)
             return string.Join(",", list);
         }
 
+        public static string GetStringValue(this NotificationsNotificationConfigType enumValue) =>
+            enumValue switch
+            {
+                NotificationsNotificationConfigType.Chime => "chime",
+                NotificationsNotificationConfigType.Email => "email",
+                NotificationsNotificationConfigType.EmailGroup => "email_group",
+                NotificationsNotificationConfigType.MicrosoftTeams => "microsoft_teams",
+                NotificationsNotificationConfigType.SesAccount => "ses_account",
+                NotificationsNotificationConfigType.Slack => "slack",
+                NotificationsNotificationConfigType.SmtpAccount => "smtp_account",
+                NotificationsNotificationConfigType.Sns => "sns",
+                NotificationsNotificationConfigType.Webhook => "webhook",
+                _ => throw new ArgumentException(
+                    $"'{enumValue.ToString()}' is not a valid value for enum 'NotificationsNotificationConfigType'"
+                ),
+            };
+
         public static string GetStringValue(this OpType enumValue) =>
             enumValue switch
             {