Issue 21 (#23)

disneystreaming · Apr 10, 2019 · 9da7058 · 9da7058
1 parent 27b1ce1
commit 9da7058
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Then run the command below.
 ```
 docker run -v /path/to/.aws/creds/:/aws_creds 
 disneystreaming/pg2k4j 
---awsconfiglocation=/aws_creds
+--awsconfiglocation=/aws_creds --awsprofile=default
 --pgdatabase=<your_postgres_db> --pghost=<your_postgres_host> --pguser=<your_postgres_user> --pgpassword=<your_postgres_pw> 
 --streamname=<your_kinesis_streamname>
 ``` 

diff --git a/src/main/java/com/disneystreaming/pg2k4j/CommandLineRunner.java b/src/main/java/com/disneystreaming/pg2k4j/CommandLineRunner.java
@@ -90,7 +90,9 @@ public static void main(final String[] args) {
     @CommandLine.Option(
             names = {"--awsprofile"},
             description = "AWS Profile to use for accessing the Kinesis Stream."
-                    + " If one is provided a ProfileCredentialProvider will"
+                    + " --awsconfiglocation must also be provided when"
+                    + " using --awsprofile."
+                    + " If these are provided a ProfileCredentialProvider will"
                     + " be used for interacting with AWS. Otherwise the"
                     + " DefaultAWSCredentialsProviderChain will be used."
     )
@@ -99,7 +101,9 @@ public static void main(final String[] args) {
     @CommandLine.Option(
             names = {"--awsconfiglocation"},
             description = "File path to use for sourcing AWS config."
-                    + " If one is provided a ProfileCredentialProvider will"
+                    + " --awsprofile must also be provided when"
+                    + " using --awsconfiglocation."
+                    + " If these are provided a ProfileCredentialProvider will"
                     + " be used for interacting with AWS. Otherwise the"
                     + " DefaultAWSCredentialsProviderChain will be used."
     )
@@ -108,14 +112,14 @@ public static void main(final String[] args) {
     @CommandLine.Option(
             names = {"--awsaccesskey"},
             description = "Access key to use for accessing AWS Kinesis Stream."
-                    + "If provided, awsSecretKey (-f) must also be provided."
+                    + "If provided, --awssecret must also be provided."
     )
     private String awsAccessKey;
 
     @CommandLine.Option(
             names = {"--awssecret"},
             description = "Access secret to use for accessing AWS Kinesis "
-                    + " Stream. If provided, awsAccessKey (-e)"
+                    + " Stream. If provided, --awsaccesskey"
                     + " must also be provided."
     )
     private String awsSecretKey;
@@ -201,7 +205,7 @@ public static void main(final String[] args) {
     private boolean usageHelpRequested;
 
     private AWSCredentialsProvider getAwsCredentialsProvider() {
-        if (awsProfile != null || awsConfigLocation != null) {
+        if (awsProfile != null && awsConfigLocation != null) {
             final String profile = makeProfile(awsProfile);
             return new ProfileCredentialsProvider(awsConfigLocation, profile);
         } else if (awsAccessKey != null && awsSecretKey != null) {