From 996d3c34208ad4330b9ab0c444fb0ca0d531cbc8 Mon Sep 17 00:00:00 2001
From: David Pecollet <david.pecollet@gmail.com>
Date: Wed, 31 Jan 2024 15:52:23 +0000
Subject: [PATCH] made key & secret settings not mandatory

---
 pom.xml                                 |  2 +-
 src/main/java/cs/neo4j/AsgResolver.java | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f0c8b2..19ac5c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.neo4j</groupId>
     <artifactId>aws-ec2-asg-discovery</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/java/cs/neo4j/AsgResolver.java b/src/main/java/cs/neo4j/AsgResolver.java
index 16f9d11..2f3b9e7 100644
--- a/src/main/java/cs/neo4j/AsgResolver.java
+++ b/src/main/java/cs/neo4j/AsgResolver.java
@@ -34,18 +34,29 @@ public String name() {
 
     @Override
     protected void internalInit(Config config, LogService logService, DependencyResolver externalDependencies) {
+        log = logService.getUserLog(AsgResolver.class);
+        log.info("Init of discovery plugin "+this.configDescription());
+
+        discoveryPort = checkConfig(config, DiscoverySettings.discovery_listen_address).getPort();
+
         selector = checkConfig(config, Ec2Settings.asg_name);
-        awsKey = checkConfig(config, Ec2Settings.aws_key);
-        awsSecret = checkConfig(config, Ec2Settings.aws_secret);
         awsRegion = checkConfig(config, Ec2Settings.aws_region);
 
-        discoveryPort = checkConfig(config, DiscoverySettings.discovery_listen_address).getPort();
+        awsKey = config.get(Ec2Settings.aws_key);
+        awsSecret = config.get(Ec2Settings.aws_secret);
 
-        log = logService.getUserLog(AsgResolver.class);
-        log.info("Init of discovery plugin "+this.configDescription());
         awsClient = externalDependencies.containsDependency(AwsClient.class)
                 ? externalDependencies.resolveDependency(AwsClient.class)
-                : new AwsClient(awsKey, awsSecret, awsRegion);
+                : instantiateAwsClient(awsKey, awsSecret, awsRegion);
+
+    }
+
+    private AwsClient instantiateAwsClient(String accessKey, String secretKey, String region) {
+        if (accessKey != null  && secretKey != null) {
+            return new AwsClient(accessKey, secretKey, region);
+        } else {
+            return new AwsClient(region);
+        }
     }
 
     @Override