mirror of
https://github.com/google/nomulus
synced 2026-01-04 20:24:22 +00:00
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.
This commit is contained in:
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user