Merge branch 'dev' into proj/enhanced-interfaces

zliang-akamai · web-flow · commit 9a746ff41289 · 2025-09-16T10:08:01.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: setup python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
@@ -34,7 +34,7 @@ jobs:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run tests
diff --git a/.github/workflows/e2e-test-pr.yml b/.github/workflows/e2e-test-pr.yml
@@ -80,7 +80,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
@@ -176,7 +176,7 @@ jobs:
 
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -71,7 +71,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ inputs.run-eol-python-version == 'true' && env.EOL_PYTHON_VERSION || inputs.python-version || env.DEFAULT_PYTHON_VERSION }}
 
@@ -141,7 +141,7 @@ jobs:
 
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
@@ -189,7 +189,7 @@ jobs:
           name: test-report-file
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/nightly-smoke-tests.yml b/.github/workflows/nightly-smoke-tests.yml
@@ -24,7 +24,7 @@ jobs:
           ref: dev
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/publish-pypi.yaml b/.github/workflows/publish-pypi.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml
@@ -25,7 +25,7 @@ jobs:
         run: sudo apt-get install -y build-essential
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
 
diff --git a/linode_api4/groups/maintenance.py b/linode_api4/groups/maintenance.py
@@ -14,7 +14,7 @@ def maintenance_policies(self):
         Returns a collection of MaintenancePolicy objects representing
         available maintenance policies that can be applied to Linodes
 
-        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-policies
+        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-maintenance-policies
 
         :returns: A list of Maintenance Policies that can be applied to Linodes
         :rtype: List of MaintenancePolicy objects as MappedObjects
diff --git a/linode_api4/objects/lke.py b/linode_api4/objects/lke.py
@@ -187,6 +187,7 @@ class LKENodePool(DerivedBase):
     properties = {
         "id": Property(identifier=True),
         "cluster_id": Property(identifier=True),
+        "label": Property(mutable=True),
         "type": Property(slug_relationship=Type),
         "disks": Property(),
         "disk_encryption": Property(),
@@ -419,6 +420,7 @@ def node_pool_create(
             Union[str, KubeVersion, TieredKubeVersion]
         ] = None,
         update_strategy: Optional[str] = None,
+        label: str = None,
         **kwargs,
     ):
         """
@@ -444,23 +446,19 @@ def node_pool_create(
                        for possible values.
 
         :returns: The new Node Pool
+        :param label: The name of the node pool.
+        :type label: str
         :rtype: LKENodePool
         """
         params = {
             "type": node_type,
+            "label": label,
             "count": node_count,
             "labels": labels,
             "taints": taints,
             "k8s_version": k8s_version,
             "update_strategy": update_strategy,
         }
-
-        if labels is not None:
-            params["labels"] = labels
-
-        if taints is not None:
-            params["taints"] = taints
-
         params.update(kwargs)
 
         result = self._client.post(
diff --git a/test/fixtures/lke_clusters_18881_pools_456.json b/test/fixtures/lke_clusters_18881_pools_456.json
@@ -34,6 +34,7 @@
       "foo": "bar",
       "bar": "foo"
     },
+    "label": "example-node-pool",
     "type": "g6-standard-4",
     "disk_encryption": "enabled"
   }
