Merge pull request #2310 from dcos/ph/fix/healtcheck-validator

fix(appValidators): Remove Healthchecks validators
dcos · Jul 19, 2017 · bbbd887 · bbbd887
2 parents 836b2b5 + f1ed1ed
commit bbbd887
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 82 deletions.
diff --git a/plugins/services/src/js/components/modals/NewCreateServiceModal.js b/plugins/services/src/js/components/modals/NewCreateServiceModal.js
@@ -100,9 +100,6 @@ const APP_VALIDATORS = [
   MarathonAppValidators.validateConstraints,
   MarathonAppValidators.validateLabels,
   MarathonAppValidators.mustNotContainUris,
-  MarathonAppValidators.mustNotContainMarathonHTTPSHealthChecks,
-  MarathonAppValidators.mustNotContainMarathonHTTPHealthChecks,
-  MarathonAppValidators.mustNotContainMarathonTCPHealthChecks,
   VipLabelsValidators.mustContainPort
 ];
 

diff --git a/plugins/services/src/js/validators/MarathonAppValidators.js b/plugins/services/src/js/validators/MarathonAppValidators.js
@@ -1,6 +1,5 @@
 import ValidatorUtil from "#SRC/js/utils/ValidatorUtil";
 import { findNestedPropertyInObject } from "#SRC/js/utils/Util";
-import { HTTP, HTTPS, TCP } from "../constants/HealthCheckProtocols";
 import {
   PROP_CONFLICT,
   PROP_DEPRECATED,
@@ -172,84 +171,6 @@ const MarathonAppValidators = {
     return [];
   },
 
-  /**
-   * @param {Object} app - The data to validate
-   * @returns {Array} Returns an array with validation errors
-   */
-  mustNotContainMarathonHTTPHealthChecks(app) {
-    if (
-      ValidatorUtil.isDefined(app.healthChecks) &&
-      app.healthChecks.find(function(healthCheck) {
-        return HTTP === healthCheck.protocol;
-      })
-    ) {
-      const message =
-        "Marathon protocols `HTTP` deprecated. Please use" +
-        " `MESOS_HTTP instead";
-      const type = PROP_DEPRECATED;
-      const variables = {
-        name: "healthChecks"
-      };
-
-      return [{ path: ["healthChecks"], message, type, variables }];
-    }
-
-    // No errors
-    return [];
-  },
-
-  /**
-   * @param {Object} app - The data to validate
-   * @returns {Array} Returns an array with validation errors
-   */
-  mustNotContainMarathonHTTPSHealthChecks(app) {
-    if (
-      ValidatorUtil.isDefined(app.healthChecks) &&
-      app.healthChecks.find(function(healthCheck) {
-        return HTTPS === healthCheck.protocol;
-      })
-    ) {
-      const message =
-        "Marathon protocols `HTTPS` deprecated. Please use" +
-        " `MESOS_HTTPS instead";
-      const type = PROP_DEPRECATED;
-      const variables = {
-        name: "healthChecks"
-      };
-
-      return [{ path: ["healthChecks"], message, type, variables }];
-    }
-
-    // No errors
-    return [];
-  },
-
-  /**
-   * @param {Object} app - The data to validate
-   * @returns {Array} Returns an array with validation errors
-   */
-  mustNotContainMarathonTCPHealthChecks(app) {
-    if (
-      ValidatorUtil.isDefined(app.healthChecks) &&
-      app.healthChecks.find(function(healthCheck) {
-        return TCP === healthCheck.protocol;
-      })
-    ) {
-      const message =
-        "Marathon protocols `TCP` deprecated. Please use" +
-        " `MESOS_TCP instead";
-      const type = PROP_DEPRECATED;
-      const variables = {
-        name: "healthChecks"
-      };
-
-      return [{ path: ["healthChecks"], message, type, variables }];
-    }
-
-    // No errors
-    return [];
-  },
-
   validateConstraints(app) {
     const constraints = findNestedPropertyInObject(app, "constraints") || [];
     if (constraints != null && !Array.isArray(constraints)) {