fix: ecs rule in target group (#126)

* fix: ecs rule in target group

* fix: serialize extra param with base64

Author: yanbasic

src/emd/cfn/ecs/template.yaml

@@ -307,7 +307,6 @@ Resources:
     DependsOn:
       - ECSTaskExecutionRole
       - EC2Role
-      - ServiceTargetGroup
       - UpdateCapacityProvider
     Properties:
       ServiceName: !Sub '${AWS::StackName}'
@@ -331,10 +330,6 @@ Resources:
         MinimumHealthyPercent: 75
       DesiredCount: !Ref DesiredCount
       TaskDefinition: !Ref TaskDefinition
-      LoadBalancers:
-        - ContainerName: !Sub '${AWS::StackName}'
-          ContainerPort: !Ref ContainerPort
-          TargetGroupArn: !Ref ServiceTargetGroup
       ServiceConnectConfiguration:
         Enabled: true
         Namespace: emd-service-connect-namespace
@@ -363,32 +358,6 @@ Resources:
       SourceSecurityGroupId: !Ref APIRouterSecurityGroup
       Description: Allow traffic from API router service to model service
 
-  ServiceTargetGroup:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: 120
-      HealthCheckPath: /ping
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 2
-      TargetType: ip
-      Port: !Ref ContainerPort
-      Protocol: HTTP
-      Matcher:
-        HttpCode: 200-404
-      UnhealthyThresholdCount: 10
-      VpcId: !Ref VPCID
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 0
-  ServiceIngressfromLoadBalancer:
-      Type: 'AWS::EC2::SecurityGroupIngress'
-      Properties:
-        Description: Ingress from the public ALB
-        GroupId: !Ref ServiceSecurityGroup
-        IpProtocol: -1
-        SourceSecurityGroupId: !Ref PublicLoadBalancerSecurityGroup
-
   ForceApiRouterDeployment:
     Type: Custom::ForceApiRouterDeployment
     DependsOn: Service

src/emd/models/utils/serialize_utils.py

@@ -1,16 +1,21 @@
 import json
 import argparse
-
-JSON_DOUBLE_QUOTE_REPLACE = '<!>'
-JSON_SINGLE_QUOTE_REPLACE = '<*>'
+import base64
 
 
 def load_extra_params(string):
-    string = string.replace(JSON_DOUBLE_QUOTE_REPLACE,'"').replace(JSON_SINGLE_QUOTE_REPLACE,"'")
     try:
-        return json.loads(string)
-    except json.JSONDecodeError:
+        # Decode the base64 string back to JSON string
+        json_bytes = base64.b64decode(string.encode('utf-8'))
+        json_str = json_bytes.decode('utf-8')
+        return json.loads(json_str)
+    except (base64.binascii.Error, UnicodeDecodeError, json.JSONDecodeError):
         raise argparse.ArgumentTypeError(f"Invalid dictionary format: {string}")
 
-def dump_extra_params(d:dict):
-    return json.dumps(d).replace("'", JSON_SINGLE_QUOTE_REPLACE).replace('"', JSON_DOUBLE_QUOTE_REPLACE)
+
+def dump_extra_params(d: dict):
+    # Convert dict to JSON string, then encode to base64
+    json_str = json.dumps(d)
+    json_bytes = json_str.encode('utf-8')
+    base64_bytes = base64.b64encode(json_bytes)
+    return base64_bytes.decode('utf-8')