Merge branch 'linode:dev' into dev

srbhaakamai · web-flow · commit 7ec2a66e98e4 · 2026-02-13T13:28:15.000+05:30
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,3 @@
 **What are the steps to reproduce the issue or verify the changes?**
 
 **How do I run the relevant unit/integration tests?**
-
-## 📷 Preview
-
-**If applicable, include a screenshot or code snippet of this change. Otherwise, please remove this section.**
diff --git a/.github/workflows/e2e-test-pr.yml b/.github/workflows/e2e-test-pr.yml
@@ -27,6 +27,14 @@ on:
       pull_request_number:
         description: 'The number of the PR.'
         required: false
+      test_report_upload:
+        description: 'Indicates whether to upload the test report to object storage. Defaults to "false"'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
 
 name: PR E2E Tests
 
@@ -101,7 +109,7 @@ jobs:
           LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
 
       - name: Upload test results
-        if: always()
+        if: always() && github.repository == 'linode/linode_api4-python' && (github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && inputs.test_report_upload == 'true'))
         run: |
           filename=$(ls | grep -E '^[0-9]{12}_sdk_test_report\.xml$') 
           python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/add_gha_info_to_xml.py \
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -41,6 +41,14 @@ on:
         options:
           - 'true'
           - 'false'
+      test_report_upload:
+        description: 'Indicates whether to upload the test report to object storage. Defaults to "false"'
+        type: choice
+        required: false
+        default: 'false'
+        options:
+          - 'true'
+          - 'false'
   push:
     branches:
       - main
@@ -172,7 +180,8 @@ jobs:
   process-upload-report:
     runs-on: ubuntu-latest
     needs: [integration-tests]
-    if: always() && github.repository == 'linode/linode_api4-python' # Run even if integration tests fail and only on main repository
+    # Run even if integration tests fail on main repository AND push event OR test_report_upload is true in case of manual run
+    if: always() && github.repository == 'linode/linode_api4-python' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.test_report_upload == 'true'))
     outputs:
       summary: ${{ steps.set-test-summary.outputs.summary }}
 
@@ -271,4 +280,4 @@ jobs:
           payload: |
             channel: ${{ secrets.SLACK_CHANNEL_ID }}
             thread_ts: "${{ steps.main_message.outputs.ts }}"
