awspub 0.0.6__tar.gz → 0.0.8__tar.gz

{awspub-0.0.6 → awspub-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: awspub
-Version: 0.0.6
+Version: 0.0.8
 Summary: Publish images to AWS EC2
 Home-page: https://github.com/canonical/awspub
 License: GPL-3.0-or-later
@@ -14,9 +14,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: autodoc-pydantic (>=2.0.1,<3.0.0)
 Requires-Dist: boto3
-Requires-Dist: boto3-stubs[essential,marketplace-catalog,s3,ssm] (>=1.28.83,<2.0.0)
+Requires-Dist: boto3-stubs[essential,marketplace-catalog,s3,sns,ssm,sts] (>=1.28.83,<2.0.0)
 Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: ruamel-yaml (>=0.18.6,<0.19.0)
 Project-URL: Repository, https://github.com/canonical/awspub
@@ -44,20 +45,3 @@ License
 
 The project uses `GPL-3.0` as license.
 
-Doing a new release
-===================
-
-New releases are mostly automated.
-
-pypi
-----
-
-For a new release on pypi, create a new tag (following semantic versioning)
-with a `v` as prefix (eg. `v0.2.1`).
-
-snapstore
----------
-
-The latest git commit will be automatically build and published to the `latest/edge`
-channel. Manually promote from `latest/edge` to `latest/stable`.
-

{awspub-0.0.6 → awspub-0.0.8}/awspub/configmodels.py

@@ -1,4 +1,5 @@
 import pathlib
+from enum import Enum
 from typing import Dict, List, Literal, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
@@ -94,6 +95,34 @@ class ConfigImageSSMParameterModel(BaseModel):
     )
 
 
+class SNSNotificationProtocol(str, Enum):
+    DEFAULT = "default"
+    EMAIL = "email"
+
+
+class ConfigImageSNSNotificationModel(BaseModel):
+    """
+    Image/AMI SNS Notification specific configuration to notify subscribers about new images availability
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    subject: str = Field(description="The subject of SNS Notification", min_length=1, max_length=99)
+    message: Dict[SNSNotificationProtocol, str] = Field(
+        description="The body of the message to be sent to subscribers.",
+        default={SNSNotificationProtocol.DEFAULT: ""},
+    )
+
+    @field_validator("message")
+    def check_message(cls, value):
+        # Check message protocols have default key
+        # Message should contain at least a top-level JSON key of “default”
+        # with a value that is a string
+        if SNSNotificationProtocol.DEFAULT not in value:
+            raise ValueError(f"{SNSNotificationProtocol.DEFAULT.value} key is required to send SNS notification")
+        return value
+
+
 class ConfigImageModel(BaseModel):
     """
     Image/AMI configuration.
@@ -148,6 +177,9 @@ class ConfigImageModel(BaseModel):
     )
     groups: Optional[List[str]] = Field(description="Optional list of groups this image is part of", default=[])
     tags: Optional[Dict[str, str]] = Field(description="Optional Tags to apply to this image only", default={})
+    sns: Optional[List[Dict[str, ConfigImageSNSNotificationModel]]] = Field(
+        description="Optional list of SNS Notification related configuration", default=None
+    )
 
     @field_validator("share")
     @classmethod

{awspub-0.0.6 → awspub-0.0.8}/awspub/exceptions.py

@@ -14,3 +14,11 @@ class BucketDoesNotExistException(Exception):
     def __init__(self, bucket_name: str, *args, **kwargs):
         msg = f"The bucket named '{bucket_name}' does not exist. You will need to create the bucket before proceeding."
         super().__init__(msg, *args, **kwargs)
+
+
+class AWSNotificationException(Exception):
+    pass
+
+
+class AWSAuthorizationException(Exception):
+    pass

{awspub-0.0.6 → awspub-0.0.8}/awspub/image.py

@@ -14,6 +14,7 @@ from awspub.context import Context
 from awspub.image_marketplace import ImageMarketplace
 from awspub.s3 import S3
 from awspub.snapshot import Snapshot
+from awspub.sns import SNSNotification
 
 logger = logging.getLogger(__name__)
 
