cloudpub 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

cloudpub/models/aws.py

@@ -940,7 +940,7 @@ class ListEntitiesResponse(AttrsJSONDecodeMixin):
     """  # noqa: E501
 
     entity_summary_list: List[EntitySummary] = field(
-        converter=lambda x: [EntitySummary.from_json(a) for a in x] if x else [],  # type: ignore
+        converter=lambda x: [EntitySummary.from_json(a) for a in x] if x else [],
         on_setattr=NO_OP,
         metadata={"alias": "EntitySummaryList"},
     )
@@ -995,7 +995,7 @@ class ChangeSummary(AttrsJSONDecodeMixin):
     """This object contains details specific to the change type of the requested change."""
 
     error_details: List[ErrorDetail] = field(
-        converter=lambda x: [ErrorDetail.from_json(a) for a in x] if x else [],  # type: ignore
+        converter=lambda x: [ErrorDetail.from_json(a) for a in x] if x else [],
         on_setattr=NO_OP,
         metadata={"alias": "ErrorDetailList"},
     )
@@ -1066,7 +1066,7 @@ class DescribeChangeSetReponse(AttrsJSONDecodeMixin):
     """Returned if there is a failure on the change set, but that failure is not related to any of the changes in the request."""  # noqa: E501
 
     change_set: List[ChangeSummary] = field(
-        converter=lambda x: [ChangeSummary.from_json(a) for a in x] if x else [],  # type: ignore
+        converter=lambda x: [ChangeSummary.from_json(a) for a in x] if x else [],
         on_setattr=NO_OP,
         metadata={"alias": "ChangeSet"},
     )
@@ -1148,7 +1148,7 @@ class ListChangeSetsResponse(AttrsJSONDecodeMixin):
     """The describe_entity response's metadata."""
 
     change_set_list: List[ListChangeSet] = field(
-        converter=lambda x: [ListChangeSet.from_json(a) for a in x] if x else [],  # type: ignore
+        converter=lambda x: [ListChangeSet.from_json(a) for a in x] if x else [],
         on_setattr=NO_OP,
         metadata={"alias": "ChangeSetSummaryList"},
     )

cloudpub/models/common.py

@@ -82,7 +82,7 @@ class AttrsJSONDecodeMixin:
         json_copy = cls._preprocess_json(json_copy)
 
         args = {}
-        cls_attr = [a.name for a in cls.__attrs_attrs__ if isinstance(a, Attribute)]  # type: ignore
+        cls_attr = [a.name for a in cls.__attrs_attrs__ if isinstance(a, Attribute)]
         for a in cls_attr:
             args[a] = json_copy.pop(a, None)
 

cloudpub/models/ms_azure.py

@@ -662,7 +662,7 @@ class PlanSummary(AzureProductLinkedResource):
 
     gov_certifications: Optional[List[GovernmentCertification]] = field(
         metadata={"alias": "azureGovernmentCertifications", "hide_unset": True},
-        converter=lambda x: [GovernmentCertification.from_json(a) for a in x] if x else None,  # type: ignore  # noqa: E501
+        converter=lambda x: [GovernmentCertification.from_json(a) for a in x] if x else None,
         on_setattr=NO_OP,
     )
     """Certifications for government plans."""
@@ -773,7 +773,7 @@ class VideoThumbnails(AttrsJSONDecodeMixin):
 
     image_list: List[ThumbnailURL] = field(
         metadata={"alias": "imageList"},
-        converter=lambda x: [ThumbnailURL.from_json(a) for a in x] if x else [],  # type: ignore
+        converter=lambda x: [ThumbnailURL.from_json(a) for a in x] if x else [],
         on_setattr=NO_OP,
     )
 
