AWS S3

phongnguyend · phongnguyend · commit 4097a2692ac3 · 2025-07-04T18:47:48.000+07:00
diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs
@@ -17,15 +17,23 @@ public class AmazonS3HealthCheck : IHealthCheck
 
     public AmazonS3HealthCheck(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 
-    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
         try
         {
-            var fileName = _options.Path + $"HealthCheck/{DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss")}-{Guid.NewGuid()}.txt";
+            var fileName = _options.Path + $"HealthCheck/{DateTime.Now:yyyy-MM-dd-hh-mm-ss}-{Guid.NewGuid()}.txt";
             var fileTransferUtility = new TransferUtility(_client);
 
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes($"HealthCheck {DateTime.Now}"));
diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs
@@ -15,7 +15,15 @@ public class AmazonS3StorageManager : IFileStorageManager
 
     public AmazonS3StorageManager(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs
@@ -17,15 +17,23 @@ public class AmazonS3HealthCheck : IHealthCheck
 
     public AmazonS3HealthCheck(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 
-    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
         try
         {
-            var fileName = _options.Path + $"HealthCheck/{DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss")}-{Guid.NewGuid()}.txt";
+            var fileName = _options.Path + $"HealthCheck/{DateTime.Now:yyyy-MM-dd-hh-mm-ss}-{Guid.NewGuid()}.txt";
             var fileTransferUtility = new TransferUtility(_client);
 
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes($"HealthCheck {DateTime.Now}"));
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs
@@ -15,7 +15,15 @@ public class AmazonS3StorageManager : IFileStorageManager
 
     public AmazonS3StorageManager(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 
diff --git a/src/Monolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs b/src/Monolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3HealthCheck.cs
@@ -17,15 +17,23 @@ public class AmazonS3HealthCheck : IHealthCheck
 
     public AmazonS3HealthCheck(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 
-    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
         try
         {
-            var fileName = _options.Path + $"HealthCheck/{DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss")}-{Guid.NewGuid()}.txt";
+            var fileName = _options.Path + $"HealthCheck/{DateTime.Now:yyyy-MM-dd-hh-mm-ss}-{Guid.NewGuid()}.txt";
             var fileTransferUtility = new TransferUtility(_client);
 
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes($"HealthCheck {DateTime.Now}"));
diff --git a/src/Monolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs b/src/Monolith/ClassifiedAds.Infrastructure/Storages/Amazon/AmazonS3StorageManager.cs
@@ -16,7 +16,15 @@ public class AmazonS3StorageManager : IFileStorageManager
 
     public AmazonS3StorageManager(AmazonOptions options)
     {
-        _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        if (!string.IsNullOrWhiteSpace(options.AccessKeyID))
+        {
+            _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+        else
+        {
+            _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));
+        }
+
         _options = options;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,23 @@ public class AmazonS3HealthCheck : IHealthCheck`
`17`	`17`
`18`	`18`	`public AmazonS3HealthCheck(AmazonOptions options)`
`19`	`19`	`{`
`20`		`- _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));`
	`20`	`+ if (!string.IsNullOrWhiteSpace(options.AccessKeyID))`
	`21`	`+ {`
	`22`	`+ _client = new AmazonS3Client(options.AccessKeyID, options.SecretAccessKey, RegionEndpoint.GetBySystemName(options.RegionEndpoint));`
	`23`	`+ }`
	`24`	`+ else`
	`25`	`+ {`
	`26`	`+ _client = new AmazonS3Client(RegionEndpoint.GetBySystemName(options.RegionEndpoint));`
	`27`	`+ }`
	`28`	`+`
`21`	`29`	`_options = options;`
`22`	`30`	`}`
`23`	`31`
`24`		`- public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default(CancellationToken))`
	`32`	`+ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)`
`25`	`33`	`{`
`26`	`34`	`try`
`27`	`35`	`{`
`28`		`- var fileName = _options.Path + $"HealthCheck/{DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss")}-{Guid.NewGuid()}.txt";`
	`36`	`+ var fileName = _options.Path + $"HealthCheck/{DateTime.Now:yyyy-MM-dd-hh-mm-ss}-{Guid.NewGuid()}.txt";`
`29`	`37`	`var fileTransferUtility = new TransferUtility(_client);`
`30`	`38`
`31`	`39`	`using var stream = new MemoryStream(Encoding.UTF8.GetBytes($"HealthCheck {DateTime.Now}"));`