Preserve arbitrary orders to break dependency on fixes

Author: DomAyre

src/confcom/azext_confcom/lib/arm_to_aci_policy_spec.py

@@ -75,10 +75,6 @@ def arm_container_env_to_aci_policy_spec_env(
 
     for env_var in [
         *process_env_vars_from_template(parameters, {}, container_properties, approve_wildcards),
-        *config.OPENGCS_ENV_RULES,
-        *config.FABRIC_ENV_RULES,
-        *config.MANAGED_IDENTITY_ENV_RULES,
-        *config.ENABLE_RESTART_ENV_RULE,
     ]:
         yield AciContainerPropertyEnvVariable(**env_var)
 

src/confcom/azext_confcom/security_policy.py

@@ -628,22 +628,19 @@ def load_policy_from_arm_template_str(
 
     aci_policies = []
 
-    fragments = sorted(
-        [
-            AciFragmentSpec(
-                feed=fragment["feed"],
-                issuer=fragment["issuer"],
-                includes=fragment["includes"],
-                minimum_svn=infrastructure_svn or fragment["minimum_svn"],
-                path=fragment.get("path"),
-            )
-            for fragment in [
-                *(included_fragments or []),
-                *(config.DEFAULT_REGO_FRAGMENTS if not exclude_default_fragments else []),
-            ]
-        ],
-        key=lambda fragment: fragment.feed,
-    )
+    fragments = [
+        AciFragmentSpec(
+            feed=fragment["feed"],
+            issuer=fragment["issuer"],
+            includes=fragment["includes"],
+            minimum_svn=infrastructure_svn or fragment["minimum_svn"],
+            path=fragment.get("path"),
+        )
+        for fragment in [
+            *(config.DEFAULT_REGO_FRAGMENTS if not exclude_default_fragments else []),
+            *(included_fragments or []),
+        ]
+    ]
 
     try:
         for policy_spec in arm_to_aci_policy_spec(