nrt_utils support defaultCredentialsProvider

Yelp · Dec 27, 2023 · 1e1129e · 1e1129e
1 parent 003e652
commit 1e1129e
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 20 deletions.
diff --git a/...ava/com/yelp/nrtsearch/tools/nrt_utils/incremental/DeleteIncrementalSnapshotsCommand.java b/...ava/com/yelp/nrtsearch/tools/nrt_utils/incremental/DeleteIncrementalSnapshotsCommand.java
@@ -69,12 +69,13 @@ public class DeleteIncrementalSnapshotsCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/...in/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/IncrementalDataCleanupCommand.java b/...in/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/IncrementalDataCleanupCommand.java
@@ -70,12 +70,13 @@ public class IncrementalDataCleanupCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/.../java/com/yelp/nrtsearch/tools/nrt_utils/incremental/ListIncrementalSnapshotsCommand.java b/.../java/com/yelp/nrtsearch/tools/nrt_utils/incremental/ListIncrementalSnapshotsCommand.java
@@ -54,12 +54,13 @@ public class ListIncrementalSnapshotsCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/RestoreIncrementalCommand.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/RestoreIncrementalCommand.java
@@ -78,12 +78,13 @@ public class RestoreIncrementalCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/SnapshotIncrementalCommand.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/incremental/SnapshotIncrementalCommand.java
@@ -74,12 +74,13 @@ public class SnapshotIncrementalCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/GetRemoteStateCommand.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/GetRemoteStateCommand.java
@@ -59,12 +59,13 @@ public class GetRemoteStateCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/PutRemoteStateCommand.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/PutRemoteStateCommand.java
@@ -60,12 +60,13 @@ public class PutRemoteStateCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;
 

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/StateCommandUtils.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/StateCommandUtils.java
@@ -17,6 +17,7 @@
 
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.amazonaws.auth.profile.ProfilesConfigFile;
 import com.amazonaws.client.builder.AwsClientBuilder;
@@ -67,13 +68,14 @@ private StateCommandUtils() {}
    */
   public static AmazonS3 createS3Client(
       String bucketName, String region, String credsFile, String credsProfile, int maxRetry) {
-    ProfilesConfigFile profilesConfigFile = null;
+    AWSCredentialsProvider awsCredentialsProvider;
     if (credsFile != null) {
       Path botoCfgPath = Paths.get(credsFile);
-      profilesConfigFile = new ProfilesConfigFile(botoCfgPath.toFile());
+      ProfilesConfigFile profilesConfigFile = new ProfilesConfigFile(botoCfgPath.toFile());
+      awsCredentialsProvider = new ProfileCredentialsProvider(profilesConfigFile, credsProfile);
+    } else {
+      awsCredentialsProvider = new DefaultAWSCredentialsProviderChain();
     }
-    AWSCredentialsProvider awsCredentialsProvider =
-        new ProfileCredentialsProvider(profilesConfigFile, credsProfile);
 
     String clientRegion;
     if (region == null) {

diff --git a/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/UpdateGlobalIndexStateCommand.java b/src/main/java/com/yelp/nrtsearch/tools/nrt_utils/state/UpdateGlobalIndexStateCommand.java
@@ -59,12 +59,13 @@ public class UpdateGlobalIndexStateCommand implements Callable<Integer> {
 
   @CommandLine.Option(
       names = {"-c", "--credsFile"},
-      description = "File holding AWS credentials, uses default locations if not set")
+      description =
+          "File holding AWS credentials, uses default locations if not set; Will use DefaultCredentialProvider if this is unset.")
   private String credsFile;
 
   @CommandLine.Option(
       names = {"-p", "--credsProfile"},
-      description = "Profile to use from creds file",
+      description = "Profile to use from creds file; Neglected when credsFile is unset.",
       defaultValue = "default")
   private String credsProfile;