cli: Fix some init command mistakes.

tryAGI · Sep 23, 2024 · 57510e7 · 57510e7
1 parent b5b9408
commit 57510e7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/src/libs/AutoSDK.CLI/Commands/InitializeCommand.cs b/src/libs/AutoSDK.CLI/Commands/InitializeCommand.cs
@@ -11,8 +11,8 @@ public class InitializeCommand : Command
             name: "solution-name",
             getDefaultValue: () => string.Empty,
             description: "Solution name");
-        var apiName = new Argument<string>(
-            name: "api-name",
+        var clientName = new Argument<string>(
+            name: "client-name",
             getDefaultValue: () => string.Empty,
             description: "API client name");
         var openApiSpec = new Argument<string>(
@@ -36,7 +36,7 @@ public class InitializeCommand : Command
             getDefaultValue: () => true,
             description: "Adds integration tests to the solution");
         AddArgument(solutionName);
-        AddArgument(apiName);
+        AddArgument(clientName);
         AddArgument(openApiSpec);
         AddArgument(company);
         AddOption(output);
@@ -46,7 +46,7 @@ public class InitializeCommand : Command
         this.SetHandler(
             HandleAsync,
             solutionName,
-            apiName,
+            clientName,
             openApiSpec,
             company,
             output,
@@ -56,7 +56,7 @@ public class InitializeCommand : Command
 
     private static async Task HandleAsync(
         string solutionName,
-        string apiName,
+        string clientName,
         string openApiSpec,
         string company,
         string outputPath,
@@ -172,7 +172,7 @@ string Replace(string content)
 
             newContent = newContent
                 .Replace("$SolutionName$", solutionName, StringComparison.OrdinalIgnoreCase)
-                .Replace("$ApiName$", apiName, StringComparison.OrdinalIgnoreCase)
+                .Replace("$ClientName$", clientName, StringComparison.OrdinalIgnoreCase)
                 .Replace("$OpenApiSpec$", openApiSpec, StringComparison.OrdinalIgnoreCase)
                 .Replace("$CurrentYear$", DateTime.Now.Year.ToString(CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase)
                 .Replace("$CompanyName$", company, StringComparison.OrdinalIgnoreCase)

diff --git a/src/libs/AutoSDK.CLI/Resources/README.md b/src/libs/AutoSDK.CLI/Resources/README.md
@@ -16,7 +16,7 @@
 ```csharp
 using $SolutionName$;
 
-using var api = new $ApiName$(apiKey);
+using var client = new $ClientName$(apiKey);
 ```
 
 ## Support

diff --git a/src/libs/AutoSDK.CLI/Resources/src_helpers_FixOpenApiSpec_Program.cs b/src/libs/AutoSDK.CLI/Resources/src_helpers_FixOpenApiSpec_Program.cs
@@ -9,6 +9,7 @@
 
 text = text
         .Replace("openapi: 3.1.0", "openapi: 3.0.1")
+        .Replace("\"openapi\":\"3.1.0\"", "\"openapi\":\"3.0.1\"")
     ;
 
 var openApiDocument = new OpenApiStringReader().Read(text, out var diagnostics);

diff --git a/src/libs/AutoSDK.CLI/Resources/src_helpers_GenerateDocs_Program.cs b/src/libs/AutoSDK.CLI/Resources/src_helpers_GenerateDocs_Program.cs
@@ -26,8 +26,8 @@
 
     code = code
         .Replace(
-            "using var api = GetAuthenticatedApi();",
-            "using var api = new $ApiName$(apiKey);")
+            "using var client = GetAuthenticatedClient();",
+            "using var client = new $ClientName$(apiKey);")
         ;
 
     var newPath = Path.Combine(newDir, $"{Path.GetExtension(Path.GetFileNameWithoutExtension(path)).TrimStart('.')}.md");

diff --git a/src/libs/AutoSDK.CLI/Resources/src_libs_$SolutionName$_$SolutionName$.csproj b/src/libs/AutoSDK.CLI/Resources/src_libs_$SolutionName$_$SolutionName$.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Description>Generated C# SDK based on $SolutionName$ OpenAPI specification.</Description>
+    <Description>C# SDK based on $SolutionName$ OpenAPI specification.</Description>
     <PackageTags>api;client;sdk;dotnet;swagger;openapi;specification;generated;nswag</PackageTags>
   </PropertyGroup>
 

diff --git a/src/libs/AutoSDK.CLI/Resources/src_libs_$SolutionName$_generate.sh b/src/libs/AutoSDK.CLI/Resources/src_libs_$SolutionName$_generate.sh
@@ -8,7 +8,7 @@ if [ $? -ne 0 ]; then
 fi
 autosdk generate openapi.yaml \
   --namespace $SolutionName$ \
-  --clientClassName $ApiName$ \
+  --clientClassName $ClientName$ \
   --targetFramework net8.0 \
   --output Generated \
   --exclude-deprecated-operations
diff --git a/src/libs/AutoSDK.CLI/Resources/src_tests_IntegrationTests_Tests.Test.cs b/src/libs/AutoSDK.CLI/Resources/src_tests_IntegrationTests_Tests.Test.cs
@@ -5,6 +5,6 @@ public partial class Tests
     [TestMethod]
     public async Task Generate()
     {
-        using var api = GetAuthenticatedApi();
+        using var client = GetAuthenticatedClient();
     }
 }
diff --git a/src/libs/AutoSDK.CLI/Resources/src_tests_IntegrationTests_Tests.cs b/src/libs/AutoSDK.CLI/Resources/src_tests_IntegrationTests_Tests.cs
@@ -3,15 +3,14 @@ namespace $SolutionName$.IntegrationTests;
 [TestClass]
 public partial class Tests
 {
-    [TestMethod]
-    public $ApiName$ GetAuthenticatedApi()
+    private static $ClientName$ GetAuthenticatedClient()
     {
         var apiKey =
             Environment.GetEnvironmentVariable("$SolutionNameUppercase$_API_KEY") ??
             throw new AssertInconclusiveException("$SolutionNameUppercase$_API_KEY environment variable is not found.");
 
-        var api = new $ApiName$(apiKey);
+        var client = new $ClientName$(apiKey);
 
-        return api;
+        return client;
     }
 }