cloudpub 1.3.2__tar.gz → 1.4.0__tar.gz

{cloudpub-1.3.2/cloudpub.egg-info → cloudpub-1.4.0}/PKG-INFO

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

{cloudpub-1.3.2 → cloudpub-1.4.0}/cloudpub/ms_azure/service.py

@@ -620,7 +620,7 @@ class AzureService(BaseService[AzurePublishingMetadata]):
             tech_config.disk_versions = [disk_version]
 
         # We just want to append a new image if the SAS is not already present.
-        elif not is_sas_present(tech_config, metadata.image_path):
+        elif not is_sas_present(tech_config, metadata.image_path, metadata.check_base_sas_only):
             # Here we can have the metadata.disk_version set or empty.
             # When set we want to get the existing disk_version which matches its value.
             log.debug("Scanning the disk versions from %s" % metadata.destination)

{cloudpub-1.3.2 → cloudpub-1.4.0}/cloudpub/ms_azure/utils.py

@@ -51,6 +51,9 @@ class AzurePublishingMetadata(PublishingMetadata):
             legacy_sku_id (str, optional):
                 Only required when ``support_legacy == True``. The SKU ID for Gen1.
                 Defaults to ``{sku_id}-gen1``
+            check_base_sas_only (bool, optional):
+                Indicates to skip checking SAS parameters when set as ``True``.
+                Default to ``False``
             **kwargs
                 Arguments for :class:`~cloudpub.common.PublishingMetadata`.
         """
@@ -60,6 +63,7 @@ class AzurePublishingMetadata(PublishingMetadata):
         self.support_legacy = support_legacy
         self.recommended_sizes = recommended_sizes or []
         self.legacy_sku_id = kwargs.pop("legacy_sku_id", None)
+        self.check_base_sas_only = kwargs.pop("check_base_sas_only", False)
 
         if generation == "V1" or not support_legacy:
             self.legacy_sku_id = None
@@ -113,7 +117,7 @@ def get_image_type_mapping(architecture: str, generation: str) -> str:
     return gen_map.get(generation, "")
 
 
-def is_sas_eq(sas1: str, sas2: str) -> bool:
+def is_sas_eq(sas1: str, sas2: str, base_only=False) -> bool:
     """
     Compare 2 SAS URI and determine where they're equivalent.
 
@@ -127,10 +131,12 @@ def is_sas_eq(sas1: str, sas2: str) -> bool:
     This comparison is necessary as each time a SAS URI is generated it returns a different value.
 
     Args:
-        sas1:
+        sas1 (str):
             The left SAS to compare the equivalency
-        sas2:
+        sas2 (str):
             The right SAS to compare the equivalency
+        base_only (bool):
+            When True it will only compare the base SAS and not its arguments. Defaults to False.
 
     Returns:
         True when both SAS URIs are equivalent, False otherwise.
@@ -147,25 +153,26 @@ def is_sas_eq(sas1: str, sas2: str) -> bool:
         log.debug("Got different base SAS: %s - Expected: %s" % (base_sas1, base_sas2))
         return False
 
-    # Parameters lengh differs
-    if len(params_sas1) != len(params_sas2):
-        log.debug(
-            "Got different lengh of SAS parameters: len(%s) - Expected len(%s)"
-            % (params_sas1, params_sas2)
-        )
-        return False
-
-    # Parameters values differs
-    for k, v in params_sas1.items():
-        if v != params_sas2.get(k, None):
-            log.debug("The SAS parameter %s doesn't match %s." % (v, params_sas2.get(k, None)))
+    if not base_only:
+        # Parameters lengh differs
+        if len(params_sas1) != len(params_sas2):
+            log.debug(
+                "Got different lengh of SAS parameters: len(%s) - Expected len(%s)"
+                % (params_sas1, params_sas2)
+            )
             return False
 
+        # Parameters values differs
+        for k, v in params_sas1.items():
+            if v != params_sas2.get(k, None):
+                log.debug("The SAS parameter %s doesn't match %s." % (v, params_sas2.get(k, None)))
+                return False
+
     # Equivalent SAS
     return True
 
 
-def is_sas_present(tech_config: VMIPlanTechConfig, sas_uri: str) -> bool:
+def is_sas_present(tech_config: VMIPlanTechConfig, sas_uri: str, base_only: bool = False) -> bool:
     """
     Check whether the given SAS URI is already present in the disk_version.
 
@@ -174,12 +181,14 @@ def is_sas_present(tech_config: VMIPlanTechConfig, sas_uri: str) -> bool:
             The plan's technical configuraion to seek the SAS_URI.
         sas_uri (str)
             The SAS URI to check whether it's present or not in disk version.
+        base_only (bool):
+            When True it will only compare the base SAS and not its arguments. Defaults to False.
     Returns:
         bool: True when the SAS is present in the plan, False otherwise.
     """
     for disk_version in tech_config.disk_versions:
         for img in disk_version.vm_images:
