Merge remote-tracking branch 'smokeballdb/add-aws-sso' into develop

clowd · Dec 26, 2023 · 4a695bd · 4a695bd
2 parents 6e28389 + 2fdb4f2
commit 4a695bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/Squirrel.Csq/Commands/S3BaseCommand.cs b/src/Squirrel.Csq/Commands/S3BaseCommand.cs
@@ -7,6 +7,8 @@ public class S3BaseCommand : BaseCommand
 
     public string Secret { get; private set; }
 
+    public string Session { get; private set; }
+
     public string Region { get; private set; }
 
     public string Endpoint { get; private set; }
@@ -20,18 +22,20 @@ protected S3BaseCommand(string name, string description)
     {
         AddOption<string>((v) => KeyId = v, "--keyId")
             .SetDescription("Authentication identifier or access key.")
-            .SetArgumentHelpName("KEYID")
-            .SetRequired();
+            .SetArgumentHelpName("KEYID");
 
         AddOption<string>((v) => Secret = v, "--secret")
             .SetDescription("Authentication secret key.")
-            .SetArgumentHelpName("KEY")
-            .SetRequired();
+            .SetArgumentHelpName("KEY");
 
         var region = AddOption<string>((v) => Region = v, "--region")
             .SetDescription("AWS service region (eg. us-west-1).")
             .SetArgumentHelpName("REGION");
 
+        AddOption<string>((v) => Session = v, "--session")
+            .SetDescription("Authentication session token.")
+            .SetArgumentHelpName("SESSION");
+
         region.Validators.Add(MustBeValidAwsRegion);
 
         var endpoint = AddOption<Uri>((v) => Endpoint = v.ToAbsoluteOrNull(), "--endpoint")

diff --git a/src/Squirrel.Csq/Compat/EmbeddedRunner.cs b/src/Squirrel.Csq/Compat/EmbeddedRunner.cs
@@ -145,6 +145,7 @@ public Task ExecuteS3Download(S3DownloadCommand command)
             PathPrefix = command.PathPrefix,
             Region = command.Region,
             ReleaseDir = command.GetReleaseDirectory(),
+            Session = command.Session,
             Secret = command.Secret,
         };
         return new S3Repository(_logger).DownloadRecentPackages(options);

diff --git a/src/Squirrel.Deployment/S3Repository.cs b/src/Squirrel.Deployment/S3Repository.cs
@@ -11,10 +11,13 @@ namespace Squirrel.Deployment;
 public class S3Options
 {
     public DirectoryInfo ReleaseDir { get; set; }
+
     public string KeyId { get; set; }
 
     public string Secret { get; set; }
 
+    public string Session { get; set; }
+
     public string Region { get; set; }
 
     public string Endpoint { get; set; }
@@ -44,10 +47,13 @@ private static AmazonS3Client GetS3Client(S3Options options)
     {
         if (options.Region != null) {
             var r = RegionEndpoint.GetBySystemName(options.Region);
-            return new AmazonS3Client(options.KeyId, options.Secret, r);
+            if (string.IsNullOrWhiteSpace(options.KeyId)) {
+                return new AmazonS3Client(r);
+            }
+            return new AmazonS3Client(options.KeyId, options.Secret, options.Session, r);
         } else if (options.Endpoint != null) {
             var config = new AmazonS3Config() { ServiceURL = options.Endpoint };
-            return new AmazonS3Client(options.KeyId, options.Secret, config);
+            return new AmazonS3Client(options.KeyId, options.Secret, options.Session, config);
         } else {
             throw new InvalidOperationException("Missing endpoint");
         }