fix(admin): address PR review comments

- Use str | None annotation on BucketNotFoundError
- Omit SNS ARN suffix when ARN is None (avoids misleading 'None' in message)
- Fix CHANGELOG PR link (#4776 → #4777)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: drernie

api/python/quilt3/admin/buckets.py

@@ -97,11 +97,13 @@ def _handle_bucket_add_result(result, name: str, sns_notification_arn: T.Optiona
     if isinstance(result, _graphql_client.BucketAddBucketAddInsufficientPermissions):
         raise exceptions.Quilt3AdminError(result.message)
     if isinstance(result, _graphql_client.BucketAddBucketAddSnsInvalid):
-        raise exceptions.Quilt3AdminError(f"Invalid SNS notification ARN: {sns_notification_arn!r}")
+        arn_info = f": {sns_notification_arn!r}" if sns_notification_arn else ""
+        raise exceptions.Quilt3AdminError(f"Invalid SNS notification ARN{arn_info}")
     if isinstance(result, _graphql_client.BucketAddBucketAddNotificationConfigurationError):
         raise exceptions.Quilt3AdminError("Notification configuration error")
     if isinstance(result, _graphql_client.BucketAddBucketAddNotificationTopicNotFound):
-        raise exceptions.Quilt3AdminError(f"Notification topic not found: {sns_notification_arn!r}")
+        arn_info = f": {sns_notification_arn!r}" if sns_notification_arn else ""
+        raise exceptions.Quilt3AdminError(f"Notification topic not found{arn_info}")
     if isinstance(result, _graphql_client.BucketAddBucketAddBucketFileExtensionsToIndexInvalid):
         raise exceptions.Quilt3AdminError("Invalid file extensions to index")
     if isinstance(result, _graphql_client.BucketAddBucketAddBucketIndexContentBytesInvalid):
@@ -179,11 +181,13 @@ def _handle_bucket_update_result(result, name: str, sns_notification_arn: T.Opti
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateInsufficientPermissions):
         raise exceptions.Quilt3AdminError(result.message)
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateSnsInvalid):
-        raise exceptions.Quilt3AdminError(f"Invalid SNS notification ARN: {sns_notification_arn!r}")
+        arn_info = f": {sns_notification_arn!r}" if sns_notification_arn else ""
+        raise exceptions.Quilt3AdminError(f"Invalid SNS notification ARN{arn_info}")
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateNotificationConfigurationError):
         raise exceptions.Quilt3AdminError("Notification configuration error")
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateNotificationTopicNotFound):
-        raise exceptions.Quilt3AdminError(f"Notification topic not found: {sns_notification_arn!r}")
+        arn_info = f": {sns_notification_arn!r}" if sns_notification_arn else ""
+        raise exceptions.Quilt3AdminError(f"Notification topic not found{arn_info}")
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateBucketFileExtensionsToIndexInvalid):
         raise exceptions.Quilt3AdminError("Invalid file extensions to index")
     if isinstance(result, _graphql_client.BucketUpdateBucketUpdateBucketIndexContentBytesInvalid):

api/python/quilt3/admin/exceptions.py

@@ -10,5 +10,5 @@ def __init__(self):
 
 
 class BucketNotFoundError(Quilt3AdminError):
-    def __init__(self, name: str = None):
+    def __init__(self, name: str | None = None):
         super().__init__(f"Bucket not found: {name!r}" if name else "Bucket not found")

api/python/tests/test_admin_api.py

@@ -453,9 +453,9 @@ def test_tabulator_set_open_query():
         admin.Quilt3AdminError,
         "Permission denied for prefix",
     ),
-    ({"__typename": "SnsInvalid"}, admin.Quilt3AdminError, "Invalid SNS notification ARN: None"),
+    ({"__typename": "SnsInvalid"}, admin.Quilt3AdminError, "Invalid SNS notification ARN"),
     ({"__typename": "NotificationConfigurationError"}, admin.Quilt3AdminError, "Notification configuration error"),
-    ({"__typename": "NotificationTopicNotFound"}, admin.Quilt3AdminError, "Notification topic not found: None"),
+    ({"__typename": "NotificationTopicNotFound"}, admin.Quilt3AdminError, "Notification topic not found"),
     ({"__typename": "BucketFileExtensionsToIndexInvalid"}, admin.Quilt3AdminError, "Invalid file extensions to index"),
     ({"__typename": "BucketIndexContentBytesInvalid"}, admin.Quilt3AdminError, "Invalid index content bytes"),
     ({"__typename": "SubscriptionInvalid"}, admin.Quilt3AdminError, "Invalid subscription"),
@@ -467,9 +467,9 @@ def test_tabulator_set_open_query():
         admin.Quilt3AdminError,
         "Permission denied for prefix",
     ),
-    ({"__typename": "SnsInvalid"}, admin.Quilt3AdminError, "Invalid SNS notification ARN: None"),
+    ({"__typename": "SnsInvalid"}, admin.Quilt3AdminError, "Invalid SNS notification ARN"),
     ({"__typename": "NotificationConfigurationError"}, admin.Quilt3AdminError, "Notification configuration error"),
-    ({"__typename": "NotificationTopicNotFound"}, admin.Quilt3AdminError, "Notification topic not found: None"),
+    ({"__typename": "NotificationTopicNotFound"}, admin.Quilt3AdminError, "Notification topic not found"),
     ({"__typename": "BucketFileExtensionsToIndexInvalid"}, admin.Quilt3AdminError, "Invalid file extensions to index"),
     ({"__typename": "BucketIndexContentBytesInvalid"}, admin.Quilt3AdminError, "Invalid index content bytes"),
 )

docs/CHANGELOG.md

@@ -20,7 +20,7 @@ Entries inside each section should be ordered by type:
 
 ### Python API
 
-* [Fixed] `quilt3.admin.buckets.add/update/remove` now include the bucket name (and SNS ARN where applicable) in error messages, making failures easier to debug ([#4776](https://github.com/quiltdata/quilt/pull/4776))
+* [Fixed] `quilt3.admin.buckets.add/update/remove` now include the bucket name (and SNS ARN where applicable) in error messages, making failures easier to debug ([#4777](https://github.com/quiltdata/quilt/pull/4777))
 
 ## 7.2.0 - 2026-01-28