Add --legacy-v1-archive option

tobias-tengler · tobias-tengler · commit 1a0a26c94007 · 2026-04-07T15:31:28.000+02:00
diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionComposeCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionComposeCommand.cs
@@ -16,6 +16,7 @@ public FusionComposeCommand() : base("compose")
 
         Options.Add(Opt<OptionalSourceSchemaFileListOption>.Instance);
         Options.Add(Opt<OptionalFusionArchiveFileOption>.Instance);
+        Options.Add(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         Options.Add(Opt<FusionEnvironmentOption>.Instance);
         Options.Add(Opt<EnableGlobalObjectIdentificationOption>.Instance);
         Options.Add(Opt<IncludeSatisfiabilityPathsOption>.Instance);
@@ -57,6 +58,8 @@ private static async Task<int> ExecuteAsync(
             Opt<IncludeSatisfiabilityPathsOption>.Instance);
         var watchMode = parseResult.GetValue(Opt<WatchModeOption>.Instance);
         var tagsToExclude = parseResult.GetValue(Opt<OptionalExcludeTagListOption>.Instance);
+        var legacyArchiveFile =
+            parseResult.GetValue(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         archiveFile ??= workingDirectory;
 
         if (fileSystem.DirectoryExists(archiveFile))
@@ -68,6 +71,19 @@ private static async Task<int> ExecuteAsync(
             archiveFile = Path.Combine(workingDirectory, archiveFile);
         }
 
+        if (legacyArchiveFile is not null)
+        {
+            if (!Path.IsPathRooted(legacyArchiveFile))
+            {
+                legacyArchiveFile = Path.Combine(workingDirectory, legacyArchiveFile);
+            }
+
+            if (!fileSystem.FileExists(legacyArchiveFile))
+            {
+                throw new ExitException(Messages.LegacyArchiveFileDoesNotExist(legacyArchiveFile));
+            }
+        }
+
         if (sourceSchemaFiles.Count == 0)
         {
             sourceSchemaFiles.AddRange(
diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionPublishCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionPublishCommand.cs
@@ -38,6 +38,7 @@ public FusionPublishCommand() : base("publish")
         Options.Add(Opt<OptionalSourceSchemaIdentifierListOption>.Instance);
         Options.Add(Opt<OptionalSourceSchemaFileListOption>.Instance);
         Options.Add(Opt<OptionalFusionArchiveFileOption>.Instance);
+        Options.Add(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         Options.Add(Opt<OptionalForceOption>.Instance);
         Options.Add(Opt<OptionalWaitForApprovalOption>.Instance);
         Options.Add(Opt<WorkingDirectoryOption>.Instance);
@@ -90,6 +91,8 @@ private static async Task<int> ExecuteAsync(
             parseResult.GetValue(Opt<OptionalSourceSchemaIdentifierListOption>.Instance) ?? [];
         var archiveFile =
             parseResult.GetValue(Opt<OptionalFusionArchiveFileOption>.Instance);
+        var legacyArchiveFile =
+            parseResult.GetValue(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         var force = parseResult.GetValue(Opt<OptionalForceOption>.Instance);
         var waitForApproval = parseResult.GetValue(Opt<OptionalWaitForApprovalOption>.Instance);
         var stageName = parseResult.GetRequiredValue(Opt<StageNameOption>.Instance);
@@ -121,9 +124,29 @@ archiveFile is not null
 
         if (archiveFile is not null)
         {
+            if (legacyArchiveFile is not null)
+            {
+                throw new ExitException(
+                    $"The options '{FusionArchiveFileOption.OptionName}' and '{OptionalLegacyFusionArchiveFileOption.OptionName}' are mutually exclusive.");
+            }
+
             return await PublishFusionConfigurationWithArchiveAsync();
         }
-        else if (sourceSchemaFiles.Count > 0)
+
+        if (legacyArchiveFile is not null)
+        {
+            if (!Path.IsPathRooted(legacyArchiveFile))
+            {
+                legacyArchiveFile = Path.Combine(workingDirectory, legacyArchiveFile);
+            }
+
+            if (!fileSystem.FileExists(legacyArchiveFile))
+            {
+                throw new ExitException(Messages.LegacyArchiveFileDoesNotExist(legacyArchiveFile));
+            }
+        }
+
+        if (sourceSchemaFiles.Count > 0)
         {
             return await PublishFusionConfigurationWithSourceSchemaFilesAsync();
         }
diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionValidateCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionValidateCommand.cs
@@ -27,6 +27,7 @@ public FusionValidateCommand() : base("validate")
         Options.Add(Opt<ApiIdOption>.Instance);
         Options.Add(Opt<StageNameOption>.Instance);
         Options.Add(Opt<OptionalFusionArchiveFileOption>.Instance);
+        Options.Add(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         Options.Add(Opt<OptionalSourceSchemaFileListOption>.Instance);
         this.AddGlobalNitroOptions();
 
@@ -58,6 +59,7 @@ private static async Task<int> ExecuteAsync(
         var stageName = parseResult.GetRequiredValue(Opt<StageNameOption>.Instance);
         var apiId = parseResult.GetRequiredValue(Opt<ApiIdOption>.Instance);
         var archiveFile = parseResult.GetValue(Opt<OptionalFusionArchiveFileOption>.Instance);
+        var legacyArchiveFile = parseResult.GetValue(Opt<OptionalLegacyFusionArchiveFileOption>.Instance);
         var sourceSchemaFiles =
             parseResult.GetValue(Opt<OptionalSourceSchemaFileListOption>.Instance) ?? [];
 
@@ -80,10 +82,29 @@ archiveFile is not null
 
         if (archiveFile is not null)
         {
+            if (legacyArchiveFile is not null)
+            {
+                throw new ExitException(
+                    $"The options '{FusionArchiveFileOption.OptionName}' and '{OptionalLegacyFusionArchiveFileOption.OptionName}' are mutually exclusive.");
+            }
+
             return await ValidateWithArchive();
         }
         else
         {
+            if (legacyArchiveFile is not null)
+            {
+                if (!Path.IsPathRooted(legacyArchiveFile))
+                {
+                    legacyArchiveFile = Path.Combine(fileSystem.GetCurrentDirectory(), legacyArchiveFile);
+                }
+
+                if (!fileSystem.FileExists(legacyArchiveFile))
+                {
+                    throw new ExitException(Messages.LegacyArchiveFileDoesNotExist(legacyArchiveFile));
+                }
+            }
+
             return await ValidateWithSourceSchemaFiles();
         }
 
diff --git a/src/Nitro/CommandLine/src/CommandLine/Messages.cs b/src/Nitro/CommandLine/src/CommandLine/Messages.cs
@@ -21,6 +21,8 @@ public static string UnexpectedMutationError(IError error)
 
     public static string ArchiveFileDoesNotExist(string path) => $"Archive file '{path}' does not exist.";
 
+    public static string LegacyArchiveFileDoesNotExist(string path) => $"Legacy archive file '{path}' does not exist.";
+
     public static string OperationsFileDoesNotExist(string path) => $"Operations file '{path}' does not exist.";
 
     public static string ExtensionFileDoesNotExist(string path) => $"Extension file '{path}' does not exist.";
diff --git a/src/Nitro/CommandLine/src/CommandLine/Options/OptionalLegacyFusionArchiveOption.cs b/src/Nitro/CommandLine/src/CommandLine/Options/OptionalLegacyFusionArchiveOption.cs
@@ -0,0 +1,14 @@
+namespace ChilliCream.Nitro.CommandLine;
+
+internal class OptionalLegacyFusionArchiveFileOption : Option<string>
+{
+    public const string OptionName = "--legacy-v1-archive";
+
+    public OptionalLegacyFusionArchiveFileOption() : base(OptionName)
+    {
+        Description = "The path to a Fusion v1 archive file. "
+            + "This option is only intended to be used during the migration from Fusion v1 to Fusion v2+.";
+        Required = false;
+        this.LegalFilePathsOnly();
+    }
+}
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionCommandTestBase.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionCommandTestBase.cs
@@ -15,6 +15,7 @@ namespace ChilliCream.Nitro.CommandLine.Tests.Commands.Fusion;
 public abstract class FusionCommandTestBase(NitroCommandFixture fixture) : SchemasCommandTestBase(fixture)
 {
     protected const string ArchiveFile = "fusion.far";
+    protected const string LegacyArchiveFile = "fusion-v1.fgp";
     protected const string SourceSchemaFile = "products/schema.graphqls";
     protected const string SourceSchemaSettingsFile = "products/schema-settings.json";
     protected const string SourceSchema = "products";
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionComposeCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionComposeCommandTests.cs
@@ -41,6 +41,7 @@ nitro fusion compose [options]
             Options:
               -f, --source-schema-file <source-schema-file>  One or more paths to a source schema file (.graphqls) or directory containing a source schema file
               -a, --archive, --configuration <archive>       The path to a Fusion archive file (the '--configuration' alias is deprecated) [env: NITRO_FUSION_CONFIG_FILE]
+              --legacy-v1-archive <legacy-v1-archive>        The path to a Fusion v1 archive file. This option is only intended to be used during the migration from Fusion v1 to Fusion v2+.
               -e, --env, --environment <environment>         The name of the environment used for value substitution in the schema-settings.json files
               --enable-global-object-identification          Add the 'Query.node' field for global object identification
               --include-satisfiability-paths                 Include paths in satisfiability error messages
@@ -315,6 +316,31 @@ public async Task Compose_ValidExample1_FromSpecified_ToFileInNewDirectory()
         Assert.True(File.Exists(archiveFileName));
     }
 
+    [Fact]
+    public async Task Compose_WithLegacyArchive_FileDoesNotExist_ReturnsError()
+    {
+        // arrange
+        var archiveFileName = CreateTempFile();
+
+        // act
+        var result = await ExecuteCommandAsync(
+            "fusion",
+            "compose",
+            "--source-schema-file",
+            Path.Combine(s_resourcesDir, "valid-example-1/source-schema-1.graphqls"),
+            "--archive",
+            archiveFileName,
+            "--legacy-v1-archive",
+            LegacyArchiveFile);
+
+        // assert
+        result.StdErr.MatchInlineSnapshot(
+            """
+            Legacy archive file '/some/working/directory/fusion-v1.fgp' does not exist.
+            """);
+        Assert.Equal(1, result.ExitCode);
+    }
+
     [Fact]
     public async Task Compose_FromNonExistentFiles()
     {
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionPublishCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionPublishCommandTests.cs
@@ -27,6 +27,7 @@ nitro fusion publish [command] [options]
               -s, --source-schema <source-schema>            One or more source schemas that should be included in the composition. Source schemas can either be just a name ('example') or a name and a version ('example@1.0.0'). If no version is specified the value of the '--tag' option is taken as the source schema version.
               -f, --source-schema-file <source-schema-file>  One or more paths to a source schema file (.graphqls) or directory containing a source schema file
               -a, --archive, --configuration <archive>       The path to a Fusion archive file (the '--configuration' alias is deprecated) [env: NITRO_FUSION_CONFIG_FILE]
+              --legacy-v1-archive <legacy-v1-archive>        The path to a Fusion v1 archive file. This option is only intended to be used during the migration from Fusion v1 to Fusion v2+.
               --force                                        Skip confirmation prompts for deletes and overwrites
               --wait-for-approval                            Wait for the deployment to be approved before completing [env: NITRO_WAIT_FOR_APPROVAL]
               -w, --working-directory <working-directory>    Set the working directory for the command
@@ -172,6 +173,70 @@ public async Task Archive_And_SourceSchemaFile_And_SourceSchema_ReturnsError(Int
         Assert.Equal(1, result.ExitCode);
     }
 
+    [Theory]
+    [InlineData(InteractionMode.Interactive)]
+    [InlineData(InteractionMode.NonInteractive)]
+    [InlineData(InteractionMode.JsonOutput)]
+    public async Task Archive_And_LegacyArchive_ReturnsError(InteractionMode mode)
+    {
+        // arrange
+        SetupInteractionMode(mode);
+
+        // act
+        var result = await ExecuteCommandAsync(
+            "fusion",
+            "publish",
+            "--api-id",
+            ApiId,
+            "--stage",
+            Stage,
+            "--tag",
+            Tag,
+            "--archive",
+            ArchiveFile,
+            "--legacy-v1-archive",
+            LegacyArchiveFile);
+
+        // assert
+        result.StdErr.MatchInlineSnapshot(
+            """
+            The options '--archive' and '--legacy-v1-archive' are mutually exclusive.
+            """);
+        Assert.Equal(1, result.ExitCode);
+    }
+
+    [Theory]
+    [InlineData(InteractionMode.Interactive)]
+    [InlineData(InteractionMode.NonInteractive)]
+    [InlineData(InteractionMode.JsonOutput)]
+    public async Task WithLegacyArchive_FileDoesNotExist_ReturnsError(InteractionMode mode)
+    {
+        // arrange
+        SetupInteractionMode(mode);
+
+        // act
+        var result = await ExecuteCommandAsync(
+            "fusion",
+            "publish",
+            "--api-id",
+            ApiId,
+            "--stage",
+            Stage,
+            "--tag",
+            Tag,
+            "--source-schema",
+            SourceSchema,
+            "--legacy-v1-archive",
+            LegacyArchiveFile);
+
+        // assert
+        result.StdErr.MatchInlineSnapshot(
+            """
+            Legacy archive file '/some/working/directory/fusion-v1.fgp' does not exist.
+            """);
+        Assert.Equal(1, result.ExitCode);
+    }
+
     [Theory]
     [InlineData(InteractionMode.Interactive)]
     [InlineData(InteractionMode.NonInteractive)]
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionValidateCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionValidateCommandTests.cs
@@ -24,6 +24,7 @@ nitro fusion validate [options]
               --api-id <api-id> (REQUIRED)                   The ID of the API [env: NITRO_API_ID]
               --stage <stage> (REQUIRED)                     The name of the stage [env: NITRO_STAGE]
               -a, --archive, --configuration <archive>       The path to a Fusion archive file (the '--configuration' alias is deprecated) [env: NITRO_FUSION_CONFIG_FILE]
+              --legacy-v1-archive <legacy-v1-archive>        The path to a Fusion v1 archive file. This option is only intended to be used during the migration from Fusion v1 to Fusion v2+.
               -f, --source-schema-file <source-schema-file>  One or more paths to a source schema file (.graphqls) or directory containing a source schema file
               --cloud-url <cloud-url>                        The URL of the Nitro backend (only needed for self-hosted or dedicated deployments) [env: NITRO_CLOUD_URL] [default: api.chillicream.com]
               --api-key <api-key>                            The API key used for authentication [env: NITRO_API_KEY]
@@ -150,6 +151,66 @@ Missing one of the required options '--source-schema-file' or '--archive'.
         Assert.Equal(1, result.ExitCode);
     }
 
+    [Theory]
+    [InlineData(InteractionMode.Interactive)]
+    [InlineData(InteractionMode.NonInteractive)]
+    [InlineData(InteractionMode.JsonOutput)]
+    public async Task Archive_And_LegacyArchive_ReturnsError(InteractionMode mode)
+    {
+        // arrange
+        SetupInteractionMode(mode);
+
+        // act
+        var result = await ExecuteCommandAsync(
+            "fusion",
+            "validate",
+            "--api-id",
+            ApiId,
+            "--stage",
+            Stage,
+            "--archive",
+            ArchiveFile,
+            "--legacy-v1-archive",
+            LegacyArchiveFile);
+
+        // assert
+        result.StdErr.MatchInlineSnapshot(
+            """
+            The options '--archive' and '--legacy-v1-archive' are mutually exclusive.
+            """);
+        Assert.Equal(1, result.ExitCode);
+    }
+
+    [Theory]
+    [InlineData(InteractionMode.Interactive)]
+    [InlineData(InteractionMode.NonInteractive)]
+    [InlineData(InteractionMode.JsonOutput)]
+    public async Task WithLegacyArchive_FileDoesNotExist_ReturnsError(InteractionMode mode)
+    {
+        // arrange
+        SetupInteractionMode(mode);
+
+        // act
+        var result = await ExecuteCommandAsync(
+            "fusion",
+            "validate",
+            "--api-id",
+            ApiId,
+            "--stage",
+            Stage,
+            "--source-schema-file",
+            SourceSchemaFile,
+            "--legacy-v1-archive",
+            LegacyArchiveFile);
+
+        // assert
+        result.StdErr.MatchInlineSnapshot(
+            """
+            Legacy archive file '/some/working/directory/fusion-v1.fgp' does not exist.
+            """);
+        Assert.Equal(1, result.ExitCode);
+    }
+
     #endregion
 
     #region Archive

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ namespace ChilliCream.Nitro.CommandLine.Tests.Commands.Fusion;`
`15`	`15`	`public abstract class FusionCommandTestBase(NitroCommandFixture fixture) : SchemasCommandTestBase(fixture)`
`16`	`16`	`{`
`17`	`17`	`protected const string ArchiveFile = "fusion.far";`
	`18`	`+ protected const string LegacyArchiveFile = "fusion-v1.fgp";`
`18`	`19`	`protected const string SourceSchemaFile = "products/schema.graphqls";`
`19`	`20`	`protected const string SourceSchemaSettingsFile = "products/schema-settings.json";`
`20`	`21`	`protected const string SourceSchema = "products";`