Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Jun 2, 2022 · 3a841e0 · 3a841e0
1 parent b88d2a5
commit 3a841e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/...s/repository-s3/src/main/java/org/opensearch/repositories/s3/AmazonS3WithCredentials.java b/...s/repository-s3/src/main/java/org/opensearch/repositories/s3/AmazonS3WithCredentials.java
@@ -25,14 +25,6 @@ private AmazonS3WithCredentials(final AmazonS3 client, @Nullable final AWSCreden
         this.credentials = credentials;
     }
 
-    AmazonS3 getClient() {
-        return client;
-    }
-
-    AWSCredentialsProvider getCredentials() {
-        return credentials;
-    }
-
     AmazonS3 client() {
         return client;
     }

diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
@@ -271,7 +271,7 @@ public Socket createSocket(final HttpContext ctx) throws IOException {
 
     // pkg private for tests
     static AWSCredentialsProvider buildCredentials(Logger logger, S3ClientSettings clientSettings) {
-        final S3BasicCredentials credentials = clientSettings.credentials;
+        final S3BasicCredentials basicCredentials = clientSettings.credentials;
         final IrsaCredentials irsaCredentials = buildFromEnviroment(clientSettings.irsaCredentials);
 
         // If IAM Roles for Service Accounts (IRSA) credentials are configured, start with them first
@@ -280,10 +280,10 @@ static AWSCredentialsProvider buildCredentials(Logger logger, S3ClientSettings c
 
             AWSSecurityTokenService securityTokenService = null;
             final String region = Strings.hasLength(clientSettings.region) ? clientSettings.region : null;
-            if (region != null || credentials != null) {
+            if (region != null || basicCredentials != null) {
                 securityTokenService = SocketAccess.doPrivileged(
                     () -> AWSSecurityTokenServiceClientBuilder.standard()
-                        .withCredentials((credentials != null) ? new AWSStaticCredentialsProvider(credentials) : null)
+                        .withCredentials((basicCredentials != null) ? new AWSStaticCredentialsProvider(basicCredentials) : null)
                         .withRegion(region)
                         .build()
                 );
@@ -306,9 +306,9 @@ static AWSCredentialsProvider buildCredentials(Logger logger, S3ClientSettings c
                     ).withStsClient(securityTokenService).build()
                 );
             }
-        } else if (credentials != null) {
+        } else if (basicCredentials != null) {
             logger.debug("Using basic key/secret credentials");
-            return new AWSStaticCredentialsProvider(credentials);
+            return new AWSStaticCredentialsProvider(basicCredentials);
         } else {
             logger.debug("Using instance profile credentials");
             return new PrivilegedInstanceProfileCredentialsProvider();