exploring instance metadata

neo-technology · Feb 1, 2024 · 64aa169 · 64aa169
1 parent 0213885
commit 64aa169
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/cloudformation/neo4j.template.yaml b/cloudformation/neo4j.template.yaml
@@ -552,7 +552,7 @@ Resources:
             - "    echo \"dbms.cluster.minimum_initial_system_primaries_count=${nodeCount}\" >> /etc/neo4j/neo4j.conf\n"
             - "    echo \"dbms.cluster.discovery.resolver_type=EC2-ASG\" >> /etc/neo4j/neo4j.conf\n"
             - "    echo \"dbms.cluster.discovery.aws.asg_name=$stackName\" >> /etc/neo4j/neo4j.conf\n"
-            - "    echo \"dbms.cluster.discovery.aws.region=$region\" >> /etc/neo4j/neo4j.conf\n"
+            - "    echo \"initial.dbms.automatically_enable_free_servers=true\" >> /etc/neo4j/neo4j.conf\n"
             - "  fi\n"
             - "  neo4j-admin server memory-recommendation >> /etc/neo4j/neo4j.conf\n"
             - "}\n"

diff --git a/src/main/java/cs/neo4j/AsgResolver.java b/src/main/java/cs/neo4j/AsgResolver.java
@@ -57,9 +57,9 @@ protected void internalInit(Config config, LogService logService, DependencyReso
 
     private AwsClient instantiateAwsClient(String accessKey, String secretKey, String region, Ec2Settings.AddressType addressType) {
         if (accessKey != null  && secretKey != null) {
-            return new AwsClient(accessKey, secretKey, region, addressType);
+            return new AwsClient(accessKey, secretKey, region, addressType, log);
         } else {
-            return new AwsClient(region, addressType);
+            return new AwsClient(region, addressType, log);
         }
     }
 
@@ -81,7 +81,7 @@ protected Stream<SocketAddress> resolveInternal() {
     @Override
     protected String configDescription() {
         return format(
-                "{awsRegion:'%s',ASG name:'%s'}",
+                "{awsRegion:'%s', ASG name:'%s'}",
                 awsRegion, selector);
     }
 

diff --git a/src/main/java/cs/neo4j/AwsClient.java b/src/main/java/cs/neo4j/AwsClient.java
@@ -5,6 +5,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.neo4j.logging.InternalLog;
+import org.neo4j.logging.internal.LogService;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
@@ -27,21 +29,23 @@ public class AwsClient extends LifecycleAdapter {
     private static String region;
     private static Ec2Settings.AddressType addressType;
 
-
+    private InternalLog log;
     private AutoScalingClient autoScalingClient;
     private Ec2Client ec2Client;
 
-    public AwsClient(String region, Ec2Settings.AddressType addressType) {
+    public AwsClient(String region, Ec2Settings.AddressType addressType, InternalLog log) {
         this.region=region;
         this.addressType=addressType;
+        this.log=log;
         createClients();
     }
 
-    public AwsClient(String accessKey, String secretKey, String region, Ec2Settings.AddressType addressType) {
+    public AwsClient(String accessKey, String secretKey, String region, Ec2Settings.AddressType addressType, InternalLog log) {
         this.accessKey=accessKey;
         this.secretKey=secretKey;
         this.region=region;
         this.addressType=addressType;
+        this.log=log;
 
         createClients();
     }
@@ -68,7 +72,7 @@ private void createClients(){
             Ec2MetadataClient imdsClient = Ec2MetadataClient.builder()
                     .build();
             Ec2MetadataResponse metadataResponse = imdsClient.get("/latest/meta-data/");
-            System.out.println(metadataResponse.asString());
+            log.info(metadataResponse.asString());
         }
 
     }