-            text: "${{ needs.process-upload-report.outputs.summary }}"
+            text: "${{ needs.process-upload-report.outputs.summary }}"
diff --git a/linode_api4/groups/linode.py b/linode_api4/groups/linode.py
@@ -335,8 +335,6 @@ def instance_create(
         :type network_helper: bool
         :param maintenance_policy: The slug of the maintenance policy to apply during maintenance.
                                       If not provided, the default policy (linode/migrate) will be applied.
-                                      NOTE: This field is in beta and may only
-                            function if base_url is set to `https://api.linode.com/v4beta`.
         :type maintenance_policy: str
 
         :returns: A new Instance object, or a tuple containing the new Instance and
diff --git a/linode_api4/groups/maintenance.py b/linode_api4/groups/maintenance.py
@@ -9,8 +9,6 @@ class MaintenanceGroup(Group):
 
     def maintenance_policies(self):
         """
-        .. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
-
         Returns a collection of MaintenancePolicy objects representing
         available maintenance policies that can be applied to Linodes
 
diff --git a/linode_api4/objects/account.py b/linode_api4/objects/account.py
@@ -218,9 +218,7 @@ class AccountSettings(Base):
         "object_storage": Property(),
         "backups_enabled": Property(mutable=True),
         "interfaces_for_new_linodes": Property(mutable=True),
-        "maintenance_policy": Property(
-            mutable=True
-        ),  # Note: This field is only available when using v4beta.
+        "maintenance_policy": Property(mutable=True),
     }
 
 
@@ -249,7 +247,7 @@ class Event(Base):
         "duration": Property(),
         "secondary_entity": Property(),
         "message": Property(),
-        "maintenance_policy_set": Property(),  # Note: This field is only available when using v4beta.
+        "maintenance_policy_set": Property(),
         "description": Property(),
         "source": Property(),
         "not_before": Property(is_datetime=True),
diff --git a/linode_api4/objects/linode.py b/linode_api4/objects/linode.py
@@ -800,9 +800,7 @@ class Instance(Base):
         "lke_cluster_id": Property(),
         "capabilities": Property(unordered=True),
         "interface_generation": Property(),
-        "maintenance_policy": Property(
-            mutable=True
-        ),  # Note: This field is only available when using v4beta.
+        "maintenance_policy": Property(mutable=True),
         "locks": Property(unordered=True),
     }
 
diff --git a/linode_api4/objects/nodebalancer.py b/linode_api4/objects/nodebalancer.py
@@ -252,6 +252,7 @@ class NodeBalancer(Base):
         "transfer": Property(),
         "tags": Property(mutable=True, unordered=True),
         "client_udp_sess_throttle": Property(mutable=True),
+        "locks": Property(unordered=True),
     }
 
     # create derived objects
diff --git a/test/fixtures/nodebalancers.json b/test/fixtures/nodebalancers.json
@@ -10,7 +10,8 @@
       "updated": "2018-01-01T00:01:01",
       "label": "balancer123456",
       "client_conn_throttle": 0,
-      "tags": ["something"]
+      "tags": ["something"],
+      "locks": ["cannot_delete_with_subresources"]
     },
     {
       "created": "2018-01-01T00:01:01",
@@ -22,7 +23,8 @@
       "updated": "2018-01-01T00:01:01",
       "label": "balancer123457",
       "client_conn_throttle": 0,
-      "tags": []
+      "tags": [],
+      "locks": []
     }
   ],
   "results": 2,
diff --git a/test/fixtures/nodebalancers_123456.json b/test/fixtures/nodebalancers_123456.json
@@ -10,5 +10,8 @@
   "client_conn_throttle": 0,
   "tags": [
     "something"
+  ],
+  "locks": [
+    "cannot_delete_with_subresources"
   ]
 }
diff --git a/test/integration/filters/fixtures.py b/test/integration/filters/fixtures.py
@@ -25,11 +25,11 @@ def lke_cluster_instance(test_linode_client):
 
     region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
 
-    node_pools = test_linode_client.lke.node_pool(node_type, 3)
+    node_pool = test_linode_client.lke.node_pool(node_type, 3)
     label = get_test_label() + "_cluster"
 
     cluster = test_linode_client.lke.cluster_create(
-        region, label, node_pools, version
+        region, label, version, [node_pool]
     )
 
     yield cluster
diff --git a/test/integration/filters/model_filters_test.py b/test/integration/filters/model_filters_test.py
@@ -63,12 +63,13 @@ def test_linode_type_model_filter(test_linode_client):
 
 def test_lke_cluster_model_filter(test_linode_client, lke_cluster_instance):
     client = test_linode_client
+    lke_cluster = lke_cluster_instance
 
     filtered_cluster = client.lke.clusters(
-        LKECluster.label.contains(lke_cluster_instance.label)
+        LKECluster.label.contains(lke_cluster.label)
     )
 
-    assert filtered_cluster[0].id == lke_cluster_instance.id
+    assert filtered_cluster[0].id == lke_cluster.id
 
 
 def test_networking_firewall_model_filter(
diff --git a/test/integration/models/linode/test_linode.py b/test/integration/models/linode/test_linode.py
@@ -1101,8 +1101,7 @@ def test_delete_interface_containing_vpc(
 
 def test_create_linode_with_maintenance_policy(test_linode_client):
     client = test_linode_client
-    # TODO: Replace with random region after GA
-    region = "ap-south"
+    region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
     label = get_test_label()
 
     policies = client.maintenance.maintenance_policies()
diff --git a/test/unit/objects/nodebalancers_test.py b/test/unit/objects/nodebalancers_test.py
@@ -175,6 +175,24 @@ def test_update(self):
                 },
             )
 
+    def test_locks_not_in_put(self):
+        """
+        Test that locks are not included in PUT request when updating a NodeBalancer.
+        Locks are managed through the separate /v4/locks endpoint.
+        """
+        nb = NodeBalancer(self.client, 123456)
+        # Access locks to ensure it's loaded
+        self.assertEqual(nb.locks, ["cannot_delete_with_subresources"])
+
+        nb.label = "new-label"
+
+        with self.mock_put("nodebalancers/123456") as m:
+            nb.save()
+            self.assertEqual(m.call_url, "/nodebalancers/123456")
+            # Verify locks is NOT in the PUT data
+            self.assertNotIn("locks", m.call_data)
+            self.assertEqual(m.call_data["label"], "new-label")
+
     def test_firewalls(self):
         """
         Test that you can get the firewalls for the requested NodeBalancer.

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ class NodeBalancer(Base):`
`252`	`252`	`"transfer": Property(),`
`253`	`253`	`"tags": Property(mutable=True, unordered=True),`
`254`	`254`	`"client_udp_sess_throttle": Property(mutable=True),`
	`255`	`+ "locks": Property(unordered=True),`
`255`	`256`	`}`
`256`	`257`
`257`	`258`	`# create derived objects`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,8 @@`
`10`	`10`	`"client_conn_throttle": 0,`
`11`	`11`	`"tags": [`
`12`	`12`	`"something"`
	`13`	`+ ],`
	`14`	`+ "locks": [`
	`15`	`+ "cannot_delete_with_subresources"`
`13`	`16`	`]`
`14`	`17`	`}`