@@ -1035,7 +1035,7 @@ class ProductReseller(AzureProductLinkedResource):
     """
 
     audiences: List[Audience] = field(
-        converter=lambda x: [Audience.from_json(a) for a in x] if x else [], on_setattr=NO_OP  # type: ignore  # noqa: E501
+        converter=lambda x: [Audience.from_json(a) for a in x] if x else [], on_setattr=NO_OP
     )
     """List of :class:`~cloudpub.models.ms_azure.Audience` for the reseller offer."""
 

cloudpub/ms_azure/service.py

@@ -599,7 +599,7 @@ class AzureService(BaseService[AzurePublishingMetadata]):
         product, plan = self.get_product_plan_by_name(product_name, plan_name)
         log.info(
             "Preparing to associate the image with the plan \"%s\" from product \"%s\""
-            % (product_name, plan_name)
+            % (plan_name, product_name)
         )
 
         # 2. Retrieve the VM Technical configuration for the given plan

cloudpub/ms_azure/utils.py

@@ -262,11 +262,16 @@ def prepare_vm_images(
         return [VMImageDefinition.from_json(json_gen1)]
 
 
-def _len_vm_images(disk_versions: List[DiskVersion]) -> int:
-    count = 0
-    for disk_version in disk_versions:
-        count = count + len(disk_version.vm_images)
-    return count
+def _all_skus_present(old_skus: List[VMISku], disk_versions: List[DiskVersion]) -> bool:
+    image_types = set()
+    for sku in old_skus:
+        image_types.add(sku.image_type)
+
+    for dv in disk_versions:
+        for img in dv.vm_images:
+            if img.image_type not in image_types:
+                return False
+    return True
 
 
 def _build_skus(
@@ -281,6 +286,12 @@ def _build_skus(
             return plan_name
         return f"{plan_name}-{arch.lower()}"
 
+    def get_safe_security_type(image_type):
+        # Arches which aren't x86Gen2 (like ARM64) doesn't work well with security type
+        if image_type != "x64Gen2":
+            return None
+        return security_type
+
     sku_mapping: Dict[str, str] = {}
     # Update the SKUs for each image in DiskVersions if needed
     for disk_version in disk_versions:
@@ -301,7 +312,7 @@ def _build_skus(
 
     # Return the expected SKUs list
     res = [
-        VMISku.from_json({"image_type": k, "id": v, "security_type": security_type})
+        VMISku.from_json({"image_type": k, "id": v, "security_type": get_safe_security_type(k)})
         for k, v in sku_mapping.items()
     ]
     return sorted(res, key=attrgetter("id"))
@@ -346,7 +357,7 @@ def update_skus(
 
     # If we have SKUs for each image we don't need to update them as they're already
     # properly set.
-    if len(old_skus) == _len_vm_images(disk_versions):
+    if _all_skus_present(old_skus, disk_versions):
         return old_skus
 
     # Update SKUs to create the alternate gen.

{cloudpub-1.3.1.dist-info → cloudpub-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpub
-Version: 1.3.1
+Version: 1.3.3
 Summary: Services for publishing products in cloud environments
 Home-page: https://github.com/release-engineering/cloudpub
 Author: Jonathan Gangi

{cloudpub-1.3.1.dist-info → cloudpub-1.3.3.dist-info}/RECORD

@@ -6,15 +6,15 @@ cloudpub/aws/__init__.py,sha256=bQbgPTq-S3IrUkZpBNAZ6-2FQ3KiRg87Al5muXh8pmc,117
 cloudpub/aws/service.py,sha256=h-nsTE1mldjQD1nqlUCX0OQiAwnDTVJlI92X13fK8GU,19337
 cloudpub/aws/utils.py,sha256=qlZ9R7J8AArR3tFYW47cJ0dgdqYc7kPJUEn24HtzeGI,6453
 cloudpub/models/__init__.py,sha256=OcXNPwjDybWtcxAL0IhFtKiMErHP4xugUgpMKPbpYGM,44
-cloudpub/models/aws.py,sha256=AXpFYkeSxMsDgGXFYDlZVblwTfstUUOp0uZ33ylt8fo,42914
-cloudpub/models/common.py,sha256=zsAWN0exuIlFlRtOXhfEr-n5exD3bSql7YlsTzEuhts,4986
-cloudpub/models/ms_azure.py,sha256=vK5gEtHxEPTYI7KvsQGAGx2aUK1U_bi6kPUV92yrGX8,56050
+cloudpub/models/aws.py,sha256=arzFqLmFw8O9Otk_VatLR5dmQ9FsdWT3f0Ibap7EW0o,42850
+cloudpub/models/common.py,sha256=iZ503VVFL9y0P_wXiK0f3flXV32VWBs9i-9NoYfJZUg,4970
+cloudpub/models/ms_azure.py,sha256=nzTp9IvAW-WEJuN20IAc93yY6YPHCTE0j116EfQUsPg,55974
 cloudpub/ms_azure/__init__.py,sha256=eeYXPd_wzDBmh0Hmzd5o4yzocFzM6n4r8qpCDy00kYk,117
-cloudpub/ms_azure/service.py,sha256=OJNK7HuM6NMqV_jwdva8ILxWIUiDPzMRqZpVlTAchIE,26559
+cloudpub/ms_azure/service.py,sha256=LV7z9WliYAIBMMb_N8CFRpW6o5cCLZjUmqSpIC-7vDU,26559
 cloudpub/ms_azure/session.py,sha256=7ZjBLBX4XSzx60Bxhn96kh64RJ3oQs734Tw3ZVSnFrU,6349
-cloudpub/ms_azure/utils.py,sha256=uKgU70TpQMLHJz7qsJ8MVC-Ej3kLxNqG_6EyNCnBKGA,19721
-cloudpub-1.3.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-cloudpub-1.3.1.dist-info/METADATA,sha256=Z0K2Rkr9YuJXGElwaQ7Djh1x_VxMMCdEgtEBeaxdHWw,831
-cloudpub-1.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cloudpub-1.3.1.dist-info/top_level.txt,sha256=YnnJuTiWBpRI9zMkYUVcZNuvjzzJYblASj-7Q8m3Gzg,9
-cloudpub-1.3.1.dist-info/RECORD,,
+cloudpub/ms_azure/utils.py,sha256=HmRVDJaPIxz5e1v4MlEHOb2HSzYJAJ5DhTRzIlLo82o,20104
+cloudpub-1.3.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+cloudpub-1.3.3.dist-info/METADATA,sha256=WP3zi6Vezq-zHsT085B6eOEZ-Cs33cubLU-xen1hli8,831
+cloudpub-1.3.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cloudpub-1.3.3.dist-info/top_level.txt,sha256=YnnJuTiWBpRI9zMkYUVcZNuvjzzJYblASj-7Q8m3Gzg,9
+cloudpub-1.3.3.dist-info/RECORD,,