From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 20 Oct 2025 11:56:34 +0000 (+0100)
Subject: [cloud] Remove AWS public image access block only if not already unblocked
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=416a2143aff7f16ea14229d3a2b173b7161c1d9a;p=thirdparty%2Fipxe.git

[cloud] Remove AWS public image access block only if not already unblocked

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/contrib/cloud/aws-import b/contrib/cloud/aws-import
index 8ec71f454..77c0fd0f7 100755
--- a/contrib/cloud/aws-import
+++ b/contrib/cloud/aws-import
@@ -104,7 +104,9 @@ def import_image(region, name, family, architecture, image, public, overwrite,
     image_id = image['ImageId']
     client.get_waiter('image_available').wait(ImageIds=[image_id])
     if public:
-        client.disable_image_block_public_access()
+        image_block = client.get_image_block_public_access_state()
+        if image_block['ImageBlockPublicAccessState'] != 'unblocked':
+            client.disable_image_block_public_access()
         resource.Image(image_id).modify_attribute(Attribute='launchPermission',
                                                   OperationType='add',
                                                   UserGroups=['all'])