fix: adjust converter

aziontech · Feb 28, 2025 · ad183b9 · ad183b9
1 parent 65ba3f2
commit ad183b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/akamai/converter_cache_settings.py b/src/akamai/converter_cache_settings.py
@@ -114,9 +114,7 @@ def create_cache_setting(
     #depends_on
     depends_on = [f"azion_edge_application_main_setting.{main_setting_name}"]
     _, origin = azion_resources.query_azion_resource_by_type("azion_edge_application_origin", name)
-    if not origin:
-        depends_on.append("azion_edge_application_origin.default") #fallback to default origin
-    else:
+    if origin:
         depends_on.append(f"azion_edge_application_origin.{name}")
 
     # Construct the cache setting resource

diff --git a/src/akamai/converter_rules_engine.py b/src/akamai/converter_rules_engine.py
@@ -144,13 +144,15 @@ def assemble_request_rule(
     """
     phase = "request" if rule_name != "default" else "default"
     rule_description = rule.get("comments", "").replace("\n", " ").replace("\r", " ").replace("\"", "'")
+    random_number = str(random.randint(1000, 9999))
+    unique_rule_name = sanitize_name(rule_name) + "_" + random_number
     resource = {
         "type": "azion_edge_application_rule_engine",
-        "name": sanitize_name(rule_name), 
+        "name": unique_rule_name, 
         "attributes": {
             "edge_application_id": f"azion_edge_application_main_setting.{main_setting_name}.edge_application.application_id",
             "results": {
-                "name": "Default Rule" if phase == "default" else sanitize_name(rule_name),
+                "name": "Default Rule" if phase == "default" else unique_rule_name,
                 "description": rule_description,
                 "phase": phase,
                 "behaviors": request_behaviors
@@ -190,6 +192,8 @@ def assemble_response_rule(
 
     behavior_names = "_".join(sorted(set(b.get("name", "") for b in behaviors)))
     name = sanitize_name(f"{rule_name}_{behavior_names}")
+    random_number = str(random.randint(1000, 9999))
+    unique_rule_name = sanitize_name(name) + "_" + random_number
 
     # Find criteria for the behavior
     criterias = azion_criteria.get("response", {}).get("entries")
@@ -209,11 +213,11 @@ def assemble_response_rule(
     rule_description = rule.get("comments", "").replace("\n", " ").replace("\r", " ").replace("\"", "'")
     resource = {
         "type": "azion_edge_application_rule_engine",
-        "name": name,
+        "name": unique_rule_name,
         "attributes": {
             "edge_application_id": f"azion_edge_application_main_setting.{main_setting_name}.edge_application.application_id",
             "results": {
-                "name": name,
+                "name": unique_rule_name,
                 "description": rule_description,
                 "phase": "response",
                 "behaviors": behaviors