chore: adjust code pattern

Author: helio-neto

src/akamai/converter.py

@@ -35,7 +35,7 @@ def process_resource(azion_resources: AzionResource, resource: Dict[str, Any]):
         return []
 
     # Extract edge_hostname and origin_hostname
-    main_setting_name = global_settings.get("attributes", {}).get("main_setting_name", None)
+    main_setting_name = global_settings.get("attributes", {}).get("main_setting_name")
     edge_hostname = global_settings.get("attributes", {}).get("edge_hostname", "")
     origin_hostname = global_settings.get("attributes", {}).get("origin_hostname", "")
 
@@ -51,11 +51,13 @@ def process_resource(azion_resources: AzionResource, resource: Dict[str, Any]):
             for instance_name, instance_data in resource_data.items():
                 logging.info(f"Processing Akamai instance: {instance_name}")
                 try:
-                    convert_akamai_to_azion(azion_resources, 
-                                            instance_data,
-                                            main_setting_name,
-                                            edge_hostname, 
-                                            origin_hostname)
+                    convert_akamai_to_azion(
+                        azion_resources, 
+                        instance_data,
+                        main_setting_name,
+                        edge_hostname, 
+                        origin_hostname
+                    )
                 except KeyError as e:
                     logging.error(f"Missing expected key during processing of {instance_name}: {e}")
                 except TypeError as e:
@@ -124,7 +126,14 @@ def process_rules(azion_resources: AzionResource, rules: Any, main_setting_name:
     logging.info("[Akamai Rules] Processing rules finished.")
 
 
-def process_rule_behaviors(azion_resources: AzionResource, rule: Dict[str, Any], main_setting_name: str, origin_hostname: str, index: int, normalized_name: str):
+def process_rule_behaviors(
+        azion_resources: AzionResource,
+        rule: Dict[str, Any],
+        main_setting_name: str,
+        origin_hostname: str,
+        index: int,
+        normalized_name: str
+    ):
     """
     Processes the list of behaviors rules and converts them into Azion resources.
     
@@ -134,7 +143,7 @@ def process_rule_behaviors(azion_resources: AzionResource, rule: Dict[str, Any],
         main_setting_name (str): The main setting name for Azion configuration.
         origin_hostname (str): The origin hostname for Azion configuration.
     """
-    behaviors = rule.get("behaviors", None)
+    behaviors = rule.get("behaviors")
     if behaviors is None:
         logging.warning("[Akamai Rules] No behaviors found in rules. Skipping rule processing.")
         return
@@ -183,7 +192,14 @@ def process_rule_behaviors(azion_resources: AzionResource, rule: Dict[str, Any],
     logging.info(f"[Akamai Rules] Processing behaviors for rules '{normalized_name}'. Finished.")
 
 
-def process_rule_children(azion_resources: AzionResource, children: List[Dict[str, Any]], main_setting_name: str, origin_hostname: str, parent_rule_index: int, parent_rule_name: str):
+def process_rule_children(
+        azion_resources: AzionResource,
+        children: List[Dict[str, Any]],
+        main_setting_name: str,
+        origin_hostname: str,
+        parent_rule_index: int,
+        parent_rule_name: str
+    ):
     """
     Processes the list of children rules and converts them into Azion resources.
     
@@ -210,7 +226,12 @@ def process_rule_children(azion_resources: AzionResource, children: List[Dict[st
         context["rule_name"] = rule_name
         context["rule_index"] = child_index
 
-        logging.info(f"[Akamai Rules][Children] Rule name: '{rule_name}', parent rule: '{parent_rule_name}', parent_index: {parent_rule_index}, index: {child_index}")
+        logging.info(
+            f"[Akamai Rules][Children] Rule name: '{rule_name}', "
+            f"parent rule: '{parent_rule_name}', "
+            f"parent_index: {parent_rule_index}, "
+            f"index: {child_index}"
+        )
         try:
             behaviors = rule.get("behaviors", [])
             for behavior in behaviors:
@@ -270,7 +291,12 @@ def process_rule_children(azion_resources: AzionResource, children: List[Dict[st
     logging.info(f"[Akamai Rules][Children] Processing children rules from rule '{parent_rule_name}'. Finished.")
 
 
-def create_main_resources(azion_resources: AzionResource, attributes: Dict[str, Any], main_setting_name: str, origin_hostname: str):
+def create_main_resources(
+        azion_resources: AzionResource,
+        attributes: Dict[str, Any],
+        main_setting_name: str,
+        origin_hostname: str
+    ):
     """
     Creates the main setting, origin, and domain resources.
     
@@ -291,6 +317,7 @@ def create_main_resources(azion_resources: AzionResource, attributes: Dict[str,
         logging.error(f"Error creating main resources: {e}")
         raise
 
+
 def process_waf_behavior(azion_resources: AzionResource, attributes: Dict[str, Any]):
     """
     Adds WAF rule to Azion resources if available.
@@ -308,7 +335,13 @@ def process_waf_behavior(azion_resources: AzionResource, attributes: Dict[str, A
         logging.error(f"Error processing WAF rule: {e}")
 
 
-def convert_akamai_to_azion(azion_resources: AzionResource, attributes: Dict[str, Any], main_setting_name: str, edge_hostname: str, origin_hostname: str):
+def convert_akamai_to_azion(
+        azion_resources: AzionResource,
+        attributes: Dict[str, Any],
+        main_setting_name: str,
+        edge_hostname: str,
+        origin_hostname: str
+    ):
     """
     Converts Akamai property to Azion resources, including handling rules of different formats.
 

src/akamai/converter_cache_settings.py

@@ -45,7 +45,12 @@ def map_allow_behavior_to_azion(allow_behavior: str, ttl: int) -> Dict[str, Any]
     return cache_settings
 
 
-def create_cache_setting(azion_resources: AzionResource, rules: List[Dict[str, Any]], main_setting_name: str, cache_name: Optional[str] = None) -> Optional[Dict[str, Any]]:
+def create_cache_setting(
+        azion_resources: AzionResource,
+        rules: List[Dict[str, Any]],
+        main_setting_name: str,
+        cache_name: Optional[str] = None
+    ) -> Optional[Dict[str, Any]]:
     """
     Creates a single Azion cache setting resource.
 

src/akamai/converter_digital_certificate.py

@@ -4,7 +4,10 @@
 from azion_resources import AzionResource
 
 
-def create_digital_certificate(azion_resources: AzionResource, custom_certificates: List[Dict[str, Any]]) -> Optional[Dict[str, Any]]:
+def create_digital_certificate(
+        azion_resources: AzionResource,
+        custom_certificates: List[Dict[str, Any]]
+    ) -> Optional[Dict[str, Any]]:
     """
     Creates a Digital Certificate resource in Azion based on Akamai customCertificates.
 

src/akamai/converter_domain.py

@@ -3,7 +3,11 @@
 
 from azion_resources import AzionResource
 
-def create_domain(azion_resources: AzionResource, attributes: Dict[str, Any], main_setting_name: str) -> Optional[Dict[str, Any]]:
+def create_domain(
+        azion_resources: AzionResource,
+        attributes: Dict[str, Any],
+        main_setting_name: str
+    ) -> Optional[Dict[str, Any]]:
     """
     Creates the Azion domain resource from Akamai attributes.
 
@@ -18,7 +22,7 @@ def create_domain(azion_resources: AzionResource, attributes: Dict[str, Any], ma
         logging.info("Processing domains.")
 
         # Extract and validate 'hostnames'
-        hostnames = attributes.get("hostnames", None)
+        hostnames = attributes.get("hostnames")
         if not hostnames:
             logging.warning("Hostname session not found in the configuration.")
             return None

src/akamai/converter_main_settings.py

@@ -48,7 +48,11 @@ def validate_and_apply_defaults(attributes: Dict[str, Any], defaults: Dict[str,
 
     return validated
 
-def create_main_setting(azion_resources: AzionResource, attributes: Dict[str, Any], main_setting_name: str) -> Optional[Dict[str, Any]]:
+def create_main_setting(
+        azion_resources: AzionResource,
+        attributes: Dict[str, Any],
+        main_setting_name: str
+    ) -> Optional[Dict[str, Any]]:
     """
     Creates the main application setting resource for Azion.
 

src/akamai/mapping.py

@@ -75,7 +75,12 @@
         #"cloudletsOrigin": {"azion_condition": "$${upstream_addr}", "azion_operator": "matches"},
 
         # Response Phase Variables
-        "responseHeader": {"azion_condition": "$${sent_http_header}", "azion_operator": "matches", "phase": "response", "name": "filter_response_header"},
+        "responseHeader": {
+            "azion_condition": "$${sent_http_header}",
+            "azion_operator": "matches",
+            "phase": "response",
+            "name": "filter_response_header"
+        },
         "statusCode": {"azion_condition": "$${status}", "azion_operator": "matches", "phase": "response"},
         "upstreamAddress": {"azion_condition": "$${upstream_addr}", "azion_operator": "matches", "phase": "response"},
         "upstreamCookie": {"azion_condition": "$${upstream_cookie_name}", "azion_operator": "matches", "phase": "response"},
@@ -128,9 +133,22 @@
         #},
 
         # Cookies
-        "modifyOutgoingResponseCookie": {"azion_behavior": "set_cookie", "target": {"name": "cookie_name", "value": "cookie_value"}, "phase": "response", "akamai_behavior": "modifyOutgoingResponseCookie"},
-        "modifyIncomingRequestCookie": {"azion_behavior": "add_request_cookie", "target": {"name": "cookie_name", "value": "cookie_value"}},
-        "removeResponseCookie": {"azion_behavior": "filter_response_cookie", "target": "cookie_name", "phase": "response", "akamai_behavior": "removeResponseCookie"},
+        "modifyOutgoingResponseCookie": {
+            "azion_behavior": "set_cookie",
+            "target": {"name": "cookie_name", "value": "cookie_value"},
+            "phase": "response",
+            "akamai_behavior": "modifyOutgoingResponseCookie"
+        },
+        "modifyIncomingRequestCookie": {
+            "azion_behavior": "add_request_cookie",
+            "target": {"name": "cookie_name", "value": "cookie_value"}
+        },
+        "removeResponseCookie": {
+            "azion_behavior": "filter_response_cookie",
+            "target": "cookie_name",
+            "phase": "response",
+            "akamai_behavior": "removeResponseCookie"
+        },
         "removeRequestCookie": {"azion_behavior": "filter_request_cookie", "target": "cookie_name"},
         "forwardCookies": {"azion_behavior": "forward_cookies"},
         "cookies": {
@@ -146,15 +164,25 @@
             "phase": "response",
             "akamai_behavior": "modifyOutgoingResponseHeader"
         },
-        "removeOutgoingResponseHeader": {"azion_behavior": "filter_response_header", "target": "header_name", "phase": "response", "akamai_behavior": "removeOutgoingResponseHeader"},
+        "removeOutgoingResponseHeader": {
+            "azion_behavior": "filter_response_header",
+            "target": "header_name",
+            "phase": "response",
+            "akamai_behavior": "removeOutgoingResponseHeader"
+        },
         "allowTransferEncoding": {
             "azion_behavior": lambda options: None if options.get("enabled", True) else "filter_request_header",
             "target": {
                 "name": "Transfer-Encoding",
                 "target": "Transfer-Encoding"
             }
         },
-        "removeVary": {"azion_behavior": "filter_response_header","target": {"target": "Vary"}, "phase": "response", "akamai_behavior": "removeVary"},
+        "removeVary": {
+            "azion_behavior": "filter_response_header",
+            "target": {"target": "Vary"},
+            "phase": "response",
+            "akamai_behavior": "removeVary"
+        },
 
         # Redirects
         "redirect": {

src/akamai/utils.py

@@ -332,7 +332,6 @@ def get_input_hostname(values: List[str]) -> str:
         patterns.append(pattern)
     return r"^(%s)$" % "|".join(patterns)
 
-
 def get_redirect_target(options):
     """
     Generate redirect target based on Akamai redirect behavior options.

src/writer.py

@@ -117,10 +117,10 @@ def write_main_setting_block(f, resource):
         resource (dict): Resource containing the main setting.
     """
     try: 
-        attributes = resource.get("attributes", None)
+        attributes = resource.get("attributes")
         edge_application = attributes.get("edge_application")
 
-        name = edge_application.get("name", None)
+        name = edge_application.get("name")
         if not name:
             name = "Unnamed Edge Application"
         normalized_name = sanitize_name(name)
@@ -471,7 +471,7 @@ def write_azion_edge_application_edge_functions_instance_block(f, attributes: di
     results = attributes.get("results", {})
     name = results.get("name")
     edge_function_id = results.get("edge_function_id")
-    args = results.get("args", None)
+    args = results.get("args")
 
     # Validate edge_functions in main_setting
     if not attributes.get("edge_functions", False):