From e45da6c8230e14681b125ef8e6ca8b3e9584691c Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Tue, 20 Oct 2020 10:23:38 -0700
Subject: [PATCH] PR feedback checking targetPort is number

removed a function that coerced target port to a number all the time which is not valid as it can be a string
---
 edit/service.vue            | 12 +-----------
 utils/validators/service.js | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/edit/service.vue b/edit/service.vue
index 6a714e814a..ca910bd82b 100644
--- a/edit/service.vue
+++ b/edit/service.vue
@@ -1,5 +1,5 @@
 <script>
-import { isEmpty, isNaN } from 'lodash';
+import { isEmpty } from 'lodash';
 import ArrayList from '@/components/form/ArrayList';
 import CreateEditView from '@/mixins/create-edit-view';
 import KeyValue from '@/components/form/KeyValue';
@@ -150,16 +150,6 @@ export default {
     },
 
     updateServicePorts(servicePorts) {
-      servicePorts.forEach((sp) => {
-        if (!isEmpty(sp?.targetPort)) {
-          const tpCoerced = parseInt(sp.targetPort, 10);
-
-          if (!isNaN(tpCoerced)) {
-            sp.targetPort = tpCoerced;
-          }
-        }
-      });
-
       this.$set(this.value.spec, 'ports', servicePorts);
     }
   }
diff --git a/utils/validators/service.js b/utils/validators/service.js
index 6da9c5c53e..8b14f8dbc3 100644
--- a/utils/validators/service.js
+++ b/utils/validators/service.js
@@ -58,10 +58,12 @@ export function servicePort(spec, getters, errors, validatorArgs) {
     }
 
     if (targetPort) {
+      const tpIanaDisplayKey = getters['i18n/t']('validation.service.ports.targetPort.ianaAt', { position: idx });
       const tp = parseInt(targetPort, 10);
+      const tpTest = new RegExp('^\\d+$');
+      const targetPortIsNumber = tpTest.test(targetPort);
 
-      if (isNaN(tp)) {
-        const tpIanaDisplayKey = getters['i18n/t']('validation.service.ports.targetPort.ianaAt', { position: idx });
+      if (!targetPortIsNumber) { // not a number
         /* [rfc6335](https://tools.ietf.org/rfc/rfc6335.txt) port name (IANA_SVC_NAME)
           An alphanumeric (a-z, and 0-9) string, with a maximum length of 15 characters,
           with the '-' character allowed anywhere except the first or the last character or adjacent to another '-' character,
@@ -118,16 +120,18 @@ export function externalName(spec, getters, errors, validatorArgs) {
   No proxying will be involved.
   Must be a valid RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) and requires Type to be ExternalName.
   */
-  if (spec?.type !== 'ExternalName' && isEmpty(spec?.externalName)) {
-    errors.push(getters['i18n/t']('validation.service.clusterIp.none'));
-  } else {
-    const hostNameErrors = validateHostname(spec.externalName, 'ExternalName', getters, undefined, errors);
+  if (spec?.type === 'ExternalName') {
+    if (isEmpty(spec?.externalName)) {
+      errors.push(getters['i18n/t']('validation.service.externalName.none'));
+    } else {
+      const hostNameErrors = validateHostname(spec.externalName, 'ExternalName', getters, undefined, errors);
 
-    if (!isEmpty(hostNameErrors)) {
-      if (errors.length && errors.length > 0) {
-        errors = [...errors, ...hostNameErrors];
-      } else {
-        errors = hostNameErrors;
+      if (!isEmpty(hostNameErrors)) {
+        if (errors.length && errors.length > 0) {
+          errors = [...errors, ...hostNameErrors];
+        } else {
+          errors = hostNameErrors;
+        }
       }
     }
   }