mirror of
https://github.com/google/nomulus.git
synced 2025-08-06 01:35:17 +02:00
Improve error handling for environment property (#295)
* Improve error handling for environment property Improve the error messages that we get for a bad or missing environment property. Move the property processing into the main build so that we do it only once and configure all of the appengine deployment tasks to check that a project has been defined and print a friendly error if it hasn't. Note that even if the check isn't configured, this change prevents deployment because the gcpProject will be set to null. It just won't print as useful an error message. Tested: ran appengineDeployAll with and without the environment property, ran "build" to verify that we don't get any complaints for non-deployment targets. * Changes for review. * Changes for review * Changes for review. * Changes for review.
This commit is contained in:
parent
430cd109f9
commit
98a83eb490
4 changed files with 72 additions and 49 deletions
|
@ -12,7 +12,6 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
apply from: "${rootDir.path}/projects.gradle"
|
||||
apply plugin: 'war'
|
||||
|
||||
def environment = rootProject.environment
|
||||
|
@ -68,6 +67,10 @@ appengine {
|
|||
if (!rootProject.prodOrSandboxEnv) {
|
||||
version = 'GCLOUD_CONFIG'
|
||||
}
|
||||
|
||||
// Don't set gcpProject directly, it gets overriden in ./build.gradle.
|
||||
// Do -P environment={crash,alpha} instead. For sandbox/production,
|
||||
// use Spinnaker.
|
||||
projectId = gcpProject
|
||||
}
|
||||
}
|
||||
|
@ -92,4 +95,15 @@ explodeWar.doLast {
|
|||
|
||||
rootProject.deploy.dependsOn appengineDeployAll
|
||||
rootProject.stage.dependsOn appengineStage
|
||||
appengineDeployAll.dependsOn rootProject.verifyDeployment
|
||||
|
||||
// Impose verification for all of the deployment tasks. We haven't found a
|
||||
// better way to do this other than to apply to each of them independently.
|
||||
// If a new task gets added, it will still fail if "environment" is not defined
|
||||
// because gcpProject is null. We just won't get as friendly an error message.
|
||||
appengineDeployAll.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeploy.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeployCron.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeployDispatch.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeployDos.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeployIndex.configure rootProject.verifyDeploymentConfig
|
||||
appengineDeployQueue.configure rootProject.verifyDeploymentConfig
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue