Fix conflicts

Author: lgarber-akamai

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

@@ -2,8 +2,8 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
-      test_path:
-        description: 'Enter specific test path. E.g. linode_client/test_linode_client.py, models/test_account.py'
+      test_suite:
+        description: 'Enter specific test suite. E.g. domain, linode_client'
         required: false
       sha:
         description: 'The hash value of the commit.'
@@ -26,7 +26,7 @@ jobs:
       - uses: actions-ecosystem/action-regex-match@v2
         id: validate-tests
         with:
-          text: ${{ inputs.test_path }}
+          text: ${{ inputs.test_suite }}
           regex: '[^a-z0-9-:.\/_]'  # Tests validation
           flags: gi
 
@@ -71,6 +71,14 @@ jobs:
       - name: Install Python deps
         run: pip install -U setuptools wheel boto3 certifi
 
+      - name: Download kubectl and calicoctl for LKE clusters
+        run: |
+          curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
+          curl -LO "https://github.com/projectcalico/calico/releases/download/v3.25.0/calicoctl-linux-amd64"
+          chmod +x calicoctl-linux-amd64 kubectl
+          mv calicoctl-linux-amd64 /usr/local/bin/calicoctl
+          mv kubectl /usr/local/bin/kubectl
+
       - name: Install Python SDK
         run: make dev-install
         env:
@@ -80,26 +88,28 @@ jobs:
         run: |
           timestamp=$(date +'%Y%m%d%H%M')
           report_filename="${timestamp}_sdk_test_report.xml"
-          status=0
-          if ! python3 -m pytest test/integration/${INTEGRATION_TEST_PATH} --disable-warnings --junitxml="${report_filename}"; then
-            echo "EXIT_STATUS=1" >> $GITHUB_ENV
-          fi
+          make testint TEST_ARGS="--junitxml=${report_filename}" TEST_SUITE="${{ github.event.inputs.test_suite }}"
+        env:
+          LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
+
+      - name: Apply Calico Rules to LKE
+        if: always()
+        run: |
+          cd scripts && ./lke_calico_rules_e2e.sh
         env:
           LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
 
-      - name: Add additional information to XML report
+      - name: Upload test results
+        if: always()
         run: |
           filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$') 
           python tod_scripts/add_to_xml_test_report.py \
           --branch_name "${GITHUB_REF#refs/*/}" \
           --gha_run_id "$GITHUB_RUN_ID" \
           --gha_run_number "$GITHUB_RUN_NUMBER" \
           --xmlfile "${filename}"
-
-      - name: Upload test results
-        run: |
-          report_filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$')
-          python3 tod_scripts/test_report_upload_script.py "${report_filename}"
+          sync
+          python3 tod_scripts/test_report_upload_script.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 }}
@@ -131,12 +141,3 @@ jobs:
               conclusion: process.env.conclusion
             });
             return result;
-
-      - name: Test Execution Status Handler
-        run: |
-          if [[ "$EXIT_STATUS" != 0 ]]; then
-            echo "Test execution contains failure(s)"
-            exit $EXIT_STATUS 
-          else
-            echo "Tests passed!"
-          fi

.github/workflows/e2e-test.yml

@@ -32,39 +32,40 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Download kubectl and calicoctl for LKE clusters
+        run: |
+          curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
+          curl -LO "https://github.com/projectcalico/calico/releases/download/v3.25.0/calicoctl-linux-amd64"
+          chmod +x calicoctl-linux-amd64 kubectl
+          mv calicoctl-linux-amd64 /usr/local/bin/calicoctl
+          mv kubectl /usr/local/bin/kubectl
+
       - name: Run Integration tests
         run: |
           timestamp=$(date +'%Y%m%d%H%M')
           report_filename="${timestamp}_sdk_test_report.xml"
-          status=0
-          if ! python3 -m pytest test/integration/${INTEGRATION_TEST_PATH} --disable-warnings --junitxml="${report_filename}"; then
-            echo "EXIT_STATUS=1" >> $GITHUB_ENV
-          fi
+          make testint TEST_ARGS="--junitxml=${report_filename}"
+        env:
+          LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
+
+      - name: Apply Calico Rules to LKE
+        if: always()
+        run: |
+          cd scripts && ./lke_calico_rules_e2e.sh
         env:
           LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
 
