pycloudlib 1!9.3.2__tar.gz → 1!9.3.3__tar.gz

{pycloudlib-1!9.3.2/pycloudlib.egg-info → pycloudlib-1!9.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycloudlib
-Version: 1!9.3.2
+Version: 1!9.3.3
 Summary: Python library to launch, interact, and snapshot cloud instances
 Home-page: https://github.com/canonical/pycloudlib
 Author: pycloudlib-devs

pycloudlib-1!9.3.3/VERSION

@@ -0,0 +1 @@
+1!9.3.3

{pycloudlib-1!9.3.2 → pycloudlib-1!9.3.3}/pycloudlib/ec2/cloud.py

@@ -139,20 +139,24 @@ class EC2(BaseCloud):
     ):
         disk_type = "hvm-ssd" if release in NO_GP3_RELEASES else "hvm-ssd-gp3"
         if image_type in (ImageType.GENERIC, ImageType.MINIMAL):
-            base_location = "ubuntu/{images_path}/{disk_type}".format(
-                images_path="images-testing" if daily else "images",
-                disk_type=disk_type,
+            base_location = "ubuntu{}/{}/{}".format(
+                "-minimal" if image_type == ImageType.MINIMAL else "",
+                "images-testing" if daily else "images",
+                disk_type,
             )
             if release in LTS_RELEASES:
-                return "{}/ubuntu-{}{}-*-server{}-*".format(
+                return "{}/ubuntu-{}{}-*-{}-*".format(
                     base_location,
                     release,
                     "-daily" if daily else "",
-                    "-minimal" if image_type == ImageType.MINIMAL else "",
+                    "minimal" if image_type == ImageType.MINIMAL else "server",
                 )
 
-            return "{}/ubuntu-{}{}-*".format(
-                base_location, release, "-daily" if daily else ""
+            return "{}/ubuntu-{}{}-*-{}-*".format(
+                base_location,
+                release,
+                "-daily" if daily else "",
+                "minimal" if image_type == ImageType.MINIMAL else "server",
             )
 
         release_ver = UBUNTU_RELEASE_VERSION_MAP.get(release)

{pycloudlib-1!9.3.2 → pycloudlib-1!9.3.3}/pycloudlib/gce/cloud.py

@@ -125,8 +125,10 @@ class GCE(BaseCloud):
         self.instance_counter = count()
         # Prefer service_account_email from pycloudlib.toml and fallback to
         # the credentials listed in GOOGLE_APPLICATION_CREDENTIALS otherwise
-        self.service_account_email = service_account_email or self.config.get(
-            "service_account_email", credentials.service_account_email
+        self.service_account_email = (
+            service_account_email
+            or self.config.get("service_account_email")
+            or getattr(credentials, "service_account_email", None)
         )
 
     def released_image(
@@ -430,7 +432,9 @@ class GCE(BaseCloud):
         config.update(kwargs)
 
         if self.service_account_email:
-            config["serviceAccounts"] = [{"email": self.service_account_email}]
+            config["service_accounts"] = [
+                {"email": self.service_account_email}
+            ]
 
         if user_data:
             user_metadata = {"key": "user-data", "value": user_data}

{pycloudlib-1!9.3.2 → pycloudlib-1!9.3.3/pycloudlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycloudlib
-Version: 1!9.3.2
+Version: 1!9.3.3
 Summary: Python library to launch, interact, and snapshot cloud instances
 Home-page: https://github.com/canonical/pycloudlib
 Author: pycloudlib-devs

{pycloudlib-1!9.3.2 → pycloudlib-1!9.3.3}/tests/integration_tests/test_public_api.py

@@ -24,11 +24,15 @@ def cloud(request):
         tag="pycl-test", timestamp_suffix=True
     ) as cloud_instance:
         if isinstance(cloud_instance, pycloudlib.EC2):
-            cloud_instance.upload_key(
-                public_key_path=cloud_instance.config["public_key_path"],
-                private_key_path=cloud_instance.config["private_key_path"],
-                name=cloud_instance.tag,
-            )
+            # if key has already been uploaded, skip uploading it again.
+            # this is because the cloud instance is shared between tests and
+            # so the cloud does not clean up and remove the key between tests
+            if cloud_instance.tag not in cloud_instance.list_keys():
+                cloud_instance.upload_key(
+                    public_key_path=cloud_instance.config["public_key_path"],
+                    private_key_path=cloud_instance.config["private_key_path"],
+                    name=cloud_instance.tag,
+                )
 
         yield cloud_instance
 

{pycloudlib-1!9.3.2 → pycloudlib-1!9.3.3}/tests/unit_tests/ec2/test_cloud.py

@@ -25,6 +25,7 @@ class TestEC2:
     @pytest.mark.parametrize(
         ["release", "image_type", "daily", "expected_name_filter"],
         [
+            # Test GENERIC with LTS release and daily = True
             pytest.param(
                 "focal",
                 ImageType.GENERIC,
@@ -45,7 +46,7 @@ class TestEC2:
                 "jammy",
                 ImageType.MINIMAL,
                 True,
-                "ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-*-server-minimal-*",
+                "ubuntu-minimal/images-testing/hvm-ssd/ubuntu-jammy-daily-*-minimal-*",
                 id="minimal-lts-daily",
             ),
             # Test MINIMAL with LTS release and daily = False
@@ -53,24 +54,56 @@ class TestEC2:
                 "noble",
                 ImageType.MINIMAL,
                 False,
-                "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-*-server-minimal-*",
+                "ubuntu-minimal/images/hvm-ssd-gp3/ubuntu-noble-*-minimal-*",
                 id="minimal-lts-non-daily",
             ),
-            # Test PRO with non-LTS release
+            # Test PRO with LTS release
             pytest.param(
                 "jammy",
                 ImageType.PRO,
                 False,
                 "ubuntu-pro-server/images/hvm-ssd/ubuntu-jammy-22.04-*",
-                id="pro-non-lts",
+                id="pro-lts",
             ),
-            # Test PRO_FIPS with non-LTS release
+            # Test PRO_FIPS with LTS release
             pytest.param(
                 "noble",
                 ImageType.PRO_FIPS,
                 False,
                 "ubuntu-pro-fips*/images/hvm-ssd-gp3/ubuntu-noble-24.04-*",
-                id="pro-fips-non-lts",
+                id="pro-fips-lts",
+            ),
+            # Test GENERIC with non-LTS release and daily = False
+            pytest.param(
+                "oracular",
+                ImageType.GENERIC,
+                False,
+                "ubuntu/images/hvm-ssd-gp3/ubuntu-oracular-*-server-*",
+                id="generic-non-lts-non-daily",
+            ),
+            # Test MINIMAL with non-LTS release and daily = False
+            pytest.param(
+                "oracular",
+                ImageType.MINIMAL,
+                False,
+                "ubuntu-minimal/images/hvm-ssd-gp3/ubuntu-oracular-*-minimal-*",
+                id="minimal-non-lts-non-daily",
+            ),
+            # Test GENERIC with non-LTS release and daily = True
+            pytest.param(
+                "oracular",
+                ImageType.GENERIC,
+                True,
+                "ubuntu/images-testing/hvm-ssd-gp3/ubuntu-oracular-daily-*-server-*",
+                id="generic-non-lts-daily",
+            ),
+            # Test MINIMAL with non-LTS release and daily = True
+            pytest.param(
+                "oracular",
+                ImageType.MINIMAL,
+                True,
+                "ubuntu-minimal/images-testing/hvm-ssd-gp3/ubuntu-oracular-daily-*-minimal-*",
+                id="minimal-non-lts-daily",
             ),
         ],
     )
@@ -91,6 +124,17 @@ class TestEC2:
         )
         assert result == expected_name_filter
 
+    def test_get_name_for_image_type_invalid_image_type(self):
+        """
+        Test the _get_name_for_image_type() method with an invalid ImageType
+        """
+        ec2 = FakeEC2()
+        with pytest.raises(ValueError) as exc_info:
+            ec2._get_name_for_image_type(
+                release="focal", image_type=None, daily=True
+            )
+        assert "Invalid image_type" in str(exc_info.value)
+
     def test_get_owner_for_all_image_types(self):
         """
         Test the _get_project() method against all possible ImageType enum values

pycloudlib-1!9.3.2/VERSION

@@ -1 +0,0 @@
-1!9.3.2