Update cw url validation function

Author: zhaoqizqwang

src/hyperpod_cli/service/get_logs.py

@@ -30,6 +30,7 @@
 import re
 
 AMAZON_ClOUDWATCH_OBSERVABILITY = "amazon-cloudwatch-observability"
+CONTAINER_INSIGHTS_LOG_REGEX_PATTERN = "https:\/\/([a-z0-9-]+).console.aws.amazon.com\/cloudwatch\/home\?region=([a-z0-9-]+)#logsV2:log-groups\/log-group\/\$252Faws\$252Fcontainerinsights\$252F([a-zA-Z0-9-]+)\$252Fapplication\/log-events\/([a-z0-9-]+)-application.var.log.containers.([a-z0-9-]+)_([a-z0-9-]+)_([a-z0-9-]+)-([a-z0-9-]+).log"
 
 class GetLogs:
     def __init__(self):
@@ -76,6 +77,7 @@ def generate_cloudwatch_link(
         namespace: Optional[str],
     ):
         eks_cluster_name = get_eks_cluster_name()
+        region = get_hyperpod_cluster_region()
 
         if self.is_container_insights_addon_enabled(eks_cluster_name):
             k8s_client = KubernetesClient()
@@ -105,13 +107,12 @@ def generate_cloudwatch_link(
                 container_id = None         
 
             # Cloudwatch container insight log groups should have the same pod log as API response
-            region = get_hyperpod_cluster_region()
             cloudwatch_url = self.get_log_url(eks_cluster_name, region, node_name, pod_name, namespace, container_name, container_id)
 
             if not validate_region_and_cluster_name(region, eks_cluster_name):
                 return 'Failed to validate Eks cluster name and region'
 
-            if not self._validate_log_url(cloudwatch_url):
+            if not re.match(CONTAINER_INSIGHTS_LOG_REGEX_PATTERN, cloudwatch_url):
                 return 'Failed to validate cloudwatch log url. Please verify node name, pod container name and container id are valid'
 
             cloudwatch_link = f'The pod cloudwatch log stream link is {cloudwatch_url}'
@@ -120,14 +121,6 @@ def generate_cloudwatch_link(
 
         return cloudwatch_link
 
-    def _validate_log_url(self, log_url):
-        pattern = "https:\/\/([a-z0-9-]+).console.aws.amazon.com\/cloudwatch\/home\?region=([a-z0-9-]+)#logsV2:log-groups\/log-group\/\$252Faws\$252Fcontainerinsights\$252F([a-zA-Z0-9-]+)\$252Fapplication\/log-events\/([a-z0-9-]+)-application.var.log.containers.([a-z0-9-]+)_([a-z0-9-]+)_([a-z0-9-]+)-([a-z0-9-]+).log"
-        match = re.match(pattern, log_url)
-        if match:
-            return True
-        else:
-            return False
-
     def get_log_url(self, eks_cluster_name, region, node_name, pod_name, namespace, container_name, container_id):
         console_prefix = f'https://{region}.console.aws.amazon.com/cloudwatch/home?region={region}#'
         log_group_prefix = f'logsV2:log-groups/log-group/$252Faws$252Fcontainerinsights$252F{eks_cluster_name}$252Fapplication/log-events/'