awspub 0.0.13__tar.gz → 0.0.15__tar.gz

{awspub-0.0.13 → awspub-0.0.15}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: awspub
-Version: 0.0.13
+Version: 0.0.15
 Summary: Publish images to AWS EC2
 License: GPL-3.0-or-later
+License-File: LICENSE
 Keywords: AWS,EC2,publication
 Author: Thomas Bechtold
 Author-email: thomasbechtold@jpberlin.de
@@ -13,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: autodoc-pydantic (>=2.0.1,<3.0.0)
 Requires-Dist: boto3
 Requires-Dist: boto3-stubs[essential,marketplace-catalog,s3,sns,ssm,sts] (>=1.28.83,<2.0.0)

awspub-0.0.15/awspub/__init__.py

@@ -0,0 +1,3 @@
+from awspub.api import cleanup, create, list, publish
+
+__all__ = ["create", "list", "publish", "cleanup"]

{awspub-0.0.13 → awspub-0.0.15}/awspub/api.py

@@ -143,23 +143,3 @@ def cleanup(config: pathlib.Path, config_mapping: pathlib.Path, group: Optional[
     ctx = Context(config, config_mapping)
     for image_name, image in _images_filtered(ctx, group):
         image.cleanup()
-
-
-def verify(config: pathlib.Path, config_mapping: pathlib.Path, group: Optional[str]) -> Dict[str, Dict]:
-    """
-    Verify available images in the partition of the used account based on
-    the given configuration file.
-    This is EXPERIMENTAL and doesn't work reliable yet!
-
-    :param config: the configuration file path
-    :type config: pathlib.Path
-    :param config_mapping: the config template mapping file path
-    :type config_mapping: pathlib.Path
-    :param group: only handles images from given group
-    :type group: Optional[str]
-    """
-    problems: Dict[str, Dict] = dict()
-    ctx = Context(config, config_mapping)
-    for image_name, image in _images_filtered(ctx, group):
-        problems[image_name] = image.verify()
-    return problems

{awspub-0.0.13 → awspub-0.0.15}/awspub/cli/__init__.py

@@ -31,14 +31,6 @@ def _list(args) -> None:
     args.output.write(images_json)
 
 
-def _verify(args) -> None:
-    """
-    Verify available images against configuration
-    """
-    problems = awspub.verify(args.config, args.config_mapping, args.group)
-    args.output.write((json.dumps({"problems": problems}, indent=4)))
-
-
 def _cleanup(args) -> None:
     """
     Cleanup available images
@@ -80,17 +72,6 @@ def _parser():
     p_list.add_argument("config", type=pathlib.Path, help="the image configuration file path")
     p_list.set_defaults(func=_list)
 
-    # verify
-    p_verify = p_sub.add_parser("verify", help="Verify images")
-    p_verify.add_argument(
-        "--output", type=argparse.FileType("w+"), help="output file path. defaults to stdout", default=sys.stdout
-    )
-    p_verify.add_argument("--config-mapping", type=pathlib.Path, help="the image config template mapping file path")
-    p_verify.add_argument("--group", type=str, help="only handles images from given group")
-    p_verify.add_argument("config", type=pathlib.Path, help="the image configuration file path")
-
-    p_verify.set_defaults(func=_verify)
-
     # cleanup
     p_cleanup = p_sub.add_parser("cleanup", help="Cleanup images")
     p_cleanup.add_argument(

{awspub-0.0.13 → awspub-0.0.15}/awspub/image.py

@@ -313,6 +313,7 @@ class Image:
             ec2client_region: EC2Client = boto3.client("ec2", region_name=region)
             image_info: Optional[_ImageInfo] = self._get(ec2client_region)
             if image_info:
+                logger.info(f"publishing {self.image_name} in region {region}")
                 ec2client_region.modify_image_attribute(
                     ImageId=image_info.image_id,
                     LaunchPermission={
@@ -588,76 +589,3 @@ class Image:
         # send ssn notification
         if self.conf["sns"]:
             self._sns_publish()
-
-    def _verify(self, region: str) -> List[ImageVerificationErrors]:
-        """
-        Verify (but don't modify or create anything) the image in a single region
-        """
-        problems: List[ImageVerificationErrors] = []
-        ec2client_region: EC2Client = boto3.client("ec2", region_name=region)
-        image_info: Optional[_ImageInfo] = self._get(ec2client_region)
-
-        if not image_info:
-            problems.append(ImageVerificationErrors.NOT_EXIST)
-            return problems
-
-        image_aws = ec2client_region.describe_images(ImageIds=[image_info.image_id])["Images"][0]
-
-        # verify state
-        if image_aws["State"] != "available":
-            problems.append(ImageVerificationErrors.STATE_NOT_AVAILABLE)
-
-        # verify RootDeviceType
-        if image_aws["RootDeviceType"] != "ebs":
-            problems.append(ImageVerificationErrors.ROOT_DEVICE_TYPE)
-
-        # verify BootMode
-        if image_aws["BootMode"] != self.conf["boot_mode"]:
-            problems.append(ImageVerificationErrors.BOOT_MODE)
-
-        # verify RootDeviceVolumeType, RootDeviceVolumeSize and Snapshot
-        for bdm in image_aws["BlockDeviceMappings"]:
-            if bdm.get("DeviceName") and bdm["DeviceName"] == image_aws["RootDeviceName"]:
-                # here's the root device
-                if bdm["Ebs"]["VolumeType"] != self.conf["root_device_volume_type"]:
-                    problems.append(ImageVerificationErrors.ROOT_DEVICE_VOLUME_TYPE)
-                if bdm["Ebs"]["VolumeSize"] != self.conf["root_device_volume_size"]:
-                    problems.append(ImageVerificationErrors.ROOT_DEVICE_VOLUME_SIZE)
-
-                # verify snapshot
-                snapshot_aws = ec2client_region.describe_snapshots(SnapshotIds=[bdm["Ebs"]["SnapshotId"]])["Snapshots"][
-                    0
-                ]
-                if snapshot_aws["State"] != "completed":
-                    problems.append(ImageVerificationErrors.ROOT_DEVICE_SNAPSHOT_NOT_COMPLETE)
-
-        # verify tpm support
-        if self.conf["tpm_support"] and image_aws.get("TpmSupport") != self.conf["tpm_support"]:
-            problems.append(ImageVerificationErrors.TPM_SUPPORT)
-
-        # verify imds support
-        if self.conf["imds_support"] and image_aws.get("ImdsSupport") != self.conf["imds_support"]:
-            problems.append(ImageVerificationErrors.IMDS_SUPPORT)
-
-        # billing products
-        if self.conf["billing_products"] and image_aws.get("BillingProducts") != self.conf["billing_products"]:
-            problems.append(ImageVerificationErrors.BILLING_PRODUCTS)
-
-        # verify tags
-        for tag in image_aws["Tags"]:
-            if tag["Key"] == "Name" and tag["Value"] != self.snapshot_name:
-                problems.append(ImageVerificationErrors.TAGS)
-
-        return problems
-
-    def verify(self) -> Dict[str, List[ImageVerificationErrors]]:
-        """
-        Verify (but don't modify or create anything) that the image configuration
-        matches what is on AWS
-        """
-        logger.info(f"Verifying image {self.image_name} ...")
-        problems: Dict[str, List[ImageVerificationErrors]] = dict()
-        for region in self.image_regions:
-            problems[region] = self._verify(region)
-
-        return problems

{awspub-0.0.13 → awspub-0.0.15}/awspub/image_marketplace.py

@@ -37,7 +37,7 @@ class ImageMarketplace:
         """
         entity = self._mpclient.describe_entity(Catalog="AWSMarketplace", EntityId=self.conf["entity_id"])
         # check if the version already exists
-        for version in entity["DetailsDocument"]["Versions"]:
+        for version in entity["DetailsDocument"].get("Versions", []):
             if version["VersionTitle"] == self.conf["version_title"]:
                 logger.info(f"Marketplace version '{self.conf['version_title']}' already exists. Do nothing")
                 return

{awspub-0.0.13 → awspub-0.0.15}/awspub/tests/test_image.py

@@ -426,57 +426,6 @@ def test_image__put_ssm_parameters(
         assert instance.put_parameter.called == put_parameter_called
 
 
-@pytest.mark.parametrize(
-    "image_found,config,config_image_name, expected_problems",
-    [
-        # image not available
-        ([], "fixtures/config1.yaml", "test-image-6", [image.ImageVerificationErrors.NOT_EXIST]),
-        # image matches expectations from config
-        (
-            [
-                {
-                    "Name": "test-image-6",
-                    "State": "available",
-                    "ImageId": "ami-123",
-                    "RootDeviceName": "/dev/sda1",
-                    "RootDeviceType": "ebs",
-                    "BootMode": "uefi-preferred",
-                    "BlockDeviceMappings": [
-                        {
-                            "DeviceName": "/dev/sda1",
-                            "Ebs": {
-                                "DeleteOnTermination": True,
-                                "VolumeType": "gp3",
-                                "VolumeSize": 8,
-                                "SnapshotId": "snap-123",
-                            },
-                        },
-                    ],
-                    "Tags": [
-                        {"Key": "name", "Value": "foobar"},
-                    ],
-                }
-            ],
-            "fixtures/config1.yaml",
-            "test-image-6",
-            [],
-        ),
-    ],
-)
-def test_image__verify(image_found, config, config_image_name, expected_problems):
-    """
-    Test _verify() for a given image and configuration
-    """
-    with patch("boto3.client") as bclient_mock:
-        instance = bclient_mock.return_value
-        instance.describe_images.return_value = {"Images": image_found}
-        instance.describe_snapshots.return_value = {"Snapshots": [{"State": "completed"}]}
-        ctx = context.Context(curdir / config, None)
-        img = image.Image(ctx, config_image_name)
-        problems = img._verify("eu-central-1")
-        assert problems == expected_problems
-
-
 @pytest.mark.parametrize(
     "partition,imagename,share_list_expected,volume_list_expected",
     [

{awspub-0.0.13 → awspub-0.0.15}/awspub/tests/test_image_marketplace.py

@@ -30,6 +30,19 @@ def test_image_marketplace_request_new_version(imagename, new_version, called_st
         assert instance.start_change_set.called == called_start_change_set
 
 
+def test_image_marketplace_request_new_version_none_exists():
+    """
+    Test the request_new_version logic if no version exist already
+    """
+    with patch("boto3.client") as bclient_mock:
+        instance = bclient_mock.return_value
+        instance.describe_entity.return_value = {"DetailsDocument": {}}
+        ctx = context.Context(curdir / "fixtures/config1.yaml", None)
+        img = image_marketplace.ImageMarketplace(ctx, "test-image-8")
+        img.request_new_version("ami-123")
+        assert instance.start_change_set.called is True
+
+
 @pytest.mark.parametrize(
     "name,expected",
     [

{awspub-0.0.13 → awspub-0.0.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry_dynamic_versioning.backend"
 
 [tool.poetry]
 name = "awspub"
-version = "0.0.13"
+version = "0.0.15"
 description = "Publish images to AWS EC2"
 
 license = "GPL-3.0-or-later"

awspub-0.0.13/awspub/__init__.py

@@ -1,3 +0,0 @@
-from awspub.api import cleanup, create, list, publish, verify
-
-__all__ = ["create", "list", "publish", "cleanup", "verify"]