Re-generate snapshot namespace (#351)

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Sep 5, 2023 · 077d705 · 077d705
1 parent 21a6c5f
commit 077d705
Show file tree

Hide file tree

Showing 27 changed files with 2,995 additions and 2,128 deletions.
diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs
@@ -42,6 +42,7 @@ public static class CodeConfiguration
 			// e.g. new Glob("nodes.*"),
 			new("dangling_indices.*"),
 			new("ingest.*"),
+			new("snapshot.*"),
 			new("tasks.*")
 		};
 

diff --git a/src/ApiGenerator/Domain/Specification/ApiEndpoint.cs b/src/ApiGenerator/Domain/Specification/ApiEndpoint.cs
@@ -103,17 +103,14 @@ public class ApiEndpoint
             HttpMethod = PreferredHttpMethod
         };
 
-        public string PreferredHttpMethod
-        {
-            get
+        public string PreferredHttpMethod =>
+            HttpMethods.OrderByDescending(m => m switch
             {
-                var first = HttpMethods.First();
-                if (HttpMethods.Count > 1 && first.ToUpperInvariant() == "GET")
-                    return HttpMethods.Last();
-
-                return first;
-            }
-        }
+                "GET" => 0,
+                "POST" => 1,
+                "PUT" or "DELETE" or "PATCH" or "HEAD" => 2, // Prefer "resource" methods over GET/POST methods
+                _ => -1
+            }).First();
 
         public string HighLevelMethodXmlDocDescription =>
             $"<c>{PreferredHttpMethod}</c> request to the <c>{Name}</c> API, read more about this API online:";

diff --git a/src/ApiGenerator/Generator/Razor/HighLevelClientImplementationGenerator.cs b/src/ApiGenerator/Generator/Razor/HighLevelClientImplementationGenerator.cs
@@ -44,7 +44,7 @@ public class HighLevelClientImplementationGenerator : RazorGeneratorBase
         public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
         {
 			var view = ViewLocations.HighLevel("Client", "Implementation", "OpenSearchClient.cshtml");
-            var target = GeneratorLocations.HighLevel($"OpenSearchClient.{CsharpNames.RootNamespace}.cs");
+            var target = GeneratorLocations.HighLevel($"OpenSearchClient.cs");
             await DoRazor(spec, view, target, token);
 
             string Target(string id) => GeneratorLocations.HighLevel($"OpenSearchClient.{id}.cs");

diff --git a/src/ApiGenerator/Generator/Razor/LowLevelClientImplementationGenerator.cs b/src/ApiGenerator/Generator/Razor/LowLevelClientImplementationGenerator.cs
@@ -44,7 +44,7 @@ public class LowLevelClientImplementationGenerator : RazorGeneratorBase
         public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
         {
 			var view = ViewLocations.LowLevel("Client", "Implementation", "OpenSearchLowLevelClient.cshtml");
-            var target = GeneratorLocations.LowLevel($"OpenSearchLowLevelClient.{CsharpNames.RootNamespace}.cs");
+            var target = GeneratorLocations.LowLevel("OpenSearchLowLevelClient.cs");
             await DoRazor(spec, view, target, token);
 
             var namespaced = spec.EndpointsPerNamespaceLowLevel.Where(kv => kv.Key != CsharpNames.RootNamespace).ToList();

diff --git a/src/OpenSearch.Client/ApiUrlsLookup.cs b/src/OpenSearch.Client/ApiUrlsLookup.cs
@@ -153,17 +153,6 @@ internal static partial class ApiUrlsLookups
 		internal static ApiUrls NoNamespaceSearch = new ApiUrls(new[]{"_search", "{index}/_search"});
 		internal static ApiUrls NoNamespaceSearchShards = new ApiUrls(new[]{"_search_shards", "{index}/_search_shards"});
 		internal static ApiUrls NoNamespaceSearchTemplate = new ApiUrls(new[]{"_search/template", "{index}/_search/template"});
-		internal static ApiUrls SnapshotCleanupRepository = new ApiUrls(new[]{"_snapshot/{repository}/_cleanup"});
-		internal static ApiUrls SnapshotClone = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}/_clone/{target_snapshot}"});
-		internal static ApiUrls SnapshotSnapshot = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}"});
-		internal static ApiUrls SnapshotCreateRepository = new ApiUrls(new[]{"_snapshot/{repository}"});
-		internal static ApiUrls SnapshotDelete = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}"});
-		internal static ApiUrls SnapshotDeleteRepository = new ApiUrls(new[]{"_snapshot/{repository}"});
-		internal static ApiUrls SnapshotGet = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}"});
-		internal static ApiUrls SnapshotGetRepository = new ApiUrls(new[]{"_snapshot", "_snapshot/{repository}"});
-		internal static ApiUrls SnapshotRestore = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}/_restore"});
-		internal static ApiUrls SnapshotStatus = new ApiUrls(new[]{"_snapshot/_status", "_snapshot/{repository}/_status", "_snapshot/{repository}/{snapshot}/_status"});
-		internal static ApiUrls SnapshotVerifyRepository = new ApiUrls(new[]{"_snapshot/{repository}/_verify"});
 		internal static ApiUrls NoNamespaceTermVectors = new ApiUrls(new[]{"{index}/_termvectors/{id}", "{index}/_termvectors"});
 		internal static ApiUrls NoNamespaceUpdate = new ApiUrls(new[]{"{index}/_update/{id}"});
 		internal static ApiUrls NoNamespaceUpdateByQuery = new ApiUrls(new[]{"{index}/_update_by_query"});

diff --git a/src/OpenSearch.Client/Descriptors.Snapshot.cs b/src/OpenSearch.Client/Descriptors.Snapshot.cs
diff --git a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs
@@ -1024,11 +1024,5 @@ Task<UpdateByQueryResponse> UpdateByQueryAsync<TDocument>(Func<UpdateByQueryDesc
 		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/update-by-query/">https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/update-by-query/</a>
 		/// </summary>
 		Task<ListTasksResponse> UpdateByQueryRethrottleAsync(IUpdateByQueryRethrottleRequest request, CancellationToken ct = default);
-
-		///<summary>Snapshot APIs</summary>
-		SnapshotNamespace Snapshot
-		{
-			get;
-		}
 	}
 }
diff --git a/src/OpenSearch.Client/OpenSearch.Client.csproj b/src/OpenSearch.Client/OpenSearch.Client.csproj
@@ -49,5 +49,9 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>OpenSearchClient.cs</DependentUpon>
     </Compile>
+    <Compile Update="_Generated\OpenSearchClient.*.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>OpenSearchClient.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs
@@ -91,20 +91,12 @@ public NodesNamespace Nodes
 			private set;
 		}
 
-		///<summary>Snapshot APIs</summary>
-		public SnapshotNamespace Snapshot
-		{
-			get;
-			private set;
-		}
-
 		partial void SetupNamespaces()
 		{
 			Cat = new CatNamespace(this);
 			Cluster = new ClusterNamespace(this);
 			Indices = new IndicesNamespace(this);
 			Nodes = new NodesNamespace(this);
-			Snapshot = new SnapshotNamespace(this);
 		}
 
 		/// <summary>