made key & secret settings not mandatory

neo-technology · Jan 31, 2024 · 996d3c3 · 996d3c3
1 parent 1591bad
commit 996d3c3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git 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
@@ -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