Merge pull request #449 from linode/dev

v5.20.0

Author: zliang-akamai

.github/workflows/e2e-test-pr.yml

@@ -103,13 +103,13 @@ jobs:
         if: always()
         run: |
           filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$') 
-          python tod_scripts/add_to_xml_test_report.py \
+          python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/add_gha_info_to_xml.py \
           --branch_name "${GITHUB_REF#refs/*/}" \
           --gha_run_id "$GITHUB_RUN_ID" \
           --gha_run_number "$GITHUB_RUN_NUMBER" \
           --xmlfile "${filename}"
           sync
-          python3 tod_scripts/test_report_upload_script.py "${filename}"
+          python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/xml_to_obj.py "${filename}"
         env:
           LINODE_CLI_OBJ_ACCESS_KEY: ${{ secrets.LINODE_CLI_OBJ_ACCESS_KEY }}
           LINODE_CLI_OBJ_SECRET_KEY: ${{ secrets.LINODE_CLI_OBJ_SECRET_KEY }}

.github/workflows/e2e-test.yml

@@ -81,13 +81,13 @@ jobs:
         if: always()
         run: |
           filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$') 
-          python tod_scripts/add_to_xml_test_report.py \
+          python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/add_gha_info_to_xml.py \
           --branch_name "${GITHUB_REF#refs/*/}" \
           --gha_run_id "$GITHUB_RUN_ID" \
           --gha_run_number "$GITHUB_RUN_NUMBER" \
           --xmlfile "${filename}"
           sync
-          python3 tod_scripts/test_report_upload_script.py "${filename}"
+          python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/xml_to_obj.py "${filename}"
         env:
           LINODE_CLI_OBJ_ACCESS_KEY: ${{ secrets.LINODE_CLI_OBJ_ACCESS_KEY }}
           LINODE_CLI_OBJ_SECRET_KEY: ${{ secrets.LINODE_CLI_OBJ_SECRET_KEY }}

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "tod_scripts"]
-	path = tod_scripts
-	url = https://github.com/linode/TOD-test-report-uploader.git
+[submodule "e2e_scripts"]
+	path = e2e_scripts
+	url = https://github.com/linode/dx-e2e-test-scripts

e2e_scripts

@@ -504,7 +504,7 @@ def child_accounts(self, *filters):
 
         NOTE: Parent/Child related features may not be generally available.
 
-        API doc: TBD
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-child-accounts
 
         :returns: a list of all child accounts.
         :rtype: PaginatedList of ChildAccount

linode_api4/groups/account.py

@@ -1,10 +1,10 @@
-from typing import BinaryIO, Tuple
+from typing import BinaryIO, List, Optional, Tuple, Union
 
 import requests
 
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
-from linode_api4.objects import Base, Image
+from linode_api4.objects import Base, Disk, Image
 from linode_api4.util import drop_null_keys
 
 
@@ -29,39 +29,45 @@ def __call__(self, *filters):
         """
         return self.client._get_and_filter(Image, *filters)
 
-    def create(self, disk, label=None, description=None, cloud_init=False):
+    def create(
+        self,
+        disk: Union[Disk, int],
+        label: str = None,
+        description: str = None,
+        cloud_init: bool = False,
+        tags: Optional[List[str]] = None,
+    ):
         """
         Creates a new Image from a disk you own.
 
         API Documentation: https://techdocs.akamai.com/linode-api/reference/post-image
 
         :param disk: The Disk to imagize.
