Merge pull request #27 from microsoft/alzollin/certCommandFixes

Small fixes for cert command handling.

Author: azchohfi

src/winsdk-CLI/Winsdk.Cli/Commands/CertGenerateCommand.cs

@@ -12,6 +12,14 @@ internal class CertGenerateCommand : Command
     public static Option<string> PasswordOption { get; }
     public static Option<int> ValidDaysOption { get; }
     public static Option<bool> InstallOption { get; }
+    public static Option<IfExists> IfExistsOption { get; }
+
+    internal enum IfExists
+    {
+        Error,
+        Overwrite,
+        Skip
+    }
 
     static CertGenerateCommand()
     {
@@ -45,6 +53,11 @@ static CertGenerateCommand()
             Description = "Install the certificate to the local machine store after generation",
             DefaultValueFactory = (argumentResult) => false,
         };
+        IfExistsOption = new Option<IfExists> ("--if-exists")
+        {
+            Description = "Skip generation if the certificate file already exists",
+            DefaultValueFactory = (argumentResult) => IfExists.Error,
+        };
     }
 
     public CertGenerateCommand()
@@ -56,7 +69,7 @@ public CertGenerateCommand()
         Options.Add(PasswordOption);
         Options.Add(ValidDaysOption);
         Options.Add(InstallOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
+        Options.Add(IfExistsOption);
     }
 
     public class Handler(ICertificateService certificateService) : AsynchronousCommandLineAction
@@ -69,14 +82,26 @@ public override async Task<int> InvokeAsync(ParseResult parseResult, Cancellatio
             var password = parseResult.GetRequiredValue(PasswordOption);
             var validDays = parseResult.GetRequiredValue(ValidDaysOption);
             var install = parseResult.GetRequiredValue(InstallOption);
+            var ifExists = parseResult.GetRequiredValue(IfExistsOption);
             var verbose = parseResult.GetValue(WinSdkRootCommand.VerboseOption);
 
             // Check if certificate file already exists
             if (File.Exists(output))
             {
                 Console.Error.WriteLine($"❌ Certificate file already exists: {output}");
-                Console.Error.WriteLine("Please specify a different output path or remove the existing file.");
-                return 1;
+                if (ifExists == IfExists.Error)
+                {
+                    Console.Error.WriteLine("Please specify a different output path or remove the existing file.");
+                    return 1;
+                }
+                else if (ifExists == IfExists.Skip)
+                {
+                    return 0;
+                }
+                else if (ifExists == IfExists.Overwrite)
+                {
+                    Console.WriteLine($"⚠️ Overwriting existing certificate file: {output}");
+                }
             }
 
             // Use the consolidated certificate generation method with all console output and error handling
@@ -86,7 +111,7 @@ await certificateService.GenerateDevCertificateWithInferenceAsync(
                 manifestPath: manifestPath,
                 password: password,
                 validDays: validDays,
-                skipIfExists: false, // We already checked above
+                skipIfExists: false,
                 updateGitignore: true,
                 install: install,
                 quiet: false,

src/winsdk-CLI/Winsdk.Cli/Commands/CertInstallCommand.cs

@@ -34,7 +34,6 @@ public CertInstallCommand()
         Arguments.Add(CertPathArgument);
         Options.Add(PasswordOption);
         Options.Add(ForceOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(ICertificateService certificateService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/CreateDebugIdentityCommand.cs

@@ -38,7 +38,6 @@ static CreateDebugIdentityCommand()
         Options.Add(ManifestOption);
         Options.Add(NoInstallOption);
         Options.Add(LocationOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IMsixService msixService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/GetWinsdkPathCommand.cs

@@ -19,7 +19,6 @@ static GetWinsdkPathCommand()
     public GetWinsdkPathCommand() : base("get-winsdk-path", "Get the path to the .winsdk directory (local by default, global with --global)")
     {
         Options.Add(GlobalOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IWinsdkDirectoryService winsdkDirectoryService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/InitCommand.cs

@@ -69,7 +69,6 @@ static InitCommand()
         Options.Add(YesOption);
         Options.Add(NoCertOption);
         Options.Add(ConfigOnlyOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IWorkspaceSetupService workspaceSetupService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/ManifestGenerateCommand.cs

@@ -79,7 +79,6 @@ public ManifestGenerateCommand() : base("generate", "Generate a manifest in dire
         Options.Add(SparseOption);
         Options.Add(LogoPathOption);
         Options.Add(YesOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IManifestService manifestService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/PackageCommand.cs

@@ -83,7 +83,6 @@ public PackageCommand()
         Options.Add(PublisherOption);
         Options.Add(ManifestOption);
         Options.Add(SelfContainedOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IMsixService msixService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/RestoreCommand.cs

@@ -35,7 +35,6 @@ public RestoreCommand() : base("restore", "Restore packages from winsdk.yaml and
         Arguments.Add(BaseDirectoryArgument);
         Options.Add(ConfigDirOption);
         Options.Add(QuietOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(IWorkspaceSetupService workspaceSetupService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/SignCommand.cs

@@ -38,7 +38,6 @@ public SignCommand() : base("sign", "Sign a file/package with a certificate")
         Arguments.Add(CertPathArgument);
         Options.Add(PasswordOption);
         Options.Add(TimestampOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(ICertificateService certificateService) : AsynchronousCommandLineAction

src/winsdk-CLI/Winsdk.Cli/Commands/UpdateCommand.cs

@@ -21,7 +21,6 @@ static UpdateCommand()
     public UpdateCommand() : base("update", "Update packages in winsdk.yaml and install/update build tools in cache")
     {
         Options.Add(PrereleaseOption);
-        Options.Add(WinSdkRootCommand.VerboseOption);
     }
 
     public class Handler(