[confcom] regenerate golden policies

Author: MahatiC

src/confcom/azext_confcom/lib/images.py

@@ -74,14 +74,23 @@ def get_image_layers(image: str, platform: str = "linux/amd64") -> list[str]:
         text=True,
     )
 
+    stdout_str = result.stdout.strip()
+
+    # Try JSON output first (newer dmverity-vhd versions)
+    if stdout_str.startswith("{"):
+        try:
+            import json
+            json_output = json.loads(stdout_str)
+            return json_output.get("layers", [])
+        except json.JSONDecodeError:
+            pass
+
+    # Fallback: line-by-line parsing for older versions
     layers = []
-    for line in result.stdout.splitlines():
+    for line in stdout_str.splitlines():
         if "hash: " in line:
             layers.append(line.split("hash: ")[-1])
         else:
-            # dmverity-vhd may print warnings to stdout (e.g. OCI format
-            # parsing errors). Log them so they are visible but don't treat them
-            # as layer hashes.
             logger.warning("Unexpected dmverity-vhd output: %s", line)
 
     return layers

src/confcom/azext_confcom/tests/latest/test_confcom_acipolicygen_arm.py

@@ -10,6 +10,7 @@
 import json
 import os
 import tempfile
+import unittest.mock
 import pytest
 from itertools import product
 
@@ -166,15 +167,17 @@ def test_acipolicygen_arm_diff(case):
             arm_template_file.flush()
 
         # Populate the arm template with a CCEPolicy field
-        acipolicygen_confcom(
-            input_path=None,
-            arm_template=arm_template_file.name,
-            arm_template_parameters=None,
-            image_name=None,
-            virtual_node_yaml_path=None,
-            infrastructure_svn=None,
-            tar_mapping_location=None,
-        )
+        # Mock input to auto-approve the overwrite prompt
+        with unittest.mock.patch("builtins.input", return_value="y"):
+            acipolicygen_confcom(
+                input_path=None,
+                arm_template=arm_template_file.name,
+                arm_template_parameters=None,
+                image_name=None,
+                virtual_node_yaml_path=None,
+                infrastructure_svn=None,
+                tar_mapping_location=None,
+            )
         arm_template_file.seek(0)
 
         # Modify the ARM template

src/confcom/samples/images/command/aci_container.inc.rego

@@ -2,18 +2,19 @@
   "id": "confcom_test_command",
   "name": "confcom_test_command",
   "layers": [
-    "8b4664979ffe3c5188efbbbb30e31716c03bfe880f15f455be0fc3beb4741de9"
+    "f1ba3e38cc8c3755648e05aa57ea155496e9a2e42fd2454932b6647bc93575b2"
   ],
+  "platform": "linux/amd64",
   "mounts": [
     {
       "destination": "/etc/resolv.conf",
+      "source": "sandbox:///tmp/atlas/resolvconf/.+",
+      "type": "bind",
       "options": [
         "rbind",
         "rshared",
         "rw"
-      ],
-      "source": "sandbox:///tmp/atlas/resolvconf/.+",
-      "type": "bind"
+      ]
     }
   ],
   "command": [

src/confcom/samples/images/environment_variables/aci_container.inc.rego

@@ -2,18 +2,19 @@
   "id": "confcom_test_environment_variables",
   "name": "confcom_test_environment_variables",
   "layers": [
-    "8b4664979ffe3c5188efbbbb30e31716c03bfe880f15f455be0fc3beb4741de9"
+    "f1ba3e38cc8c3755648e05aa57ea155496e9a2e42fd2454932b6647bc93575b2"
   ],
+  "platform": "linux/amd64",
   "mounts": [
     {
       "destination": "/etc/resolv.conf",
+      "source": "sandbox:///tmp/atlas/resolvconf/.+",
+      "type": "bind",
       "options": [
         "rbind",
         "rshared",
         "rw"
-      ],
-      "source": "sandbox:///tmp/atlas/resolvconf/.+",
-      "type": "bind"
+      ]
     }
   ],
   "command": [

src/confcom/samples/images/minimal/aci_container.inc.rego

@@ -2,18 +2,19 @@
   "id": "confcom_test_minimal",
   "name": "confcom_test_minimal",
   "layers": [
-    "8b4664979ffe3c5188efbbbb30e31716c03bfe880f15f455be0fc3beb4741de9"
+    "f1ba3e38cc8c3755648e05aa57ea155496e9a2e42fd2454932b6647bc93575b2"
   ],
+  "platform": "linux/amd64",
   "mounts": [
     {
       "destination": "/etc/resolv.conf",
+      "source": "sandbox:///tmp/atlas/resolvconf/.+",
+      "type": "bind",
       "options": [
         "rbind",
         "rshared",
         "rw"
-      ],
-      "source": "sandbox:///tmp/atlas/resolvconf/.+",
-      "type": "bind"
+      ]
     }
   ],
   "command": [