From c9e7329590891b6436b995b1ecc90e4aab435935 Mon Sep 17 00:00:00 2001
From: Francisco Facioni <franciscof@bolt6.ai>
Date: Tue, 9 Jul 2024 18:05:57 +0200
Subject: [PATCH] add s3 prefix support

---
 src/Velopack.Deployment/S3Repository.cs       | 23 +++++++++++++++----
 .../Commands/Deployment/S3BaseCommand.cs      |  6 +++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Velopack.Deployment/S3Repository.cs b/src/Velopack.Deployment/S3Repository.cs
index ef5a611d..7e584ca9 100644
--- a/src/Velopack.Deployment/S3Repository.cs
+++ b/src/Velopack.Deployment/S3Repository.cs
@@ -18,6 +18,8 @@ public class S3DownloadOptions : RepositoryOptions, IObjectDownloadOptions
     public string Endpoint { get; set; }
 
     public string Bucket { get; set; }
+
+    public string Prefix { get; set; }
 }
 
 public class S3UploadOptions : S3DownloadOptions, IObjectUploadOptions
@@ -30,18 +32,20 @@ public class S3BucketClient
     public AmazonS3Client Amazon { get; }
 
     public string Bucket { get; }
+    public string Prefix { get; }
 
-    public S3BucketClient(AmazonS3Client client, string bucket)
+    public S3BucketClient(AmazonS3Client client, string bucket, string prefix)
     {
         Amazon = client;
         Bucket = bucket;
+        Prefix = prefix;
     }
 
     public virtual Task<DeleteObjectResponse> DeleteObjectAsync(string key, CancellationToken cancellationToken = default)
     {
         var request = new DeleteObjectRequest();
         request.BucketName = Bucket;
-        request.Key = key;
+        request.Key = Prefix + key;
         return Amazon.DeleteObjectAsync(request, cancellationToken);
     }
 
@@ -49,7 +53,7 @@ public class S3BucketClient
     {
         var request = new GetObjectRequest();
         request.BucketName = Bucket;
-        request.Key = key;
+        request.Key = Prefix + key;
         return Amazon.GetObjectAsync(request, cancellationToken);
     }
 
@@ -57,7 +61,7 @@ public class S3BucketClient
     {
         var request = new GetObjectMetadataRequest();
         request.BucketName = Bucket;
-        request.Key = key;
+        request.Key = Prefix + key;
         return Amazon.GetObjectMetadataAsync(request, cancellationToken);
     }
 }
@@ -87,7 +91,16 @@ public class S3Repository : ObjectRepository<S3DownloadOptions, S3UploadOptions,
         } else {
             client = new AmazonS3Client(config);
         }
-        return new S3BucketClient(client, options.Bucket);
+        var prefix = options.Prefix?.Trim();
+        if (prefix == null) {
+            prefix = "";
+        }
+
+        if (!string.IsNullOrEmpty(prefix) && !prefix.EndsWith("/")) {
+            prefix += "/";
+        }
+
+        return new S3BucketClient(client, options.Bucket, prefix);
     }
 
     protected override async Task DeleteObject(S3BucketClient client, string key)
diff --git a/src/Velopack.Vpk/Commands/Deployment/S3BaseCommand.cs b/src/Velopack.Vpk/Commands/Deployment/S3BaseCommand.cs
index d6acafe0..3b8828f2 100644
--- a/src/Velopack.Vpk/Commands/Deployment/S3BaseCommand.cs
+++ b/src/Velopack.Vpk/Commands/Deployment/S3BaseCommand.cs
@@ -14,6 +14,8 @@ public class S3BaseCommand : OutputCommand
 
     public string Bucket { get; private set; }
 
+    public string Prefix { get; private set; }
+
     protected S3BaseCommand(string name, string description)
         : base(name, description)
     {
@@ -47,6 +49,10 @@ public class S3BaseCommand : OutputCommand
             .SetDescription("Name of the S3 bucket.")
             .SetArgumentHelpName("NAME")
             .SetRequired();
+
+        AddOption<string>((v) => Prefix = v, "--prefix")
+            .SetDescription("Prefix to the S3 url.")
+            .SetArgumentHelpName("PREFIX");
     }
 
     private static void MustBeValidAwsRegion(OptionResult result)