gowalk-cicd 1.0.6 → 1.0.8

package/action/.daemux-version

@@ -1 +1 @@
-1.0.6
+1.0.8

package/action/scripts/capabilities.py

@@ -28,6 +28,13 @@ from pathlib import Path
 from asc_common import get_json, request
 
 
+# asc_common.request signals a non-retryable failure with SystemExit, which is
+# a BaseException — `except Exception` sails straight past it. Spelling both
+# out is what makes the "best-effort" promise below actually hold; without it
+# a capability call that Apple rejects kills the whole signing step.
+_API_FAILURES = (Exception, SystemExit)
+
+
 # Entitlement key -> App Store Connect capabilityType, for capabilities that
 # are a bare toggle. An entitlement absent from this map is not an error: most
 # entitlements (keychain-access-groups, get-task-allow, ...) need no App ID
@@ -100,11 +107,10 @@ def warn_about_manual_entitlements(entitlement_keys: set[str], bundle_id: str) -
 
 def enabled_capabilities(token: str, bundle_pk: str) -> set[str]:
     try:
-        data = get_json(
-            f"/bundleIds/{bundle_pk}/bundleIdCapabilities", token,
-            params={"limit": "200"},
-        )
-    except Exception as exc:  # noqa: BLE001 - never fail signing over a read
+        # No `limit` here: this relationship rejects it outright with
+        # PARAMETER_ERROR.ILLEGAL. Apple returns the full capability set.
+        data = get_json(f"/bundleIds/{bundle_pk}/bundleIdCapabilities", token)
+    except _API_FAILURES as exc:
         print(f"::warning::could not list capabilities for {bundle_pk}: {exc!r}")
         return set()
     found = set()
@@ -112,6 +118,7 @@ def enabled_capabilities(token: str, bundle_pk: str) -> set[str]:
         capability = (item.get("attributes") or {}).get("capabilityType")
         if capability:
             found.add(capability)
+    print(f"App ID {bundle_pk} capabilities: {', '.join(sorted(found)) or '(none)'}")
     return found
 
 
@@ -126,15 +133,22 @@ def enable_capability(token: str, bundle_pk: str, capability: str) -> bool:
         }
     }
     try:
-        # 409 means another writer got there first — the desired end state.
         response = request(
             "POST", "/bundleIdCapabilities", token,
             json_body=body, allow_status={200, 201, 409},
         )
-    except Exception as exc:  # noqa: BLE001 - Apple's archive error is clearer
+    except _API_FAILURES as exc:
         print(f"::warning::could not enable {capability}: {exc!r}")
         return False
     if response.status_code == 409:
+        # Could be "already on" — or Apple refusing outright, which reads
+        # identically from the status code alone. Surface the body: without it
+        # the run just reports a profile missing a capability we claimed to
+        # have enabled, and there is nothing in the log to explain why.
+        print(
+            f"::warning::App Store Connect returned 409 for {capability}: "
+            f"{response.text[:600]}"
+        )
         return False
     print(f"Enabled {capability} on the App ID")
     return True
@@ -143,9 +157,13 @@ def enable_capability(token: str, bundle_pk: str, capability: str) -> bool:
 def reconcile(token: str, bundle_pk: str, bundle_id: str, entitlement_keys: set[str]) -> bool:
     """Enable every simple capability the entitlements imply.
 
-    Returns True when something was actually turned on — the caller must then
-    regenerate the profile, because a cached one predates the change and still
-    lacks the capability.
+    Returns True when the caller must regenerate the profile — which is
+    whenever the App ID was missing something, NOT merely when a POST
+    succeeded. A cached profile was issued while the App ID lacked these, so
+    reusing it reproduces the same archive failure either way; regenerating at
+    least picks up the App ID's current state, and if the capability is still
+    absent the error comes from Apple describing the real problem rather than
+    from a stale cache.
     """
     warn_about_manual_entitlements(entitlement_keys, bundle_id)
     wanted = required_capabilities(entitlement_keys)
