refactor: into own packages

service/src/main/java/bio/terra/appmanager/App.java

@@ -29,24 +29,26 @@
       "bio.terra.common.retry.transaction",
       // Scan for tracing-related components & configs
       "bio.terra.common.tracing",
+      // Event-driven architecture related configs
+      "bio.terra.common.events",
       // Scan all service-specific packages beneath the current package
       "bio.terra.appmanager"
     })
-@ConfigurationPropertiesScan("bio.terra.appmanager")
+@ConfigurationPropertiesScan({"bio.terra.common.events", "bio.terra.appmanager"})
 @EnableRetry
 @EnableTransactionManagement
 @EnableConfigurationProperties
 public class App {
-  public static void main(String[] args) {
-    new SpringApplicationBuilder(App.class).initializers(new LoggingInitializer()).run(args);
-  }
-
   private final DataSource dataSource;
 
   public App(DataSource dataSource) {
     this.dataSource = dataSource;
   }
 
+  public static void main(String[] args) {
+    new SpringApplicationBuilder(App.class).initializers(new LoggingInitializer()).run(args);
+  }
+
   @Bean("objectMapper")
   public ObjectMapper objectMapper() {
     return new ObjectMapper()

service/src/main/java/bio/terra/appmanager/config/ChartPublisherConfig.java

@@ -1,5 +1,8 @@
 package bio.terra.appmanager.config;
 
+import bio.terra.common.events.config.GooglePublisherConfiguration;
+import bio.terra.common.events.config.PubsubBeeConfig;
+import bio.terra.common.events.config.PubsubGoogleConfig;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -20,6 +23,9 @@ public String getBaseName() {
 
   @Override
   public String getTopicId() {
+    System.out.println("name:      " + beeConfig.name());
+    System.out.println("is_active: " + beeConfig.isActive());
+
     if (beeConfig.isActive()) {
       return getBaseName() + "-" + beeConfig.name();
     } else {

service/src/main/java/bio/terra/appmanager/dao/PublisherDao.java

@@ -1,6 +1,6 @@
 package bio.terra.appmanager.dao;
 
-import bio.terra.appmanager.config.GooglePublisherConfiguration;
+import bio.terra.common.events.config.GooglePublisherConfiguration;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutureCallback;
 import com.google.api.core.ApiFutures;

service/src/main/java/bio/terra/appmanager/config/GooglePublisherConfiguration.java → service/src/main/java/bio/terra/common/events/config/GooglePublisherConfiguration.java

@@ -1,4 +1,4 @@
-package bio.terra.appmanager.config;
+package bio.terra.common.events.config;
 
 public interface GooglePublisherConfiguration {
   String getBaseName();

service/src/main/java/bio/terra/appmanager/config/PubsubBeeConfig.java → service/src/main/java/bio/terra/common/events/config/PubsubBeeConfig.java

@@ -1,6 +1,6 @@
-package bio.terra.appmanager.config;
+package bio.terra.common.events.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "appmanager.pubsub.bee")
+@ConfigurationProperties(prefix = "terra.common.pubsub.bee")
 public record PubsubBeeConfig(String name, Boolean isActive) {}

service/src/main/java/bio/terra/appmanager/config/PubsubConfig.java → service/src/main/java/bio/terra/common/events/config/PubsubConfig.java

@@ -1,5 +1,6 @@
-package bio.terra.appmanager.config;
+package bio.terra.common.events.config;
 
+import bio.terra.appmanager.config.ChartPublisherConfig;
 import bio.terra.appmanager.dao.EventTopicName;
 import bio.terra.appmanager.dao.TopicCreatorFactory;
 import com.google.cloud.pubsub.v1.Publisher;
@@ -16,6 +17,10 @@ public class PubsubConfig {
   @Bean
   public EventTopicName getEventTopicName(
       PubsubBeeConfig beeConfig, PubsubGoogleConfig googleConfig) {
+
+    System.out.println("name:      " + beeConfig.name());
+    System.out.println("is_active: " + beeConfig.isActive());
+
     if (beeConfig.isActive()) {
       return TopicCreatorFactory.createCreateEventTopicIfNotExist(googleConfig.projectId());
     } else {

service/src/main/java/bio/terra/appmanager/config/PubsubGoogleConfig.java → service/src/main/java/bio/terra/common/events/config/PubsubGoogleConfig.java

@@ -1,6 +1,6 @@
-package bio.terra.appmanager.config;
+package bio.terra.common.events.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "appmanager.pubsub.google")
+@ConfigurationProperties(prefix = "terra.common.pubsub.google")
 public record PubsubGoogleConfig(String projectId) {}

service/src/main/resources/application.yml

@@ -2,12 +2,11 @@
 # This is for deployment-specific values, which may be managed by other teams
 
 env:
-  pubsub:
-    google:
-      projectId: ${SERVICE_GOOGLE_PROJECT:broad-dsde-dev}
-    bee:
-      name: ${BEE_NAME:notabeeenv}
-      isActive: ${IS_BEE:false}
+  google:
+    project_id: ${SERVICE_GOOGLE_PROJECT:broad-dsde-dev}
+  bee:
+    name: ${BEE_NAME:notabeeenv}
+    is_active: ${IS_BEE:false}
   admin:
     service_accounts_for_read: ${SERVICE_ACCOUNT_ADMINS_FOR_READ:test@readnowhere.com}
     service_accounts_for_write: ${SERVICE_ACCOUNT_ADMINS_FOR_WRITE:test@writenowhere.com}
@@ -74,6 +73,15 @@ management:
       exposure:
         include: "*"
 
+terra:
+  common:
+    pubsub:
+      google:
+        project_id: ${env.google.project_id}
+      bee:
+        is_active: ${env.bee.is_active}
+        name: ${env.bee.name}
+
 appmanager:
   admin:
     service_accounts_for_read: ${env.admin.service_accounts_for_read}
@@ -102,13 +110,6 @@ appmanager:
   sam:
     basePath: ${env.sam.basePath}
 
-  pubsub:
-    google:
-      projectId: ${env.pubsub.google.projectId}
-    bee:
-      name: ${env.pubsub.bee.name}
-      isActive: ${env.pubsub.bee.isActive}
-
 terra.common:
   kubernetes:
     inKubernetes: false