diff --git a/test/fixtures/lke_clusters_18882_pools_789.json b/test/fixtures/lke_clusters_18882_pools_789.json
@@ -1,6 +1,7 @@
 {
     "id": 789,
     "type": "g6-standard-2",
+    "label": "enterprise-node-pool",
     "count": 3,
     "nodes": [],
     "disks": [],
diff --git a/test/integration/filters/fixtures.py b/test/integration/filters/fixtures.py
@@ -23,9 +23,7 @@ def lke_cluster_instance(test_linode_client):
     node_type = test_linode_client.linode.types()[1]  # g6-standard-1
     version = test_linode_client.lke.versions()[0]
 
-    region = get_region(
-        test_linode_client, {"Kubernetes", "LA Disk Encryption"}
-    )
+    region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
     node_pools = test_linode_client.lke.node_pool(node_type, 3)
     label = get_test_label() + "_cluster"
diff --git a/test/integration/models/image/test_image.py b/test/integration/models/image/test_image.py
@@ -1,22 +1,47 @@
 from io import BytesIO
-from test.integration.conftest import get_region, get_regions
+from test.integration.conftest import get_regions
 from test.integration.helpers import get_test_label
 
 import polling
 import pytest
 
+from linode_api4 import LinodeClient
 from linode_api4.objects import Image
 
+DISALLOWED_IMAGE_REGIONS = {
+    "gb-lon",
+    "au-mel",
+    "sg-sin-2",
+    "jp-tyo-3",
+    "no-osl-1",
+}
+
+
+def get_image_upload_regions(client: LinodeClient):
+    """
+    This is necessary because the API does not currently expose
+    a capability for regions that allow custom image uploads.
+
+    In the future, we should remove this if the API exposes a custom images capability or
+    if all Object Storage regions support custom images.
+    """
+
+    return [
+        region
+        for region in get_regions(
+            client,
+            capabilities={"Linodes", "Object Storage"},
+            site_type="core",
+        )
+        if region.id not in DISALLOWED_IMAGE_REGIONS
+    ]
+
 
 @pytest.fixture(scope="session")
 def image_upload_url(test_linode_client):
     label = get_test_label() + "_image"
 
-    region = get_region(
-        test_linode_client,
-        capabilities={"Linodes", "Object Storage"},
-        site_type="core",
-    )
+    region = get_image_upload_regions(test_linode_client)[0]
 
     test_linode_client.image_create_upload(
         label, region.id, "integration test image upload"
@@ -38,9 +63,7 @@ def test_uploaded_image(test_linode_client):
 
     label = get_test_label() + "_image"
 
-    regions = get_regions(
-        test_linode_client, capabilities={"Object Storage"}, site_type="core"
-    )
+    regions = get_image_upload_regions(test_linode_client)
 
     image = test_linode_client.image_upload(
         label,
diff --git a/test/integration/models/linode/test_linode.py b/test/integration/models/linode/test_linode.py
@@ -206,7 +206,7 @@ def create_linode_for_long_running_tests(test_linode_client, e2e_test_firewall):
 def linode_with_disk_encryption(test_linode_client, request):
     client = test_linode_client
 
-    target_region = get_region(client, {"LA Disk Encryption"})
+    target_region = get_region(client, {"Disk Encryption"})
     label = get_test_label(length=8)
 
     disk_encryption = request.param
@@ -261,7 +261,7 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall):
 def test_linode_rebuild(test_linode_client):
     client = test_linode_client
 
-    region = get_region(client, {"LA Disk Encryption"})
+    region = get_region(client, {"Disk Encryption"})
 
     label = get_test_label() + "_rebuild"
 
diff --git a/test/integration/models/lke/test_lke.py b/test/integration/models/lke/test_lke.py
@@ -32,9 +32,7 @@ def lke_cluster(test_linode_client):
     node_type = test_linode_client.linode.types()[1]  # g6-standard-1
     version = test_linode_client.lke.versions()[0]
 
-    region = get_region(
-        test_linode_client, {"Kubernetes", "LA Disk Encryption"}
-    )
+    region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
     node_pools = test_linode_client.lke.node_pool(node_type, 3)
     label = get_test_label() + "_cluster"
@@ -117,9 +115,7 @@ def lke_cluster_with_labels_and_taints(test_linode_client):
 def lke_cluster_with_apl(test_linode_client):
     version = test_linode_client.lke.versions()[0]
 
-    region = get_region(
-        test_linode_client, {"Kubernetes", "LA Disk Encryption"}
-    )
+    region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
     # NOTE: g6-dedicated-4 is the minimum APL-compatible Linode type
     node_pools = test_linode_client.lke.node_pool("g6-dedicated-4", 3)
@@ -149,7 +145,7 @@ def lke_cluster_enterprise(test_linode_client):
     )[0]
 
     region = get_region(
-        test_linode_client, {"Kubernetes Enterprise", "LA Disk Encryption"}
+        test_linode_client, {"Kubernetes Enterprise", "Disk Encryption"}
     )
 
     node_pools = test_linode_client.lke.node_pool(
diff --git a/test/integration/models/networking/test_networking.py b/test/integration/models/networking/test_networking.py
@@ -280,7 +280,7 @@ def test_create_and_delete_vlan(test_linode_client, linode_for_vlan_tests):
     config.interfaces = []
     config.save()
 
-    vlan_label = "testvlan"
+    vlan_label = f"{get_test_label(8)}-testvlan"
     interface = config.interface_create_vlan(
         label=vlan_label, ipam_address="10.0.0.2/32"
     )
diff --git a/test/integration/models/nodebalancer/test_nodebalancer.py b/test/integration/models/nodebalancer/test_nodebalancer.py
@@ -167,7 +167,9 @@ def test_update_nb(test_linode_client, create_nb):
         create_nb.id,
     )
 
-    nb.label = "ThisNewLabel"
+    new_label = f"{nb.label}-ThisNewLabel"
+
+    nb.label = new_label
     nb.client_udp_sess_throttle = 5
     nb.save()
 
@@ -176,7 +178,7 @@ def test_update_nb(test_linode_client, create_nb):
         create_nb.id,
     )
 
