Load database config from environment

Author: pabloalba

.gitignore

@@ -10,4 +10,5 @@ out/
 *.iws
 .project
 .settings
-.classpath
+.classpath
+src/main/resources/application.yml

buildSrc/src/main/groovy/dwbh/gradle/FixturesPlugin.groovy

@@ -49,31 +49,33 @@ class FixturesPlugin implements Plugin<Project> {
 
         project.afterEvaluate {
             FixturesExtension extension = project
-                    .extensions
-                    .getByType(FixturesExtension)
+                .extensions
+                .getByType(FixturesExtension)
 
             File configFile = Optional
-                    .ofNullable(extension.configFile)
-                    .map { project.file(it) }
-                    .orElse(DEFAULT_CONFIG_FILE)
+                .ofNullable(extension.configFile)
+                .map { project.file(it) }
+                .orElse(DEFAULT_CONFIG_FILE)
 
             File loadDir = Optional
-                    .ofNullable(extension.loadDir)
-                    .map { project.file(it) }
-                    .orElse(DEFAULT_LOAD_DIR)
+                .ofNullable(extension.loadDir)
+                .map { project.file(it) }
+                .orElse(DEFAULT_LOAD_DIR)
 
             File cleanDir = Optional.ofNullable(extension.cleanDir)
-                    .map { project.file(it) }
-                    .orElse(DEFAULT_CLEAN_DIR)
+                .map { project.file(it) }
+                .orElse(DEFAULT_CLEAN_DIR)
 
             project.tasks.getByName('fixtures-load').configure { FixturesTask t ->
                 t.inputDir = loadDir
                 t.configFile = configFile
+                t.isClean = false
             }
 
             project.tasks.getByName('fixtures-clean').configure { FixturesTask t ->
                 t.inputDir = cleanDir
                 t.configFile = configFile
+                t.isClean = true
             }
         }
     }

buildSrc/src/main/groovy/dwbh/gradle/FixturesTask.groovy

@@ -37,6 +37,14 @@ class FixturesTask extends DefaultTask {
     @InputFile
     File configFile
 
+    /**
+     * Indicates if it is a clean operation
+     *
+     * @since 0.1.0
+     */
+    boolean isClean = false
+
+
     /**
      * Task entry point
      *
@@ -45,12 +53,16 @@ class FixturesTask extends DefaultTask {
     @TaskAction
     void createFixtures() {
         logger.lifecycle "------------------${this.name.toUpperCase()}-----------------"
-        
+
         File[] sqlFiles = inputDir
-                .listFiles(FixturesUtils.onlySqlFiles)
-                .sort()
+            .listFiles(FixturesUtils.onlySqlFiles)
+            .sort()
+
+        if (isClean) {
+            sqlFiles = sqlFiles.reverse()
+        }
 
-        Map<String,?> dbConfig = FixturesUtils.loadYaml(configFile)
+        Map<String, ?> dbConfig = FixturesUtils.loadYaml(configFile)
         SqlProcessor processor = new SqlProcessor(dbConfig, sqlFiles, logger)
 
         processor.process()

etc/fixtures/clean/01-groups.sql

@@ -1 +1 @@
-TRUNCATE groups;
+delete from groups;

etc/fixtures/clean/02-users.sql

@@ -1,2 +1,2 @@
-TRUNCATE users_groups;
-TRUNCATE users;
+delete from users;
+

etc/fixtures/clean/03-users_groups.sql

@@ -0,0 +1,2 @@
+truncate users_groups;
+

src/main/java/dwbh/api/services/AwsSesMailService.java

@@ -9,9 +9,9 @@
 import com.amazonaws.services.simpleemail.model.Message;
 import com.amazonaws.services.simpleemail.model.SendEmailRequest;
 import com.amazonaws.services.simpleemail.model.SendEmailResult;
-import dwbh.api.util.Config;
 import dwbh.api.util.Email;
 import io.micronaut.context.annotation.Primary;
+import io.micronaut.context.annotation.Value;
 import javax.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,10 +40,13 @@ public class AwsSesMailService implements EmailService {
    * @param config server configuration
    * @since 0.1.0
    */
-  public AwsSesMailService(AWSCredentialsProvider credentialsProvider, Config config) {
+  public AwsSesMailService(
+      AWSCredentialsProvider credentialsProvider,
+      @Value("${aws.region:none}") String awsRegion,
+      @Value("${aws.sourceEmail:none}") String sourceEmail) {
     this.credentialsProvider = credentialsProvider;
-    this.awsRegion = config.get("awsRegion");
-    this.sourceEmail = config.get("awsSourceEmail");
+    this.awsRegion = awsRegion;
+    this.sourceEmail = sourceEmail;
   }
 
   private Body bodyOfEmail(Email email) {

src/main/java/dwbh/api/util/Config.java

@@ -3,6 +3,7 @@
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
+import io.micronaut.context.annotation.Value;
 import javax.inject.Singleton;
 
 /**
@@ -21,9 +22,11 @@ public class DwbhAwsCredentialsProvider implements AWSCredentialsProvider {
    * @param config configuration providing access key and secret key
    * @since 0.1.0
    */
-  public DwbhAwsCredentialsProvider(Config config) {
-    this.accessKey = config.get("awsAccessKey");
-    this.secretKey = config.get("awsSecretKey");
+  public DwbhAwsCredentialsProvider(
+      @Value("${aws.accessKey:none}") String awsAccessKey,
+      @Value("${aws.secretKey:none}") String awsSecretKey) {
+    this.accessKey = awsAccessKey;
+    this.secretKey = awsSecretKey;
   }
 
   @Override

src/main/java/dwbh/api/util/DwbhAwsCredentialsProvider.java

@@ -0,0 +1,26 @@
+micronaut:
+  application:
+    name: dwbh-api
+
+datasources:
+  default:
+    url: ${DWBH_JDBC_URL}
+    username: ${DWBH_JDBC_USER}
+    password: ${DWBH_JDBC_PASSWORD}
+    driverClassName: ${DWBH_JDBC_DRIVER}
+
+
+flyway:
+  datasources:
+    default:
+      locations: classpath:migrations
+
+graphql:
+  enabled: true
+  path: /graphql
+
+aws:
+  sourceemail: ${DWBH_AWS_SOURCE_EMAIL}
+  region: ${DWBH_AWS_REGION}
+  accessKey: ${DWBH_ACCESS_KEY}
+  secretKey: ${DWBH_SECRET_KEY}

src/main/resources/application.prod.yml

@@ -9,6 +9,7 @@ datasources:
     password: dwbh
     driverClassName: org.postgresql.Driver
 
+
 flyway:
   datasources:
     default:
@@ -19,7 +20,7 @@ graphql:
   path: /graphql
 
 aws:
-  sourceemail: [email protected]
+  sourceemail: [email protected]
   region: eu-west-1
   accessKey: XXX
   secretKey: YYY