From 3a6e55f2da04710050fd5d470bf51ba7b08e7011 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Fri, 22 Nov 2019 16:20:07 -0500 Subject: [PATCH] Make dev project configurable (#371) * Make dev project configurable We should not hardcode our dev project in the public config file. * Remove the use of .ext when using external properties They are only needed when defining properties. --- db/build.gradle | 4 ++-- java_common.gradle | 6 +++--- projects.gradle | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/db/build.gradle b/db/build.gradle index 603abe3ec..f394caa9e 100644 --- a/db/build.gradle +++ b/db/build.gradle @@ -73,12 +73,12 @@ ext { getCloudSqlCredential = { env, role -> def command = """gsutil cp \ - gs://domain-registry-dev-deploy/cloudsql-credentials/${env}/${role}_credential.enc - | \ + gs://${rootProject.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=domain-registry-dev""" + --project=${rootProject.devProject}""" return execInBash(command, '/tmp') } diff --git a/java_common.gradle b/java_common.gradle index 71e05c0a9..07453cf4a 100644 --- a/java_common.gradle +++ b/java_common.gradle @@ -94,8 +94,8 @@ task initCoverageMinimums { ].asImmutable() rootProject.ext.getMinCoverage = { key -> - if (rootProject.ext.coverageMinimums.containsKey(key)) { - return rootProject.ext.coverageMinimums.get(key) + if (rootProject.coverageMinimums.containsKey(key)) { + return rootProject.coverageMinimums.get(key) } return 0.0 } @@ -117,7 +117,7 @@ jacocoTestCoverageVerification { // or MISSEDRATIO // - The 'minimum' threshold, given as a fraction or a percentage (including '%') limit { - minimum = rootProject.ext.getMinCoverage(project.getName()) + minimum = rootProject.getMinCoverage(project.getName()) } } } diff --git a/projects.gradle b/projects.gradle index d09bf095b..72b8b6cc3 100644 --- a/projects.gradle +++ b/projects.gradle @@ -15,7 +15,12 @@ // Mapping from environment names to GCP projects. // Replace the values with the names of your deployment environments. +// The projects to run your deployment Nomulus application. rootProject.ext.projects = ['production': 'your-production-project', 'sandbox' : 'your-sandbox-project', 'alpha' : 'your-alpha-project', 'crash' : 'your-crash-project'] + +// The project to host your development/deployment infrastructure. It hosts +// things like release artifacts, CI/CD system, etc. +rootProject.ext.devProject = 'your-dev-project'