-      - name: Add additional information to XML report
+      - name: Upload test results
+        if: always()
         run: |
           filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$') 
           python tod_scripts/add_to_xml_test_report.py \
           --branch_name "${GITHUB_REF#refs/*/}" \
           --gha_run_id "$GITHUB_RUN_ID" \
           --gha_run_number "$GITHUB_RUN_NUMBER" \
           --xmlfile "${filename}"
-
-      - name: Upload test results
-        run: |
-          report_filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$')
-          python3 tod_scripts/test_report_upload_script.py "${report_filename}"
+          sync
+          python3 tod_scripts/test_report_upload_script.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 }}
-
-      - name: Test Execution Status Handler
-        run: |
-          if [[ "$EXIT_STATUS" != 0 ]]; then
-            echo "Test execution contains failure(s)"
-            exit $EXIT_STATUS 
-          else
-            echo "Tests passed!"
-          fi

.github/workflows/release-cross-repo-test.yml

@@ -26,9 +26,6 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: Install linode_api4
-        run: make install
-
       - name: checkout repo
         uses: actions/checkout@v3
         with:
@@ -48,12 +45,15 @@ jobs:
           cd .ansible/collections/ansible_collections/linode/cloud
           make install
 
+      - name: Install linode_api4 # Need to install from source after all ansible dependencies have been installed
+        run: make install
+
       - name: replace existing keys
         run: |
           cd .ansible/collections/ansible_collections/linode/cloud
           rm -rf ~/.ansible/test && mkdir -p ~/.ansible/test && ssh-keygen -m PEM -q -t rsa -N '' -f ~/.ansible/test/id_rsa
 
-      - name: run tests
+      - name: Run Ansible Tests
         run: |
           cd .ansible/collections/ansible_collections/linode/cloud
           make testall

.python-version

@@ -1 +1 @@
-3.8.10
+linode_api4-python

Makefile

@@ -1,19 +1,27 @@
 PYTHON ?= python3
 
-INTEGRATION_TEST_PATH :=
 TEST_CASE_COMMAND :=
-MODEL_COMMAND :=
+TEST_SUITE :=
+TEST_ARGS :=
 
 LINODE_SDK_VERSION ?= "0.0.0.dev"
 VERSION_MODULE_DOCSTRING ?= \"\"\"\nThe version of this linode_api4 package.\n\"\"\"\n\n
 VERSION_FILE := ./linode_api4/version.py
 
 ifdef TEST_CASE
-TEST_CASE_COMMAND = -k $(TEST_CASE)
+    TEST_CASE_COMMAND = -k $(TEST_CASE)
 endif
 
-ifdef TEST_MODEL
-MODEL_COMMAND = models/$(TEST_MODEL)
+ifdef TEST_SUITE
+    ifneq ($(TEST_SUITE),linode_client)
+        ifneq ($(TEST_SUITE),login_client)
+            TEST_COMMAND = models/$(TEST_SUITE)
+        else
+            TEST_COMMAND = login_client
+        endif
+    else
+        TEST_COMMAND = linode_client
+    endif
 endif
 
 .PHONY: clean
@@ -67,7 +75,7 @@ lint: build
 
 .PHONY: testint
 testint:
-	$(PYTHON) -m pytest test/integration/${INTEGRATION_TEST_PATH}${MODEL_COMMAND} ${TEST_CASE_COMMAND}
+	$(PYTHON) -m pytest test/integration/${TEST_COMMAND} ${TEST_CASE_COMMAND} ${TEST_ARGS}
 
 .PHONY: testunit
 testunit:

README.rst

@@ -150,13 +150,10 @@ Run the tests locally using the make command. Run the entire test suite using co
 
     make testint
 
-To run a specific package, use environment variable `INTEGRATION_TEST_PATH` with `testint` command::
+To run a specific package/suite, use the environment variable `TEST_SUITE` using directory names in `integration/...` folder ::
 