-        :type disk: Disk or int
+        :type disk: Union[Disk, int]
         :param label: The label for the resulting Image (defaults to the disk's
                       label.
         :type label: str
         :param description: The description for the new Image.
         :type description: str
         :param cloud_init: Whether this Image supports cloud-init.
         :type cloud_init: bool
+        :param tags: A list of customized tags of this new Image.
+        :type tags: Optional[List[str]]
 
         :returns: The new Image.
         :rtype: Image
         """
         params = {
             "disk_id": disk.id if issubclass(type(disk), Base) else disk,
+            "label": label,
+            "description": description,
+            "tags": tags,
         }
 
-        if label is not None:
-            params["label"] = label
-
-        if description is not None:
-            params["description"] = description
-
         if cloud_init:
             params["cloud_init"] = cloud_init
 
-        result = self.client.post("/images", data=params)
+        result = self.client.post("/images", data=drop_null_keys(params))
 
         if not "id" in result:
             raise UnexpectedResponseError(
@@ -78,6 +84,7 @@ def create_upload(
         region: str,
         description: str = None,
         cloud_init: bool = False,
+        tags: Optional[List[str]] = None,
     ) -> Tuple[Image, str]:
         """
         Creates a new Image and returns the corresponding upload URL.
@@ -92,11 +99,18 @@ def create_upload(
         :type description: str
         :param cloud_init: Whether this Image supports cloud-init.
         :type cloud_init: bool
+        :param tags: A list of customized tags of this Image.
+        :type tags: Optional[List[str]]
 
         :returns: A tuple containing the new image and the image upload URL.
         :rtype: (Image, str)
         """
-        params = {"label": label, "region": region, "description": description}
+        params = {
+            "label": label,
+            "region": region,
+            "description": description,
+            "tags": tags,
+        }
 
         if cloud_init:
             params["cloud_init"] = cloud_init
@@ -114,7 +128,12 @@ def create_upload(
         return Image(self.client, result_image["id"], result_image), result_url
 
     def upload(
-        self, label: str, region: str, file: BinaryIO, description: str = None
+        self,
+        label: str,
+        region: str,
+        file: BinaryIO,
+        description: str = None,
+        tags: Optional[List[str]] = None,
     ) -> Image:
         """
         Creates and uploads a new image.
@@ -128,12 +147,16 @@ def upload(
         :param file: The BinaryIO object to upload to the image. This is generally obtained from open("myfile", "rb").
         :param description: The description for the new Image.
         :type description: str
+        :param tags: A list of customized tags of this Image.
+        :type tags: Optional[List[str]]
 
         :returns: The resulting image.
         :rtype: Image
         """
 
-        image, url = self.create_upload(label, region, description=description)
+        image, url = self.create_upload(
+            label, region, description=description, tags=tags
+        )
 
         requests.put(
             url,

linode_api4/groups/image.py

@@ -20,7 +20,7 @@ def groups(self, *filters):
 
            groups = client.placement.groups(PlacementGroup.label == "test")
 
-        API Documentation: TODO
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-placement-groups
 
         :param filters: Any number of filters to apply to this query.
                         See :doc:`Filtering Collections</linode_api4/objects/filtering>`

linode_api4/groups/placement.py

@@ -16,7 +16,7 @@ def __call__(self, *filters) -> PaginatedList:
 
            vpcs = client.vpcs()
 
-        API Documentation: TODO
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-vpcs
 
         :param filters: Any number of filters to apply to this query.
                         See :doc:`Filtering Collections</linode_api4/objects/filtering>`
@@ -38,7 +38,7 @@ def create(
         """
         Creates a new VPC under your Linode account.
 
-        API Documentation: TODO
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/post-vpc
 
         :param label: The label of the newly created VPC.
         :type label: str
@@ -90,7 +90,7 @@ def ips(self, *filters) -> PaginatedList:
 
            vpc_ips = client.vpcs.ips()
 
-        API Documentation: TODO
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-vpcs-ips
 
         :param filters: Any number of filters to apply to this query.
                         See :doc:`Filtering Collections</linode_api4/objects/filtering>`

linode_api4/groups/vpc.py

@@ -3,7 +3,7 @@
 import json
 import logging
 from importlib.metadata import version
-from typing import BinaryIO, Tuple
+from typing import BinaryIO, List, Tuple
 from urllib import parse
 
 import requests
@@ -378,32 +378,47 @@ def __setattr__(self, key, value):
 
         super().__setattr__(key, value)
 
-    def image_create(self, disk, label=None, description=None):
+    def image_create(self, disk, label=None, description=None, tags=None):
         """
         .. note:: This method is an alias to maintain backwards compatibility.
                   Please use :meth:`LinodeClient.images.create(...) <.ImageGroup.create>` for all new projects.
         """
-        return self.images.create(disk, label=label, description=description)
+        return self.images.create(
+            disk, label=label, description=description, tags=tags
+        )
 
     def image_create_upload(
-        self, label: str, region: str, description: str = None
+        self,
+        label: str,
+        region: str,
+        description: str = None,
+        tags: List[str] = None,
     ) -> Tuple[Image, str]:
         """
         .. note:: This method is an alias to maintain backwards compatibility.
                   Please use :meth:`LinodeClient.images.create_upload(...) <.ImageGroup.create_upload>`
                   for all new projects.
         """
 
-        return self.images.create_upload(label, region, description=description)
+        return self.images.create_upload(
+            label, region, description=description, tags=tags
+        )
 
     def image_upload(
-        self, label: str, region: str, file: BinaryIO, description: str = None
+        self,
+        label: str,
+        region: str,
+        file: BinaryIO,
+        description: str = None,
+        tags: List[str] = None,
     ) -> Image:
         """
         .. note:: This method is an alias to maintain backwards compatibility.
                   Please use :meth:`LinodeClient.images.upload(...) <.ImageGroup.upload>` for all new projects.
         """
-        return self.images.upload(label, region, file, description=description)
+        return self.images.upload(
+            label, region, file, description=description, tags=tags
+        )
 
     def nodebalancer_create(self, region, **kwargs):
         """

linode_api4/linode_client.py

@@ -62,17 +62,17 @@ class ChildAccount(Account):
 
     NOTE: Parent/Child related features may not be generally available.
 
-    API Documentation: TBD
+    API Documentation: https://techdocs.akamai.com/linode-api/reference/get-child-account
     """
 
     api_endpoint = "/account/child-accounts/{euuid}"
     id_attribute = "euuid"
 
     def create_token(self, **kwargs):
         """
-        Create a ephemeral token for accessing the child account.
+        Create an ephemeral token for accessing the child account.
 
-        API Documentation: TBD
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/post-child-account-token
         """
         resp = self._client.post(
             "{}/token".format(self.api_endpoint),