Re-generate tasks namespace (#320)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Aug 22, 2023 · 65ac116 · 65ac116
1 parent 610eab2
commit 65ac116
Show file tree

Hide file tree

Showing 31 changed files with 13,325 additions and 10,542 deletions.
diff --git a/src/ApiGenerator/ApiGenerator.csproj b/src/ApiGenerator/ApiGenerator.csproj
@@ -9,8 +9,8 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="CSharpier.Core" Version="0.25.0" />
     <PackageReference Include="Glob" Version="1.1.9" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NSwag.Core.Yaml" Version="13.19.0" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />

diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs
@@ -40,6 +40,7 @@ public static class CodeConfiguration
 		private static readonly Glob[] OperationsToInclude =
 		{
 			// e.g. new Glob("nodes.*"),
+			new("tasks.*")
 		};
 
 		public static bool IncludeOperation(string name) => OperationsToInclude.Any(g => g.IsMatch(name));

diff --git a/src/ApiGenerator/Generator/Razor/RazorGeneratorBase.cs b/src/ApiGenerator/Generator/Razor/RazorGeneratorBase.cs
@@ -31,10 +31,8 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
+using CSharpier;
 using RazorLight;
 using RazorLight.Generation;
 using RazorLight.Razor;
@@ -51,13 +49,13 @@ public abstract class RazorGeneratorBase
 			.EnableDebugMode()
             .Build();
 
-        protected async Task DoRazor<TModel>(TModel model, string viewLocation, string targetLocation, CancellationToken token)
+        protected static async Task DoRazor<TModel>(TModel model, string viewLocation, string targetLocation, CancellationToken token)
         {
             try
             {
                 token.ThrowIfCancellationRequested();
                 var generated = await Engine.CompileRenderAsync(viewLocation,  model);
-                WriteFormattedCsharpFile(targetLocation, generated);
+                await WriteFormattedCsharpFile(targetLocation, generated);
             }
             catch (TemplateGenerationException e)
             {
@@ -71,32 +69,28 @@ protected async Task DoRazorDependantFiles<TModel>(
             Func<TModel, string> identifier, Func<string, string> target,
             CancellationToken token
             )
-        {
-            using (var c = pbar.Spawn(items.Count, "Generating namespaces", new ProgressBarOptions
-            {
-                ProgressCharacter = '─',
-                ForegroundColor = ConsoleColor.Yellow
-            }))
-            {
-                foreach (var item in items)
-                {
-                    var id = identifier(item);
-                    var targetLocation = target(id);
-                    await DoRazor(item, viewLocation, targetLocation, token);
-                    c.Tick($"{Title}: {id}");
-                }
-            }
-        }
+		{
+			using var c = pbar.Spawn(items.Count, "Generating namespaces", new ProgressBarOptions
+			{
+				ProgressCharacter = '─',
+				ForegroundColor = ConsoleColor.Yellow
+			});
+			foreach (var item in items)
+			{
+				var id = identifier(item);
+				var targetLocation = target(id);
+				await DoRazor(item, viewLocation, targetLocation, token);
+				c.Tick($"{Title}: {id}");
+			}
+		}
 
-        protected static void WriteFormattedCsharpFile(string path, string contents)
+        private static async Task WriteFormattedCsharpFile(string path, string contents)
         {
-            var tree = CSharpSyntaxTree.ParseText(contents);
-            var root = tree.GetRoot().NormalizeWhitespace(indentation:"\t", "\n");
-            contents = root.ToFullString();
+			contents = (await CodeFormatter.FormatAsync(contents)).Code;
 
 			if (Directory.GetParent(path) is { Exists: false } dir) dir.Create();
 
-			File.WriteAllText(path, contents);
+			await File.WriteAllTextAsync(path, contents);
         }
 
         public abstract string Title { get; }

diff --git a/src/ApiGenerator/OpenSearch.openapi.json b/src/ApiGenerator/OpenSearch.openapi.json
diff --git a/src/ApiGenerator/Views/HighLevel/Client/Implementation/OpenSearchClient.Namespace.cshtml b/src/ApiGenerator/Views/HighLevel/Client/Implementation/OpenSearchClient.Namespace.cshtml
@@ -24,7 +24,7 @@ namespace OpenSearch.Client.@(CsharpNames.ApiNamespace).@ns@(CsharpNames.ApiName
     /// on <see cref="IOpenSearchClient"/>.
     ///</para>
     ///</summary>
-    public class @(CsharpNames.HighLevelClientNamespacePrefix)@ns@(CsharpNames.ClientNamespaceSuffix) : NamespacedClientProxy
+    public partial class @(CsharpNames.HighLevelClientNamespacePrefix)@ns@(CsharpNames.ClientNamespaceSuffix) : NamespacedClientProxy
     {
         internal @(CsharpNames.HighLevelClientNamespacePrefix)@ns@(CsharpNames.ClientNamespaceSuffix)(OpenSearchClient client) : base(client) {}
         @foreach(var e in endpoints)

diff --git a/src/ApiGenerator/Views/HighLevel/Descriptors/Descriptors.cshtml b/src/ApiGenerator/Views/HighLevel/Descriptors/Descriptors.cshtml
@@ -27,7 +27,7 @@ using OpenSearch.Net.Utf8Json;
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client@(ns)
 {
 @foreach (var endpoint in endpoints)
 {

diff --git a/src/ApiGenerator/Views/HighLevel/Requests/Requests.cshtml b/src/ApiGenerator/Views/HighLevel/Requests/Requests.cshtml
@@ -27,7 +27,7 @@ using OpenSearch.Net.Utf8Json;
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client@(ns)
 {
 @foreach (var endpoint in endpoints)
 {

diff --git a/src/OpenSearch.Client/ApiUrlsLookup.cs b/src/OpenSearch.Client/ApiUrlsLookup.cs
@@ -172,9 +172,6 @@ internal static partial class ApiUrlsLookups
 		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 TasksCancel = new ApiUrls(new[]{"_tasks/_cancel", "_tasks/{task_id}/_cancel"});
-		internal static ApiUrls TasksGetTask = new ApiUrls(new[]{"_tasks/{task_id}"});
-		internal static ApiUrls TasksList = new ApiUrls(new[]{"_tasks"});
 		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.Tasks.cs b/src/OpenSearch.Client/Descriptors.Tasks.cs
diff --git a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs
@@ -1042,11 +1042,5 @@ SnapshotNamespace Snapshot
 		{
 			get;
 		}
-
-		///<summary>Tasks APIs</summary>
-		TasksNamespace Tasks
-		{
-			get;
-		}
 	}
 }
diff --git a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs
@@ -112,13 +112,6 @@ public SnapshotNamespace Snapshot
 			private set;
 		}
 
-		///<summary>Tasks APIs</summary>
-		public TasksNamespace Tasks
-		{
-			get;
-			private set;
-		}
-
 		partial void SetupNamespaces()
 		{
 			Cat = new CatNamespace(this);
@@ -128,7 +121,6 @@ partial void SetupNamespaces()
 			Ingest = new IngestNamespace(this);
 			Nodes = new NodesNamespace(this);
 			Snapshot = new SnapshotNamespace(this);
-			Tasks = new TasksNamespace(this);
 		}
 
 		/// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -1042,11 +1042,5 @@ SnapshotNamespace Snapshot @@
     		{
     			get;
     		}
-    		///<summary>Tasks APIs</summary>
-    		TasksNamespace Tasks
-    		{
-    			get;
-    		}
     	}
     }