Ignore AutoPkg recipe substitution variables

Author: homebysix

CHANGELOG.md

@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file. This projec
 ### Changed
 
 - Improvements to `check-preference-manifests` hook. (#91, thanks to @relgit)
+- `check-autopkg-recipes` ignores `supported_architectures` values within Munki pkginfo dictionaries that appear to be AutoPkg recipe substitution variables (e.g. `%ARCH%`).
 
 ## [1.19.0] - 2025-01-16
 

pre_commit_hooks/check_autopkg_recipes.py

@@ -639,7 +639,9 @@ def main(argv=None):
                 retval = 1
 
             # Validate supported architectures.
-            if not validate_supported_architectures(input_key["pkginfo"], filename):
+            if not validate_supported_architectures(
+                input_key["pkginfo"], filename, recipe_mode=True
+            ):
                 retval = 1
 
             # Check for deprecated pkginfo keys.

pre_commit_hooks/check_munki_pkgsinfo.py

@@ -131,7 +131,7 @@ def main(argv=None):
             retval = 1
 
         # Validate supported architectures.
-        if not validate_supported_architectures(pkginfo, filename):
+        if not validate_supported_architectures(pkginfo, filename, recipe_mode=False):
             retval = 1
 
         # Check for deprecated pkginfo keys.

pre_commit_hooks/util.py

@@ -177,12 +177,19 @@ def validate_uninstall_method(pkginfo, filename):
     return passed
 
 
-def validate_supported_architectures(pkginfo, filename):
-    """Verifies that supported_architectures values are valid."""
+def validate_supported_architectures(pkginfo, filename, recipe_mode=False):
+    """Verifies that supported_architectures values are valid.
+
+    recipe_mode: Allow values wrapped in '%' which are typically substitution variables
+    in AutoPkg recipes. Defaults to False.
+    """
     passed = True
     allowed_values = ("arm64", "x86_64")
     if "supported_architectures" in pkginfo:
         for arch in pkginfo["supported_architectures"]:
+            if recipe_mode and arch.startswith("%") and arch.endswith("%"):
+                # Skip values that are substituted during AutoPkg recipe runs
+                continue
             if arch not in allowed_values:
                 print(
                     f"{filename}: supported_architectures contains unexpected value: {arch}"