Merge branch 'master' of https://github.com/ivanau/AspNetCore.Diagnos…

…tics.HealthChecks into ivanau-master
Xabaril · Apr 17, 2020 · 345c724 · 345c724
2 parents 06b09c2 + 9a61497
commit 345c724
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/HealthChecks.Aws.S3/S3HealthCheck.cs b/src/HealthChecks.Aws.S3/S3HealthCheck.cs
@@ -16,14 +16,6 @@ public S3HealthCheck(S3BucketOptions bucketOptions)
             {
                 throw new ArgumentNullException(nameof(bucketOptions));
             }
-            if (string.IsNullOrEmpty(bucketOptions.AccessKey))
-            {
-                throw new ArgumentNullException(nameof(S3BucketOptions.AccessKey));
-            }
-            if (string.IsNullOrEmpty(bucketOptions.SecretKey))
-            {
-                throw new ArgumentNullException(nameof(S3BucketOptions.SecretKey));
-            }
             if (bucketOptions.S3Config == null)
             {
                 throw new ArgumentNullException(nameof(S3BucketOptions.S3Config));
@@ -34,8 +26,14 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
-                var credentials = new BasicAWSCredentials(_bucketOptions.AccessKey, _bucketOptions.SecretKey);
-                using (var client = new AmazonS3Client(credentials, _bucketOptions.S3Config))
+                bool keysProvided = !string.IsNullOrEmpty(_bucketOptions.AccessKey) &&
+                                    !string.IsNullOrEmpty(_bucketOptions.SecretKey);
+
+                AmazonS3Client client = keysProvided
+                    ? new AmazonS3Client(_bucketOptions.AccessKey, _bucketOptions.SecretKey, _bucketOptions.S3Config)
+                    : new AmazonS3Client(_bucketOptions.S3Config);
+
+                using (client)
                 {
                     var response = await client.ListObjectsAsync(_bucketOptions.BucketName, cancellationToken);