Merge pull request #387 from a-kenji/ke-support-channels

update: Support channel based releases

Author: a-kenji

nix/forgejo-test.nix

@@ -1,4 +1,4 @@
-_: {
+{
   perSystem =
     { pkgs, self', ... }:
     {
@@ -48,6 +48,11 @@ _: {
                 self'.packages.flake-edit
               ];
 
+              environment.variables = {
+                FE_LOG = "debug,hyper=off,h2=off";
+                CI = "1";
+              };
+
               nix.settings = {
                 experimental-features = [
                   "nix-command"
@@ -63,6 +68,11 @@ _: {
             forgejoExe = "${nodes.forge.config.services.forgejo.package}/bin/forgejo";
           in
           ''
+            EMPTY_FLAKE = "{ inputs = { }; outputs = { ... }: { }; }"
+
+            def write_empty_flake(machine, path):
+                machine.succeed(f"mkdir -p $(dirname {path}) && echo '{EMPTY_FLAKE}' > {path}")
+
             start_all()
 
             forge.wait_for_unit("forgejo.service")
@@ -98,7 +108,6 @@ _: {
                 """)
 
             with subtest("Create v1.0.0 release"):
-                # Create v1.0.0
                 forge.succeed(
                     "curl --fail -X POST http://localhost:3000/api/v1/repos/test/project1/releases "
                     + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
@@ -129,20 +138,8 @@ _: {
                 assert "v1.0.0" in releases, "v1.0.0 should be available"
 
             with subtest("Create empty test flake.nix on client"):
-                client.succeed(r"""
-                  mkdir -p /tmp/test-flake
-                  cat > /tmp/test-flake/flake.nix << 'EOF'
-            {
-              description = "Test flake for flake-edit integration";
-
-              inputs = {
-              };
-
-              outputs = { ... }: { };
-            }
-            EOF
-                  cat /tmp/test-flake/flake.nix
-                """)
+                write_empty_flake(client, "/tmp/test-flake/flake.nix")
+                client.succeed("cat /tmp/test-flake/flake.nix")
 
             with subtest("Verify empty flake has no inputs"):
                 output = client.succeed("""
@@ -155,40 +152,32 @@ _: {
             with subtest("Add input without version pin"):
                 output = client.succeed("""
                   cd /tmp/test-flake
-                  CI=1 FE_LOG=debug flake-edit add project1 git+http://forge:3000/test/project1 --no-flake 2>&1
+                  flake-edit add project1 git+http://forge:3000/test/project1 --no-flake 2>&1
                 """)
                 print(f"flake-edit add output: {output}")
 
-                # Verify the input was added without a version pin
-                flake_content = client.succeed("""
-                  cat /tmp/test-flake/flake.nix
-                """)
+                flake_content = client.succeed("cat /tmp/test-flake/flake.nix")
                 print(f"flake.nix after add: {flake_content}")
                 assert "project1" in flake_content, "project1 should be added"
 
             with subtest("Pin input to latest version with update --init"):
                 output = client.succeed("""
                   cd /tmp/test-flake
-                  CI=1 FE_LOG=debug flake-edit update project1 --init 2>&1
+                  flake-edit update project1 --init 2>&1
                 """)
                 print(f"flake-edit update --init output: {output}")
 
-                # Verify the input was pinned with refs/tags/ prefix
-                flake_content = client.succeed("""
-                  cat /tmp/test-flake/flake.nix
-                """)
+                flake_content = client.succeed("cat /tmp/test-flake/flake.nix")
                 print(f"flake.nix after update --init: {flake_content}")
                 assert "refs/tags/v1.0.0" in flake_content, "Should be pinned to refs/tags/v1.0.0"
 
             with subtest("Create additional releases (v1.5.0, v2.0.0)"):
-                # Create v2.0.0
                 forge.succeed(
                     "curl --fail -X POST http://localhost:3000/api/v1/repos/test/project1/releases "
                     + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
                     + f"-H 'Authorization: token {api_token}'"
                     + ' -d \'{"tag_name":"v2.0.0","name":"Release v2.0.0","body":"Test release 2.0.0"}\'''
                 )
-                # Create v1.5.0 (to test sorting)
                 forge.succeed(
                     "curl --fail -X POST http://localhost:3000/api/v1/repos/test/project1/releases "
                     + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
@@ -197,27 +186,172 @@ _: {
                 )
 
             with subtest("Test flake-edit update to latest version"):
-                # Update project1 to latest (should go to v2.0.0)
                 output = client.succeed("""
                   cd /tmp/test-flake
-                  CI=1 FE_LOG=debug flake-edit update project1 2>&1
+                  flake-edit update project1 2>&1
                 """)
                 print(f"flake-edit update output: {output}")
 
-                # Check the flake.nix was updated
-                updated_flake = client.succeed("""
-                  cat /tmp/test-flake/flake.nix
-                """)
+                updated_flake = client.succeed("cat /tmp/test-flake/flake.nix")
                 print(f"Updated flake.nix: {updated_flake}")
-
-                # Verify it updated to v2.0.0
-                assert "refs/tags/v2.0.0" in updated_flake, "flake.nix should reference refs/tags/v2.0.0"
-                assert "v1.0.0" not in updated_flake, "flake.nix should no longer reference v1.0.0"
+                assert "refs/tags/v2.0.0" in updated_flake, "Should be updated to v2.0.0"
+                assert "v1.0.0" not in updated_flake, "Should no longer reference v1.0.0"
 
             with subtest("Verify flake-edit detected Forgejo correctly"):
-                # The update should have worked, which means Forgejo was detected
-                # Check the logs for detection messages (optional, we already verified it worked)
                 print("flake-edit successfully updated from Forgejo instance")
+
+            with subtest("Create 'nixos' organization for channel tests"):
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/orgs "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}'"
+                    + ' -d \'{"username":"nixos","full_name":"NixOS","visibility":"public"}\'''
+                )
+
+            with subtest("Create 'nixpkgs' repository under 'nixos' org"):
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/orgs/nixos/repos "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}'"
+                    + ' -d \'{"auto_init":true, "name":"nixpkgs", "private":false, "default_branch":"nixos-unstable"}\'''
+                )
+
+            with subtest("Create channel branches for nixpkgs"):
+                default_sha = forge.succeed(
+                    "curl -sfS http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches/nixos-unstable "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + "| jq -r '.commit.id' | xargs echo -n"
+                )
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + f'-d \'{{"new_branch_name":"nixos-24.05","old_ref_name":"{default_sha}"}}\'''
+                )
+
+            with subtest("Verify nixpkgs branches exist"):
+                branches = client.succeed("""
+                  curl -sfS http://forge:3000/api/v1/repos/nixos/nixpkgs/branches \
+                  | jq -r '.[].name' | sort
+                """)
+                print(f"Available branches: {branches}")
+                assert "nixos-24.05" in branches, "nixos-24.05 branch should exist"
+                assert "nixos-unstable" in branches, "nixos-unstable branch should exist"
+
+            with subtest("Create test flake for channel tests"):
+                write_empty_flake(client, "/tmp/channel-test/flake.nix")
+                client.succeed("cat /tmp/channel-test/flake.nix")
+
+            with subtest("Add nixpkgs input without version pin"):
+                output = client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit add nixpkgs git+http://forge:3000/nixos/nixpkgs --no-flake 2>&1
+                """)
+                print(f"flake-edit add nixpkgs output: {output}")
+
+                flake_content = client.succeed("cat /tmp/channel-test/flake.nix")
+                print(f"flake.nix after adding nixpkgs: {flake_content}")
+                assert "nixpkgs" in flake_content, "nixpkgs should be added"
+                assert "nixos-24" not in flake_content, "Should not have a channel ref yet (unpinned)"
+
+            with subtest("Channel update --init on unpinned input"):
+                output = client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit update nixpkgs --init 2>&1
+                """)
+                print(f"flake-edit update --init output: {output}")
+                flake_content = client.succeed("cat /tmp/channel-test/flake.nix")
+                print(f"flake.nix after update --init: {flake_content}")
+
+            with subtest("Set nixpkgs to nixos-24.05 channel"):
+                write_empty_flake(client, "/tmp/channel-test/flake.nix")
+                client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit add nixpkgs 'git+http://forge:3000/nixos/nixpkgs?ref=nixos-24.05' --no-flake
+                """)
+                client.succeed("cat /tmp/channel-test/flake.nix")
+
+            with subtest("Create nixos-24.11 branch"):
+                branch_sha = forge.succeed(
+                    "curl -sfS http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches/nixos-24.05 "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + "| jq -r '.commit.id' | xargs echo -n"
+                )
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + f'-d \'{{"new_branch_name":"nixos-24.11","old_ref_name":"{branch_sha}"}}\'''
+                )
+                branches = client.succeed("""
+                  curl -sfS http://forge:3000/api/v1/repos/nixos/nixpkgs/branches \
+                  | jq -r '.[].name' | sort
+                """)
+                print(f"Branches: {branches}")
+                assert "nixos-24.11" in branches, "nixos-24.11 branch should exist"
+
+            with subtest("Channel update should upgrade from 24.05 to 24.11"):
+                output = client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit update nixpkgs 2>&1
+                """)
+                print(f"flake-edit channel update output: {output}")
+
+                flake_content = client.succeed("cat /tmp/channel-test/flake.nix")
+                print(f"flake.nix after channel update: {flake_content}")
+                assert "nixos-24.11" in flake_content, "Should be updated to nixos-24.11"
+                assert "nixos-24.05" not in flake_content, "Should no longer reference nixos-24.05"
+
+            with subtest("Verify unstable channels are not updated"):
+                write_empty_flake(client, "/tmp/channel-test/flake.nix")
+                client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit add nixpkgs 'git+http://forge:3000/nixos/nixpkgs?ref=nixos-unstable' --no-flake
+                """)
+                output = client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit update nixpkgs 2>&1
+                """)
+                print(f"flake-edit update on unstable output: {output}")
+
+                flake_content = client.succeed("cat /tmp/channel-test/flake.nix")
+                print(f"flake.nix after update on unstable: {flake_content}")
+                assert "nixos-unstable" in flake_content, "Should remain on nixos-unstable"
+                assert "nixos-24" not in flake_content, "Should NOT be changed to a stable channel"
+
+            with subtest("Verify nixpkgs- prefix channels also work"):
+                branch_sha = forge.succeed(
+                    "curl -sfS http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches/nixos-unstable "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + "| jq -r '.commit.id' | xargs echo -n"
+                )
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + f'-d \'{{"new_branch_name":"nixpkgs-24.05","old_ref_name":"{branch_sha}"}}\'''
+                )
+                forge.succeed(
+                    "curl --fail -X POST http://localhost:3000/api/v1/repos/nixos/nixpkgs/branches "
+                    + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+                    + f"-H 'Authorization: token {api_token}' "
+                    + f'-d \'{{"new_branch_name":"nixpkgs-24.11","old_ref_name":"{branch_sha}"}}\'''
+                )
+
+                write_empty_flake(client, "/tmp/channel-test/flake.nix")
+                client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit add nixpkgs 'git+http://forge:3000/nixos/nixpkgs?ref=nixpkgs-24.05' --no-flake
+                """)
+                output = client.succeed("""
+                  cd /tmp/channel-test
+                  flake-edit update nixpkgs 2>&1
+                """)
+                print(f"flake-edit update nixpkgs- prefix output: {output}")
+
+                flake_content = client.succeed("cat /tmp/channel-test/flake.nix")
+                print(f"flake.nix after nixpkgs- update: {flake_content}")
+                assert "nixpkgs-24.11" in flake_content, "Should be updated to nixpkgs-24.11"
           '';
       };
     };