Fixed error handling

.gitignore

@@ -3,6 +3,7 @@
 
 bin/
 obj/
+publish/
 
 # Environment Variables - DO NOT COMMIT
 .env

package-cleanup/action.yaml

@@ -14,7 +14,7 @@ inputs:
   types:
     description: "Types of packages (e.g. Container, PyPi, NuGet)"
     required: false
-    default: "Container,PyPi,NuGet"
+    default: "container,pypi,nuget,npm"
   api_token:
     description: "API token for authentication"
     required: true
@@ -23,21 +23,19 @@ inputs:
     required: false
     default: "false"
 
-outputs:
-  deleted_packages:
-    description: "Number of packages deleted"
-    value: ${{ steps.cleanup.outputs.deleted_packages }}
-  processed_names:
-    description: "Number of package names processed"
-    value: ${{ steps.cleanup.outputs.processed_names }}
-
 runs:
   using: "composite"
   steps:
     - name: Download and test package-cleanup tool
       shell: bash
       run: |
-        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/package-cleanup-linux-x64
+        latest_path=$(curl -sI https://git.sh-edraft.de/sh-edraft.de/-/packages/generic/package-cleanup/ \
+          | awk -F ' ' '/Location:/ {print $2}' \
+          | tr -d '\r')
+
+        version=$(basename "$latest_path")
+        echo "Downloading package-cleanup version $version..."
+        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$version/package-cleanup-linux-x64
 
         # Make executable
         chmod +x package-cleanup-linux-x64
@@ -54,6 +52,5 @@ runs:
         DRY_RUN: ${{ inputs.dry_run }}
         GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
       run: |
-        echo "Starting cleanup..."
+        ./package-cleanup-linux-x64
-        ./package-cleanup-linux-x64 > output.txt
+
-        cat output.txt

sh.actions.package-cleanup.Tests/Service/PackageServiceTests.cs

@@ -22,6 +22,29 @@ public class PackageFilterTests
         }).ToList();
     }
 
+    [Fact]
+    public void TestPackageNameParsing()
+    {
+        var inputString =
+            "@sh-edraft.de/core, sh-edraft.core.api, sh-edraft.core.api.auth, sh-edraft.core.api.configuration, sh-edraft.core.api.db, sh-edraft.core.api.graphql, sh-edraft.core.api.service, sh-edraft.core.utils";
+        List<string> expected = [
+            "@sh-edraft.de/core",
+            "sh-edraft.core.api",
+            "sh-edraft.core.api.auth",
+            "sh-edraft.core.api.configuration",
+            "sh-edraft.core.api.db",
+            "sh-edraft.core.api.graphql",
+            "sh-edraft.core.api.service",
+            "sh-edraft.core.utils"
+        ];
+        
+        var actual = inputString
+            .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        
+        Assert.Equal(expected.Count, actual.Length);
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void TestFilterPackagesToDelete()
     {
@@ -102,7 +125,26 @@ public class PackageFilterTests
         "2024.8.10.0-exp",
         "2024.8.10.1-exp",
         "2024.8.11.0-exp",
-        "2024.8.11.2-exp"
+        "2024.8.11.2-exp",
+        "2026.2.21.27-dev",
+        "2026.2.21.26-dev",
+        "2026.2.21.25-dev",
+        "2026.2.21.24-dev",
+        "2026.2.21.23-dev",
+        "2026.2.21.22-dev",
+        "2026.2.21.21-dev",
+        "2026.2.21.20-dev",
+        "2026.2.21.19-dev",
+        "2026.2.21.18-dev",
+        "2026.2.21.17-dev",
+        "2026.2.21.15-dev",
+        "2026.2.21.14-dev",
+        "2026.2.21.13-dev",
+        "2026.2.21.12-dev",
+        "2026.2.21.11-dev",
+        "2026.2.21.10-dev",
+        "2026.2.21.9-dev",
+        "2026.2.21.8-dev",
     ];
 
     private readonly List<string> _versionsToHold =
@@ -139,7 +181,9 @@ public class PackageFilterTests
         "0.1.1-exp",
         "0.1.2-exp",
         "2024.8.11.0-exp",
-        "2024.8.11.2-exp"
+        "2024.8.11.2-exp",
+        "2026.2.21.27-dev",
+        "2026.2.21.26-dev",
     ];
 
     private List<string> _expectDeleted => _versions.Except(_versionsToHold).ToList();

