From 5a50913bbd7ef25615f54b12c30508186ff84789 Mon Sep 17 00:00:00 2001 From: Anirudh Hegde Date: Sun, 11 Feb 2024 23:51:16 +0530 Subject: [PATCH 1/6] Update internet_port.py --- superset/advanced_data_type/plugins/internet_port.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index 6776c7d0d2e04..43a30ff5c49cb 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -48,6 +48,11 @@ "ldaps": [636], "imap2": [143], # aka imap "imaps": [993], + "MySQL": [3306], + "Remote Desktop": [3389], + "dns": [53], + "ctf": [84], + "pdap": [344] } @@ -83,9 +88,8 @@ def port_translation_func(req: AdvancedDataTypeRequest) -> AdvancedDataTypeRespo else port_conversion_dict[string_value] ) except (KeyError, ValueError): - resp["error_message"] = str( - f"'{string_value}' does not appear to be a port name or number" - ) + resp["error_message"] = f"'{string_value}' does not appear to be a port name or number" + break else: resp["display_value"] = ", ".join( From e8de7b1c065a77d17d84506c7c121deba97f43d5 Mon Sep 17 00:00:00 2001 From: Anirudh Hegde Date: Tue, 13 Feb 2024 07:39:30 +0530 Subject: [PATCH 2/6] fixed line too long error --- superset/advanced_data_type/plugins/internet_port.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index 43a30ff5c49cb..5ec025a7414d6 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -88,7 +88,8 @@ def port_translation_func(req: AdvancedDataTypeRequest) -> AdvancedDataTypeRespo else port_conversion_dict[string_value] ) except (KeyError, ValueError): - resp["error_message"] = f"'{string_value}' does not appear to be a port name or number" + resp["error_message"] = \ + f"'{string_value}' does not appear to be a port name or number" break else: From 0aa9a8c92e537f38fb8ccbcef9a75888751e87a3 Mon Sep 17 00:00:00 2001 From: Anianonymous Date: Tue, 13 Feb 2024 09:30:34 +0530 Subject: [PATCH 3/6] removed whitespaces --- superset/advanced_data_type/plugins/internet_port.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index 6776c7d0d2e04..614975375e29c 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -83,9 +83,8 @@ def port_translation_func(req: AdvancedDataTypeRequest) -> AdvancedDataTypeRespo else port_conversion_dict[string_value] ) except (KeyError, ValueError): - resp["error_message"] = str( + resp["error_message"] = \ f"'{string_value}' does not appear to be a port name or number" - ) break else: resp["display_value"] = ", ".join( From 5da282722f6c61864dae24bbd37464713a61ede6 Mon Sep 17 00:00:00 2001 From: Anianonymous Date: Tue, 13 Feb 2024 09:46:02 +0530 Subject: [PATCH 4/6] code organised --- superset/advanced_data_type/plugins/internet_port.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index a7a04e2cbb1ee..d18581da8e50f 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -90,10 +90,6 @@ def port_translation_func(req: AdvancedDataTypeRequest) -> AdvancedDataTypeRespo except (KeyError, ValueError): resp["error_message"] = \ f"'{string_value}' does not appear to be a port name or number" -<<<<<<< HEAD -======= - ->>>>>>> e8de7b1c065a77d17d84506c7c121deba97f43d5 break else: resp["display_value"] = ", ".join( From 90efd5191b1879f922491d84af0a8abf5c3bba39 Mon Sep 17 00:00:00 2001 From: Anirudh Hegde Date: Tue, 13 Feb 2024 11:44:18 +0530 Subject: [PATCH 5/6] Updated internet_port.py --- superset/advanced_data_type/plugins/internet_port.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index d18581da8e50f..d7321e1354067 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -52,7 +52,7 @@ "Remote Desktop": [3389], "dns": [53], "ctf": [84], - "pdap": [344] + "pdap": [344], } From 3ba27e57a005d535ca7939b66631b370acf95c70 Mon Sep 17 00:00:00 2001 From: Anianonymous Date: Wed, 14 Feb 2024 17:41:19 +0530 Subject: [PATCH 6/6] fixed code style --- superset/advanced_data_type/plugins/internet_port.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset/advanced_data_type/plugins/internet_port.py b/superset/advanced_data_type/plugins/internet_port.py index d7321e1354067..3b2f8da7bbdfd 100644 --- a/superset/advanced_data_type/plugins/internet_port.py +++ b/superset/advanced_data_type/plugins/internet_port.py @@ -88,8 +88,9 @@ def port_translation_func(req: AdvancedDataTypeRequest) -> AdvancedDataTypeRespo else port_conversion_dict[string_value] ) except (KeyError, ValueError): - resp["error_message"] = \ - f"'{string_value}' does not appear to be a port name or number" + resp[ + "error_message" + ] = f"'{string_value}' does not appear to be a port name or number" break else: resp["display_value"] = ", ".join(