@@ -158,9 +176,6 @@ def reconcile(token: str, bundle_pk: str, bundle_id: str, entitlement_keys: set[
         f"{bundle_id}: entitlements require {', '.join(sorted(missing))} "
         f"but the App ID does not have them; enabling"
     )
-    # List, not a generator: `any` short-circuits, and every missing capability
-    # must be attempted, not just up to the first success.
-    return any([
+    for capability in sorted(missing):
         enable_capability(token, bundle_pk, capability)
-        for capability in sorted(missing)
-    ])
+    return True

package/action/scripts/test_capabilities.py

@@ -109,15 +109,36 @@ class ReconcileTest(unittest.TestCase):
 
         self.assertEqual(sorted(posted), ["APP_ATTEST", "PUSH_NOTIFICATIONS"])
 
-    def test_existing_capability_race_is_not_a_change(self) -> None:
+    def test_regenerates_even_when_the_capability_could_not_be_enabled(self) -> None:
+        # A 409 (or any refusal) still means the cached profile was issued
+        # while the App ID lacked the capability. Reusing it reproduces the
+        # archive failure and hides Apple's real error behind a stale cache.
+        response = self._response(409)
+        response.text = '{"errors":[{"detail":"nope"}]}'
         with mock.patch.object(capabilities, "get_json", return_value={"data": []}), \
-                mock.patch.object(capabilities, "request", return_value=self._response(409)):
+                mock.patch.object(capabilities, "request", return_value=response):
             changed = capabilities.reconcile(
                 "tok", "PK", "com.gowalk.form",
                 {"com.apple.developer.devicecheck.appattest-environment"},
             )
 
-        self.assertFalse(changed)
+        self.assertTrue(changed)
+
+    def test_surfaces_the_409_body(self) -> None:
+        response = self._response(409)
+        response.text = '{"errors":[{"detail":"capability is not modifiable"}]}'
+        with mock.patch.object(capabilities, "get_json", return_value={"data": []}), \
+                mock.patch.object(capabilities, "request", return_value=response), \
+                mock.patch("builtins.print") as printed:
+            capabilities.reconcile(
+                "tok", "PK", "com.gowalk.form",
+                {"com.apple.developer.devicecheck.appattest-environment"},
+            )
+
+        messages = [c.args[0] for c in printed.call_args_list if c.args]
+        self.assertTrue(
+            any("capability is not modifiable" in m for m in messages), messages
+        )
 
     def test_api_failure_does_not_raise(self) -> None:
         with mock.patch.object(capabilities, "get_json", return_value={"data": []}), \
@@ -127,7 +148,29 @@ class ReconcileTest(unittest.TestCase):
                 {"com.apple.developer.devicecheck.appattest-environment"},
             )
 
-        self.assertFalse(changed)
+        self.assertTrue(changed)
+
+    def test_systemexit_from_asc_does_not_kill_signing(self) -> None:
+        # asc_common.request raises SystemExit, not Exception, so a bare
+        # `except Exception` would let an Apple 4xx abort the whole run.
+        # An unreadable App ID is also unknown state, so the profile is
+        # regenerated rather than trusted from cache.
+        with mock.patch.object(capabilities, "get_json", side_effect=SystemExit("400")), \
+                mock.patch.object(capabilities, "request", side_effect=SystemExit("400")):
+            changed = capabilities.reconcile(
+                "tok", "PK", "com.gowalk.form",
+                {"com.apple.developer.devicecheck.appattest-environment"},
+            )
+
+        self.assertTrue(changed)
+
+    def test_capability_listing_sends_no_limit_parameter(self) -> None:
+        # /bundleIds/{id}/bundleIdCapabilities rejects `limit` with
+        # PARAMETER_ERROR.ILLEGAL rather than ignoring it.
+        with mock.patch.object(capabilities, "get_json", return_value={"data": []}) as get:
+            capabilities.enabled_capabilities("tok", "PK")
+
+        get.assert_called_once_with("/bundleIds/PK/bundleIdCapabilities", "tok")
 
     def test_warns_about_capabilities_it_will_not_guess(self) -> None:
         with mock.patch.object(capabilities, "get_json", return_value={"data": []}), \

package/android-action/.daemux-version

@@ -1 +1 @@
-1.0.6
+1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gowalk-cicd",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Zero-config GitHub Actions delivery for iOS TestFlight and Android Google Play.",
   "type": "module",
   "bin": {