sh.actions.package-cleanup/Program.cs

@@ -3,6 +3,13 @@ using sh.actions.package_cleanup.Service;
 
 var builder = Host.CreateApplicationBuilder(args);
 
+// Check for --dry-run argument
+var isDryRun = args.Contains("--dry-run");
+if (isDryRun)
+{
+    Environment.SetEnvironmentVariable("DRY_RUN", "true");
+}
+
 builder.Configuration
     .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
     .AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true)

sh.actions.package-cleanup/Worker.cs

@@ -17,6 +17,8 @@ public class Worker(
         if (dryRun)
         {
             logger.LogInformation("Dry run enabled, not deleting {Count} packages", packages.Count);
+            logger.LogInformation("Would delete packages: {versions}",
+                string.Join(", ", packages.Select(p => p.Version)));
         }
 
         foreach (var giteaPackage in packages)
@@ -37,6 +39,12 @@ public class Worker(
     {
         try
         {
+            var dryRun = configuration["DRY_RUN"]?.ToLower() == "true";
+            if (dryRun)
+            {
+                logger.LogInformation("DRY RUN MODE ENABLED - No packages will be deleted");
+            }
+
             // Parse comma-separated names
             var names = (configuration["NAMES"] ?? "")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
@@ -48,22 +56,31 @@ public class Worker(
                 return;
             }
 
+            logger.LogInformation("Deleting {count} packages: {names}", names.Length, string.Join(", ", names));
+
             // Process each name separately: collect -> filter -> delete
             foreach (var name in names)
             {
-                logger.LogInformation("Processing packages for name '{Name}'", name);
+                try
+                {
+                    logger.LogInformation("Processing packages for name '{Name}'", name);
 
-                var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
+                    var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
-                logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
+                    logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
 
-                var packagesToDelete = packageService.FilterPackagesToDelete(packages);
+                    var packagesToDelete = packageService.FilterPackagesToDelete(packages);
-                logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
+                    logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
-                    name);
+                        name);
 
-                await DeletePackages(packagesToDelete, cancellationToken);
+                    await DeletePackages(packagesToDelete, cancellationToken);
-                logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
+                    logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
 
-                logger.LogInformation("Cleanup finished for name '{Name}'", name);
+                    logger.LogInformation("Cleanup finished for name '{Name}'", name);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "Failed to delete package {PackageName}", name);
+                }
             }
 
             logger.LogInformation("All package names processed successfully");

sh.actions.package-cleanup/sh.actions.package-cleanup.csproj

@@ -6,10 +6,41 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>dotnet-sh.actions.package_cleanup-2b7a013f-ec22-4325-9832-0c9ca9b8ced9</UserSecretsId>
         <RootNamespace>sh.actions.package_cleanup</RootNamespace>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
     </ItemGroup>
+
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+    </ItemGroup>
 </Project>

sh.actions.sln.DotSettings.user

@@ -1,7 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpResponseMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff7cd24f648c14c59ab25c6dcf9108aef198e00_003Fd7_003F31923dff_003FHttpResponseMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=6fbf28ff_002Db08e_002D4d2b_002D8694_002D3f25abc9fe16/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &amp;lt;sh.actions.package-cleanup.Tests&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AServiceProvider_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fd7e2ce30531b7a2d56142411c5e51c3d516aafcb44e7628167b959660a65c_003FServiceProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+  &lt;Project Location="/home/sven/dev/git_sh-edraft_de/actions/sh.actions.package-cleanup.Tests" Presentation="&amp;lt;sh.actions.package-cleanup.Tests&amp;gt;" /&gt;
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fc220b10_002D634c_002D48e4_002Da543_002Df5162d99c787/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
-  &lt;Solution /&gt;
-&lt;/SessionState&gt;</s:String>
-	</wpf:ResourceDictionary>