@@ -189,6 +190,10 @@ class Image:
         """
         share_list = self._share_list_filtered(share_conf)
 
+        if not share_list:
+            logger.info("no valid accounts found for sharing in this partition, skipping")
+            return
+
         for region, image_info in images.items():
             ec2client: EC2Client = boto3.client("ec2", region_name=region)
             # modify image permissions
@@ -349,6 +354,19 @@ class Image:
             else:
                 logger.error(f"image {self.image_name} not available in region {region}. can not make public")
 
+    def _sns_publish(self) -> None:
+        """
+        Publish SNS notifiations about newly available images to subscribers
+        """
+        for region in self.image_regions:
+            ec2client_region: EC2Client = boto3.client("ec2", region_name=region)
+            image_info: Optional[_ImageInfo] = self._get(ec2client_region)
+
+            if not image_info:
+                logger.error(f"can not send SNS notification for {self.image_name} because no image found in {region}")
+                return
+            SNSNotification(self._ctx, self.image_name, region).publish()
+
     def cleanup(self) -> None:
         """
         Cleanup/delete the temporary images
@@ -552,6 +570,10 @@ class Image:
                     f"currently using partition {partition}. Ignoring marketplace config."
                 )
 
+        # 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

awspub-0.0.8/awspub/sns.py

@@ -0,0 +1,88 @@
+"""
+Methods used to handle notifications for AWS using SNS
+"""
+
+import json
+import logging
+from typing import Any, Dict, List
+
+import boto3
+from botocore.exceptions import ClientError
+from mypy_boto3_sns.client import SNSClient
+from mypy_boto3_sts.client import STSClient
+
+from awspub.context import Context
+from awspub.exceptions import AWSAuthorizationException, AWSNotificationException
+
+logger = logging.getLogger(__name__)
+
+
+class SNSNotification(object):
+    """
+    A data object that contains validation logic and
+    structuring rules for SNS notification JSON
+    """
+
+    def __init__(self, context: Context, image_name: str, region_name: str):
+        """
+        Construct a message and verify that it is valid
+        """
+        self._ctx: Context = context
+        self._image_name: str = image_name
+        self._region_name: str = region_name
+
+    @property
+    def conf(self) -> List[Dict[str, Any]]:
+        """
+        The sns configuration for the current image (based on "image_name") from context
+        """
+        return self._ctx.conf["images"][self._image_name]["sns"]
+
+    def _get_topic_arn(self, topic_name: str) -> str:
+        """
+        Calculate topic ARN based on partition, region, account and topic name
+        :param topic_name: Name of topic
+        :type topic_name: str
+        :param region_name: name of region
+        :type region_name: str
+        :return: return topic ARN
+        :rtype: str
+        """
+
+        stsclient: STSClient = boto3.client("sts", region_name=self._region_name)
+        resp = stsclient.get_caller_identity()
+
+        account = resp["Account"]
+        # resp["Arn"] has string format "arn:partition:iam::accountnumber:user/iam_role"
+        partition = resp["Arn"].rsplit(":")[1]
+
+        return f"arn:{partition}:sns:{self._region_name}:{account}:{topic_name}"
+
+    def publish(self) -> None:
+        """
+        send notification to subscribers
+        """
+
+        snsclient: SNSClient = boto3.client("sns", region_name=self._region_name)
+
+        for topic in self.conf:
+            for topic_name, topic_config in topic.items():
+                try:
+                    snsclient.publish(
+                        TopicArn=self._get_topic_arn(topic_name),
+                        Subject=topic_config["subject"],
+                        Message=json.dumps(topic_config["message"]),
+                        MessageStructure="json",
+                    )
+                except ClientError as e:
+                    exception_code: str = e.response["Error"]["Code"]
+                    if exception_code == "AuthorizationError":
+                        raise AWSAuthorizationException(
+                            "Profile does not have a permission to send the SNS notification. Please review the policy."
+                        )
+                    else:
+                        raise AWSNotificationException(str(e))
+                logger.info(
+                    f"The SNS notification {topic_config['subject']}"
+                    f" for the topic {topic_name} in {self._region_name} has been sent."
+                )

{awspub-0.0.6 → awspub-0.0.8}/awspub/tests/fixtures/config1.yaml

@@ -118,6 +118,35 @@ awspub:
         -
           name: /awspub-test/param2
           allow_overwrite: true
+    "test-image-10":
+      boot_mode: "uefi"
+      description: |
+        A test image without a separate snapshot but single sns configs
+      regions:
+        - "us-east-1"
+      sns:
+        - "topic1":
+            subject: "topic1-subject"
+            message:
+              default: "default-message"
+              email: "email-message"
+    "test-image-11":
+      boot_mode: "uefi"
+      description: |
+        A test image without a separate snapshot but multiple sns configs
+      regions:
+        - "us-east-1"
+        - "eu-central-1"
+      sns:
+        - "topic1":
+            subject: "topic1-subject"
+            message:
+              default: "default-message"
+              email: "email-message"
+        - "topic2":
+            subject: "topic2-subject"
+            message:
+              default: "default-message"
 
   tags:
     name: "foobar"

