From f7b243e39097bccda89d8330e393fca433b35b9e Mon Sep 17 00:00:00 2001
From: Weimin Yu <weiminyu@google.com>
Date: Tue, 10 Dec 2019 11:39:56 -0500
Subject: [PATCH] Make devProject a project property (#405)

* Make devProject a project property

Properties set in rootProject's ext block are not overridden by
commandline flags.

* Make flyway commands runnable from FOSS repo

rootProject.devProject, defined in projects.gradle, cannot be
overridden by commandline flags. Added a flag check in :db's
project script.
---
 db/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/db/build.gradle b/db/build.gradle
index f394caa9e..0eb0b05a6 100644
--- a/db/build.gradle
+++ b/db/build.gradle
@@ -71,14 +71,16 @@ ext {
   // production. The role parameter may be superuser. (More roles will be added
   // later).
   getCloudSqlCredential = { env, role ->
+    def devProject = project.hasProperty('devProject')
+        ? project.getProperty('devProject') : rootProject.devProject
     def command =
         """gsutil cp \
-           gs://${rootProject.devProject}-deploy/cloudsql-credentials/${env}/${role}_credential.enc - | \
+           gs://${devProject}-deploy/cloudsql-credentials/${env}/${role}_credential.enc - | \
            base64 -d | \
            gcloud kms decrypt --location global --keyring nomulus-tool-keyring \
            --key nomulus-tool-key --plaintext-file=- \
            --ciphertext-file=- \
-           --project=${rootProject.devProject}"""
+           --project=${devProject}"""
 
     return execInBash(command, '/tmp')
   }
@@ -157,6 +159,7 @@ dependencies {
   testCompile project(':third_party')
 }
 
+flywayInfo.dependsOn('buildNeeded')
 flywayValidate.dependsOn('buildNeeded')
 
 if (ext.isCloudSql()) {