fix the get credential scheduled configuration. wip on terraform

NASA-PDS · Jul 10, 2024 · bdbec83 · bdbec83
1 parent 0a2bfb3
commit bdbec83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/SpringBootMain.java b/service/src/main/java/gov/nasa/pds/api/registry/SpringBootMain.java
@@ -7,6 +7,7 @@
 import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
@@ -17,6 +18,7 @@
 
 @SpringBootApplication
 @OpenAPIDefinition
+@EnableScheduling
 @ComponentScan(basePackages = {"gov.nasa.pds.api.registry.configuration",
     "gov.nasa.pds.api.registry.controllers", "gov.nasa.pds.api.registry.model",
     "gov.nasa.pds.api.registry.search", "javax.servlet.http"})

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/util/AWSCredentialsFetcher.java b/service/src/main/java/gov/nasa/pds/api/registry/util/AWSCredentialsFetcher.java
@@ -8,8 +8,7 @@
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
 import org.springframework.scheduling.annotation.Scheduled;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -55,8 +54,7 @@ public String getExpiration() {
 }
 
 
-@Configuration
-@EnableScheduling
+@Component
 public class AWSCredentialsFetcher {
 
   private static final Logger log = LoggerFactory.getLogger(AWSCredentialsFetcher.class);
@@ -86,6 +84,7 @@ public void fetchCredentials() {
         awsCredProperties.setProperty("aws.secretAccessKey", awsCredentials.getSecretAccessKey());
         awsCredProperties.setProperty("aws.sessionToken", awsCredentials.getToken());
         System.setProperties(awsCredProperties);
+        log.info("Expiration of the AWS token is scheduled in " + awsCredentials.expiration);
       } catch (IOException e) {
         log.error("Unable to get or renew AWS Credentials", e);
       }

diff --git a/terraform/ecs.tf b/terraform/ecs.tf
@@ -116,12 +116,12 @@ EOF
 
 resource "aws_lb" "registry-api-lb" {
   name               = "registry-api-lb-new"
-  internal           = true
+  internal           = false
   load_balancer_type = "application"
   security_groups    = var.aws_fg_security_groups
   subnets            = var.aws_fg_subnets
 
-  enable_deletion_protection = true
+  enable_deletion_protection = false
 
   access_logs {
     bucket  = var.aws_s3_bucket_logs_id