-            if is_sas_eq(img.source.os_disk.uri, sas_uri):
+            if is_sas_eq(img.source.os_disk.uri, sas_uri, base_only):
                 return True
     return False
 
@@ -262,11 +271,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(
@@ -352,7 +366,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.2 → cloudpub-1.4.0/cloudpub.egg-info}/PKG-INFO

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

{cloudpub-1.3.2 → cloudpub-1.4.0}/requirements.txt

@@ -8,13 +8,13 @@ attrs==25.3.0 \
     --hash=sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3 \
     --hash=sha256:75d7cefc7fb576747b2c81b4442d4d4a1ce0900973527c011d1030fd3bf4af1b
     # via cloudpub (setup.py)
-boto3==1.37.23 \
-    --hash=sha256:82f4599a34f5eb66e916b9ac8547394f6e5899c19580e74b60237db04cf66d1e \
-    --hash=sha256:fc462b9fd738bd8a1c121d94d237c6b6a05a2c1cc709d16f5223acb752f7310b
+boto3==1.37.37 \
+    --hash=sha256:752d31105a45e3e01c8c68471db14ae439990b75a35e72b591ca528e2575b28f \
+    --hash=sha256:d125cb11e22817f7a2581bade4bf7b75247b401888890239ceb5d3e902ccaf38
     # via cloudpub (setup.py)
-botocore==1.37.23 \
-    --hash=sha256:3a249c950cef9ee9ed7b2278500ad83a4ad6456bc433a43abd1864d1b61b2acb \
-    --hash=sha256:ffbe1f5958adb1c50d72d3ad1018cb265fe349248c08782d334601c0814f0e38
+botocore==1.37.37 \
+    --hash=sha256:3eadde6fed95c4cb469cc39d1c3558528b7fa76d23e7e16d4bddc77250431a64 \
+    --hash=sha256:eb730ff978f47c02f0c8ed07bccdc0db6d8fa098ed32ac31bee1da0e9be480d1
     # via
     #   boto3
     #   s3transfer
@@ -130,13 +130,13 @@ jmespath==1.0.1 \
     # via
     #   boto3
     #   botocore
-orderly-set==5.3.0 \
-    --hash=sha256:80b3d8fdd3d39004d9aad389eaa0eab02c71f0a0511ba3a6d54a935a6c6a0acc \
-    --hash=sha256:c2c0bfe604f5d3d9b24e8262a06feb612594f37aa3845650548befd7772945d1
+orderly-set==5.4.0 \
+    --hash=sha256:c8ff5ba824abe4eebcbbdd3f646ff3648ad0dd52239319d90056d8d30b6cccdd \
+    --hash=sha256:f0192a7f9ae3385b587b71688353fae491d1ca45878496eb71ea118be1623639
     # via deepdiff
-packaging==24.2 \
-    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
-    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+packaging==25.0 \
+    --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \
+    --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
     # via cloudpub (setup.py)
 python-dateutil==2.9.0.post0 \
     --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
@@ -146,17 +146,17 @@ requests==2.32.3 \
     --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
     --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
     # via cloudpub (setup.py)
-s3transfer==0.11.4 \
-    --hash=sha256:559f161658e1cf0a911f45940552c696735f5c74e64362e515f333ebed87d679 \
-    --hash=sha256:ac265fa68318763a03bf2dc4f39d5cbd6a9e178d81cc9483ad27da33637e320d
+s3transfer==0.11.5 \
+    --hash=sha256:757af0f2ac150d3c75bc4177a32355c3862a98d20447b69a0161812992fe0bd4 \
+    --hash=sha256:8c8aad92784779ab8688a61aefff3e28e9ebdce43142808eaa3f0b0f402f68b7
     # via boto3
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
     --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
     # via python-dateutil
-tenacity==9.0.0 \
-    --hash=sha256:807f37ca97d62aa361264d497b0e31e92b8027044942bfa756160d908320d73b \
-    --hash=sha256:93de0c98785b27fcf659856aa9f54bfbd399e29969b0621bc7f762bd441b4539
+tenacity==9.1.2 \
+    --hash=sha256:1169d376c297e7de388d18b4481760d478b0e99a777cad3a9c86e556f4b697cb \
+    --hash=sha256:f77bf36710d8b73a50b2dd155c97b870017ad21afe6ab300326b0371b3b05138
     # via cloudpub (setup.py)
 urllib3==1.26.20 \
     --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \

{cloudpub-1.3.2 → cloudpub-1.4.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 setup(
     name='cloudpub',
     description='Services for publishing products in cloud environments',
-    version='1.3.2',
+    version='1.4.0',
     keywords='stratosphere cloudpub cloudpublish',
     author='Jonathan Gangi',
     author_email='jgangi@redhat.com',