fix(service): update port error

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{- define "controller.envs" }}
 env:
 - name: VERSION
-  value: {{ .Chart.appVersion }}
+  value: {{ .Chart.AppVersion }}
 - name: REGISTRATION_MODE
   value: {{ .Values.registrationMode }}
 # Environmental variable value for $GATEWAY_CLASS

charts/controller/templates/controller-job-init.yaml

@@ -5,18 +5,18 @@ metadata:
 spec:
   template:
     spec:
-    initContainers:
-    - name: drycc-controller-job-init
-      image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
-      imagePullPolicy: {{.Values.imagePullPolicy}}
-      args:
+      initContainers:
+      - name: drycc-controller-job-init
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        args:
         - netcat
         - -v
         - -u
         - $(DRYCC_DATABASE_URL),$(DRYCC_DATABASE_REPLICA_URL),$(DRYCC_RABBITMQ_URL)
         - -a
         - $(DRYCC_REDIS_ADDRS),$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)
-      {{- include "controller.envs" . | indent 8 }}
+        {{- include "controller.envs" . | indent 6 }}
       containers:
       - name: drycc-controller-job-init
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}

rootfs/api/exceptions.py

@@ -43,7 +43,6 @@ def custom_exception_handler(exc, context):
     # No response means DRF couldn't handle it
     # Output a generic 500 in a JSON format
     if response is None:
-        raise exc
         logging.exception('Uncaught Exception', exc_info=exc)
         set_rollback()
         return Response({'detail': 'Server Error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

rootfs/api/models/service.py

@@ -1,20 +1,48 @@
 import logging
-
+import jsonschema
+from functools import partial
 from django.db import models
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from rest_framework.exceptions import ValidationError
 from api.exceptions import ServiceUnavailable
 from scheduler import KubeException
 from .base import AuditedModel
 
+
 User = get_user_model()
 logger = logging.getLogger(__name__)
+service_ports_schema = {
+    "$schema": "http://json-schema.org/schema#",
+    "type": "array",
+    "minItems": 1,
+    "items": {
+        "type": "object",
+        "properties": {
+            "name": {"type": "string"},
+            "port": {"type": "integer"},
+            "protocol": {"type": "string"},
+            "targetPort": {"type": "integer"},
+        },
+        "required": ["name", "port", "protocol", "targetPort"],
+    }
+}
+
+
+def validate_json(value, schema):
+    if value is not None:
+        try:
+            jsonschema.validate(value, schema)
+        except jsonschema.ValidationError as e:
+            raise ValidationError(e.message)
+    return value
 
 
 class Service(AuditedModel):
     owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
-    ports = models.JSONField(default=list)
+    ports = models.JSONField(
+        default=list, validators=[partial(validate_json, schema=service_ports_schema)])
     canary = models.BooleanField(default=False)
     procfile_type = models.TextField()
 
@@ -58,11 +86,11 @@ def add_port(self, port, protocol, target_port):
         })
 
     def update_port(self, port, protocol, target_port):
-        port = self.get_port(port, "TCP")
-        if not port or port["targetPort"] != target_port:
-            if port and port["targetPort"] != target_port:
-                self.remove_port(port, "TCP")
-            self.add_port(port, "TCP", target_port)
+        item = self.get_port(port, protocol)
+        if not item or item["targetPort"] != target_port:
+            if item and item["targetPort"] != target_port:
+                self.remove_port(port, protocol)
+            self.add_port(port, protocol, target_port)
             return True
         return False