-    assert "ThisNewLabel" == nb_updated.label
+    assert new_label == nb_updated.label
     assert 5 == nb_updated.client_udp_sess_throttle
 
 
@@ -215,7 +217,10 @@ def test_update_nb_node(test_linode_client, create_nb_config):
         create_nb_config.nodebalancer_id,
     )
     node = config.nodes[0]
-    node.label = "ThisNewLabel"
+
+    new_label = f"{node.label}-ThisNewLabel"
+
+    node.label = new_label
     node.weight = 50
     node.mode = "accept"
     node.save()
@@ -226,7 +231,7 @@ def test_update_nb_node(test_linode_client, create_nb_config):
         (create_nb_config.id, create_nb_config.nodebalancer_id),
     )
 
-    assert "ThisNewLabel" == node_updated.label
+    assert new_label == node_updated.label
     assert 50 == node_updated.weight
     assert "accept" == node_updated.mode
 
diff --git a/test/unit/objects/account_test.py b/test/unit/objects/account_test.py
@@ -406,7 +406,6 @@ def test_user_grants_serialization():
             "add_linodes": True,
             "add_longview": True,
             "add_nodebalancers": True,
-            "add_placement_groups": True,
             "add_stackscripts": True,
             "add_volumes": True,
             "add_vpcs": True,
diff --git a/test/unit/objects/lke_test.py b/test/unit/objects/lke_test.py
@@ -51,6 +51,7 @@ def test_get_pool(self):
         assert pool.id == 456
         assert pool.cluster_id == 18881
         assert pool.type.id == "g6-standard-4"
+        assert pool.label == "example-node-pool"
         assert pool.disk_encryption == InstanceDiskEncryptionType.enabled
 
         assert pool.disks is not None
@@ -162,6 +163,7 @@ def test_load_node_pool(self):
         self.assertEqual(pool.id, 456)
         self.assertEqual(pool.cluster_id, 18881)
         self.assertEqual(pool.type.id, "g6-standard-4")
+        self.assertEqual(pool.label, "example-node-pool")
         self.assertIsNotNone(pool.disks)
         self.assertIsNotNone(pool.nodes)
         self.assertIsNotNone(pool.autoscaler)
@@ -251,6 +253,7 @@ def test_lke_node_pool_update(self):
 
         pool.tags = ["foobar"]
         pool.count = 5
+        pool.label = "testing-label"
         pool.autoscaler = {
             "enabled": True,
             "min": 2,
@@ -274,6 +277,7 @@ def test_lke_node_pool_update(self):
                     "min": 2,
                     "max": 10,
                 },
+                "label": "testing-label",
                 "labels": {
                     "updated-key": "updated-value",
                 },
@@ -546,6 +550,7 @@ def test_cluster_enterprise(self):
         pool = LKENodePool(self.client, 789, 18882)
         assert pool.k8s_version == "1.31.1+lke1"
         assert pool.update_strategy == "rolling_update"
+        assert pool.label == "enterprise-node-pool"
 
     def test_lke_tiered_version(self):
         version = TieredKubeVersion(self.client, "1.32", "standard")

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`"foo": "bar",`
`35`	`35`	`"bar": "foo"`
`36`	`36`	`},`
	`37`	`+ "label": "example-node-pool",`
`37`	`38`	`"type": "g6-standard-4",`
`38`	`39`	`"disk_encryption": "enabled"`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": 789,`
`3`	`3`	`"type": "g6-standard-2",`
	`4`	`+ "label": "enterprise-node-pool",`
`4`	`5`	`"count": 3,`
`5`	`6`	`"nodes": [],`
`6`	`7`	`"disks": [],`