From 93e797b810c051e19a3f27e94e7522b9bd730d8f Mon Sep 17 00:00:00 2001 From: Angelo Rodriguez Date: Wed, 29 Apr 2020 15:00:05 -0400 Subject: [PATCH] [OOE-5] Excecption occurs when deployment name not provided to quality report --- .../plugins/bamboo/configuration/TaskConfiguration.java | 4 ---- src/main/resources/templates/editTaskConfig.ftl | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/overops/plugins/bamboo/configuration/TaskConfiguration.java b/src/main/java/com/overops/plugins/bamboo/configuration/TaskConfiguration.java index a2f7ec1..b2a488f 100644 --- a/src/main/java/com/overops/plugins/bamboo/configuration/TaskConfiguration.java +++ b/src/main/java/com/overops/plugins/bamboo/configuration/TaskConfiguration.java @@ -136,10 +136,6 @@ public void validate(ActionParametersMap params, ErrorCollection errorCollection errorCollection.addError(Const.ENV_ID, "Invalid environment ID"); } - if ((params.getString(Const.APP_NAME).trim().length() == 0) && (params.getString(Const.DEP_NAME).trim().length() == 0)) { - errorCollection.addError(Const.APP_NAME, "Must provide an Application Name, or a Deployment Name, or both."); - } - // validate total errors validNumber(Const.TOP_ERROR_COUNT); validNumber(Const.MAX_ERROR_VOLUME, Const.CHECK_VOLUME_ERRORS); diff --git a/src/main/resources/templates/editTaskConfig.ftl b/src/main/resources/templates/editTaskConfig.ftl index 548e80b..249b7be 100644 --- a/src/main/resources/templates/editTaskConfig.ftl +++ b/src/main/resources/templates/editTaskConfig.ftl @@ -43,8 +43,8 @@

General settings

[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.envId" name="envId" required="false" description="The OverOps environment identifier (e.g S12345). If blank, the default value is used."/] -[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.applicationName" name="applicationName" required="false" description="(Optional) Application Name as specified in OverOps. If blank, a Deployment Name must be provided."/] -[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.deploymentName" name="deploymentName" required="false" description="(Optional) Deployment Name as specified in OverOps. If blank, an Application Name must be provided. See: Bamboo variables"/] +[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.applicationName" name="applicationName" required="false" description="(Optional) Application Name as specified in OverOps."/] +[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.deploymentName" name="deploymentName" required="false" description="(Optional) Deployment Name as specified in OverOps. See: Bamboo variables"/]
[@ww.textfield labelKey="com.overops.plugins.bamboo.task.config.regexFilter" name="regexFilter" required="false" description="(Optional) Ignore specific event types when generating the OverOps Reliability report. Event types include: Uncaught Exception, Caught Exception, Swallowed Exception, Logged Error, Logged Warning, Timer. For example: \"type\":\"s*(Logged Error|Logged Warning|Timer)\"" /]