-    make INTEGRATION_TEST_PATH="linode_client" testint
-
-To run a specific model test suite, set the environment variable `TEST_MODEL` using file name in `integration/models`::
-
-    make TEST_MODEL="test_account.py" testint
+    make TEST_SUITE="account" testint          // Runs tests in `integration/models/account` directory
+    make TEST_SUITE="linode_client" testint    // Runs tests in `integration/linode_client` directory
 
 Lastly to run a specific test case use environment variable `TEST_CASE` with `testint` command::
 

linode_api4/groups/account.py

@@ -8,6 +8,7 @@
     AccountBetaProgram,
     AccountSettings,
     BetaProgram,
+    ChildAccount,
     Event,
     Invoice,
     Login,
@@ -487,12 +488,23 @@ def join_beta_program(self, beta: Union[str, BetaProgram]):
 
     def availabilities(self, *filters):
         """
-        Returns a list of all available regions and the resources which are NOT available
+        Returns a list of all available regions and the resource types which are available
         to the account.
 
-        API doc: TBD
+        API doc: https://www.linode.com/docs/api/account/#region-service-availability
 
         :returns: a list of region availability information.
         :rtype: PaginatedList of AccountAvailability
         """
         return self.client._get_and_filter(AccountAvailability, *filters)
+
+    def child_accounts(self, *filters):
+        """
+        Returns a list of all child accounts under the this parent account.
+
+        API doc: TBD
+
+        :returns: a list of all child accounts.
+        :rtype: PaginatedList of ChildAccount
+        """
+        return self.client._get_and_filter(ChildAccount, *filters)

linode_api4/groups/linode.py

@@ -2,20 +2,16 @@
 import os
 from collections.abc import Iterable
 
-from linode_api4 import InstancePlacementGroupAssignment, Profile
-from linode_api4.common import SSH_KEY_TYPES, load_and_validate_keys
+from linode_api4.common import load_and_validate_keys
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
 from linode_api4.objects import (
-    AuthorizedApp,
     Base,
     ConfigInterface,
     Firewall,
     Image,
     Instance,
     Kernel,
-    PersonalAccessToken,
-    SSHKey,
     StackScript,
     Type,
 )

linode_api4/groups/lke.py

@@ -1,6 +1,15 @@
+from typing import Any, Dict, Union
+
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
-from linode_api4.objects import Base, KubeVersion, LKECluster
+from linode_api4.objects import (
+    Base,
+    JSONObject,
+    KubeVersion,
+    LKECluster,
+    LKEClusterControlPlaneOptions,
+    drop_null_keys,
+)
 
 
 class LKEGroup(Group):
@@ -47,7 +56,17 @@ def clusters(self, *filters):
         """
         return self.client._get_and_filter(LKECluster, *filters)
 
-    def cluster_create(self, region, label, node_pools, kube_version, **kwargs):
+    def cluster_create(
+        self,
+        region,
+        label,
+        node_pools,
+        kube_version,
+        control_plane: Union[
+            LKEClusterControlPlaneOptions, Dict[str, Any]
+        ] = None,
+        **kwargs,
+    ):
         """
         Creates an :any:`LKECluster` on this account in the given region, with
         the given label, and with node pools as described.  For example::
@@ -80,6 +99,8 @@ def cluster_create(self, region, label, node_pools, kube_version, **kwargs):
                           formatted dicts.
         :param kube_version: The version of Kubernetes to use
         :type kube_version: KubeVersion or str
+        :param control_plane: Dict[str, Any] or LKEClusterControlPlaneRequest
+        :type control_plane: The control plane configuration of this LKE cluster.
         :param kwargs: Any other arguments to pass along to the API.  See the API
                        docs for possible values.
 
@@ -112,10 +133,15 @@ def cluster_create(self, region, label, node_pools, kube_version, **kwargs):
                 if issubclass(type(kube_version), Base)
                 else kube_version
             ),
+            "control_plane": (
+                control_plane.dict
+                if issubclass(type(control_plane), JSONObject)
+                else control_plane
+            ),
         }
         params.update(kwargs)
 
-        result = self.client.post("/lke/clusters", data=params)
+        result = self.client.post("/lke/clusters", data=drop_null_keys(params))
 
         if "id" not in result:
             raise UnexpectedResponseError(