{awspub-0.0.6 → awspub-0.0.8}/awspub/tests/test_api.py

@@ -23,6 +23,8 @@ curdir = pathlib.Path(__file__).parent.resolve()
                 "test-image-7",
                 "test-image-8",
                 "test-image-9",
+                "test-image-10",
+                "test-image-11",
             ],
         ),
         # with a group that no image as, no image should be processed

{awspub-0.0.6 → awspub-0.0.8}/awspub/tests/test_image.py

@@ -127,16 +127,32 @@ def test_image___get_root_device_snapshot_id(root_device_name, block_device_mapp
 
 
 @pytest.mark.parametrize(
-    "imagename,partition,called_mod_image,called_mod_snapshot,called_start_change_set,called_put_parameter",
+    (
+        "imagename",
+        "partition",
+        "called_mod_image",
+        "called_mod_snapshot",
+        "called_start_change_set",
+        "called_put_parameter",
+        "called_sns_publish",
+    ),
     [
-        ("test-image-6", "aws", True, True, False, False),
-        ("test-image-7", "aws", False, False, False, False),
-        ("test-image-8", "aws", True, True, True, True),
-        ("test-image-8", "aws-cn", True, True, False, True),
+        ("test-image-6", "aws", True, True, False, False, False),
+        ("test-image-7", "aws", False, False, False, False, False),
+        ("test-image-8", "aws", True, True, True, True, False),
+        ("test-image-8", "aws-cn", True, True, False, True, False),
+        ("test-image-10", "aws", False, False, False, False, True),
+        ("test-image-11", "aws", False, False, False, False, True),
     ],
 )
 def test_image_publish(
-    imagename, partition, called_mod_image, called_mod_snapshot, called_start_change_set, called_put_parameter
+    imagename,
+    partition,
+    called_mod_image,
+    called_mod_snapshot,
+    called_start_change_set,
+    called_put_parameter,
+    called_sns_publish,
 ):
     """
     Test the publish() for a given image
@@ -167,6 +183,7 @@ def test_image_publish(
             "Regions": [{"RegionName": "eu-central-1"}, {"RegionName": "us-east-1"}]
         }
         instance.list_buckets.return_value = {"Buckets": [{"Name": "bucket1"}]}
+        instance.list_topics.return_value = {"Topics": [{"TopicArn": "arn:aws:sns:topic1"}]}
         ctx = context.Context(curdir / "fixtures/config1.yaml", None)
         img = image.Image(ctx, imagename)
         img.publish()
@@ -174,6 +191,7 @@ def test_image_publish(
         assert instance.modify_snapshot_attribute.called == called_mod_snapshot
         assert instance.start_change_set.called == called_start_change_set
         assert instance.put_parameter.called == called_put_parameter
+        assert instance.publish.called == called_sns_publish
 
 
 def test_image__get_zero_images():

awspub-0.0.8/awspub/tests/test_sns.py

@@ -0,0 +1,140 @@
+import pathlib
+from unittest.mock import patch
+
+import botocore.exceptions
+import pytest
+
+from awspub import context, exceptions, sns
+
+curdir = pathlib.Path(__file__).parent.resolve()
+
+
+@pytest.mark.parametrize(
+    "imagename,called_sns_publish, publish_call_count",
+    [
+        ("test-image-10", True, 1),
+        ("test-image-11", True, 4),
+    ],
+)
+def test_sns_publish(imagename, called_sns_publish, publish_call_count):
+    """
+    Test the send_notification logic
+    """
+    with patch("boto3.client") as bclient_mock:
+        instance = bclient_mock.return_value
+        ctx = context.Context(curdir / "fixtures/config1.yaml", None)
+        image_conf = ctx.conf["images"][imagename]
+
+        for region in image_conf["regions"]:
+            sns.SNSNotification(ctx, imagename, region).publish()
+
+        assert instance.publish.called == called_sns_publish
+        assert instance.publish.call_count == publish_call_count
+
+
+@pytest.mark.parametrize(
+    "imagename",
+    [
+        ("test-image-10"),
+        ("test-image-11"),
+    ],
+)
+def test_sns_publish_fail_with_invalid_topic(imagename):
+    """
+    Test the send_notification logic
+    """
+    with patch("boto3.client") as bclient_mock:
+        instance = bclient_mock.return_value
+        ctx = context.Context(curdir / "fixtures/config1.yaml", None)
+        image_conf = ctx.conf["images"][imagename]
+
+        # topic1 is invalid topic
+        def side_effect(*args, **kwargs):
+            topic_arn = kwargs.get("TopicArn")
+            if "topic1" in topic_arn:
+                error_reponse = {
+                    "Error": {
+                        "Code": "NotFoundException",
+                        "Message": "An error occurred (NotFound) when calling the Publish operation: "
+                        "Topic does not exist.",
+                    }
+                }
+                raise botocore.exceptions.ClientError(error_reponse, "")
+
+        instance.publish.side_effect = side_effect
+
+        for region in image_conf["regions"]:
+            with pytest.raises(exceptions.AWSNotificationException):
+                sns.SNSNotification(ctx, imagename, region).publish()
+
+
+@pytest.mark.parametrize(
+    "imagename",
+    [
+        ("test-image-10"),
+        ("test-image-11"),
+    ],
+)
+def test_sns_publish_fail_with_unauthorized_user(imagename):
+    """
+    Test the send_notification logic
+    """
+    with patch("boto3.client") as bclient_mock:
+        instance = bclient_mock.return_value
+        ctx = context.Context(curdir / "fixtures/config1.yaml", None)
+        image_conf = ctx.conf["images"][imagename]
+
+        error_reponse = {
+            "Error": {
+                "Code": "AuthorizationError",
+                "Message": "User are not authorized perform SNS Notification service",
+            }
+        }
+        instance.publish.side_effect = botocore.exceptions.ClientError(error_reponse, "")
+
+        for region in image_conf["regions"]:
+            with pytest.raises(exceptions.AWSAuthorizationException):
+                sns.SNSNotification(ctx, imagename, region).publish()
+
+
+@pytest.mark.parametrize(
+    "imagename, partition, expected",
+    [
+        (
+            "test-image-10",
+            "aws-cn",
+            [
+                "arn:aws-cn:sns:us-east-1:1234:topic1",
+            ],
+        ),
+        (
+            "test-image-11",
+            "aws",
+            [
+                "arn:aws:sns:us-east-1:1234:topic1",
+                "arn:aws:sns:us-east-1:1234:topic2",
+                "arn:aws:sns:eu-central-1:1234:topic1",
+                "arn:aws:sns:eu-central-1:1234:topic2",
+            ],
+        ),
+    ],
+)
+def test_sns__get_topic_arn(imagename, partition, expected):
+    """
+    Test the send_notification logic
+    """
+    with patch("boto3.client") as bclient_mock:
+        instance = bclient_mock.return_value
+        ctx = context.Context(curdir / "fixtures/config1.yaml", None)
+        image_conf = ctx.conf["images"][imagename]
+
+        instance.get_caller_identity.return_value = {"Account": "1234", "Arn": f"arn:{partition}:iam::1234:user/test"}
+
+        topic_arns = []
+        for region in image_conf["regions"]:
+            for topic in image_conf["sns"]:
+                topic_name = next(iter(topic))
+                res_arn = sns.SNSNotification(ctx, imagename, region)._get_topic_arn(topic_name)
+                topic_arns.append(res_arn)
+
+        assert topic_arns == expected

{awspub-0.0.6 → awspub-0.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry_dynamic_versioning.backend"
 
 [tool.poetry]
 name = "awspub"
-version = "0.0.6"
+version = "0.0.8"
 description = "Publish images to AWS EC2"
 
 license = "GPL-3.0-or-later"
@@ -24,7 +24,7 @@ keywords = ["AWS", "EC2", "publication"]
 python = "^3.8.1"
 boto3 = "*"
 pydantic = "^2"
-boto3-stubs = {extras = ["essential", "marketplace-catalog", "ssm", "s3"], version = "^1.28.83"}
+boto3-stubs = {extras = ["essential", "marketplace-catalog", "ssm", "s3", "sns", "sts"], version = "^1.28.83"}
 autodoc-pydantic = "^2.0.1"
 ruamel-yaml = "^0.18.6"
 
@@ -61,3 +61,9 @@ awspub = "awspub.cli:main"
 [tool.poetry-dynamic-versioning]
 enable = false
 vcs = 'git'
+
+[tool.isort]
+profile = "black"
+
+[tool.black]
+line-length = 120

{awspub-0.0.6 → awspub-0.0.8}/readme.rst

@@ -19,20 +19,3 @@ License
 =======
 
 The project uses `GPL-3.0` as license.
-
-Doing a new release
-===================
-
-New releases are mostly automated.
-
-pypi
-----
-
-For a new release on pypi, create a new tag (following semantic versioning)
-with a `v` as prefix (eg. `v0.2.1`).
-
-snapstore
----------
-
-The latest git commit will be automatically build and published to the `latest/edge`
-channel. Manually promote from `latest/edge` to `latest/stable`.