Merge branch 'dev' into feature/TPT-4280-linode-cli-add-integration-tests-for-reserved-ip-for-ipv4

Author: mawilk90

tests/integration/lke/helpers.py

@@ -76,6 +76,22 @@ def get_lke_enterprise_id():
     return enterprise_ti.get("id")
 
 
+def get_lke_standard_id():
+    standard_versions_list = exec_test_command(
+        BASE_CMDS["lke"]
+        + [
+            "versions-list",
+            "--json",
+        ]
+    )
+
+    parsed = json.loads(standard_versions_list)
+
+    standard_ti = parsed[0]
+
+    return standard_ti.get("id")
+
+
 def get_cluster_id(label: str):
     cluster_id = exec_test_command(
         [

tests/integration/lke/test_lke_enterprise.py

@@ -11,7 +11,11 @@
     get_random_region_with_caps,
     get_random_text,
 )
-from tests.integration.lke.helpers import get_cluster_id, get_lke_enterprise_id
+from tests.integration.lke.helpers import (
+    get_cluster_id,
+    get_lke_enterprise_id,
+    get_lke_standard_id,
+)
 
 
 def test_enterprise_tier_available_in_types(monkeypatch: MonkeyPatch):
@@ -116,6 +120,7 @@ def test_lke_tiered_versions_list():
 
 def test_lke_tiered_versions_view():
     enterprise_id = get_lke_enterprise_id()
+    standard_id = get_lke_standard_id()
     enterprise_tier_info = exec_test_command(
         BASE_CMDS["lke"]
         + [
@@ -138,7 +143,7 @@ def test_lke_tiered_versions_view():
         + [
             "tiered-version-view",
             "standard",
-            "1.33",
+            standard_id,
             "--json",
         ]
     )

tests/integration/monitor/test_plugin_get_metrics.py

@@ -3,6 +3,7 @@
 """
 
 import os
+from unittest import mock
 
 import pytest
 
@@ -85,6 +86,7 @@ def test_missing_time_params(self):
         )
         assert "Time duration required" in stderr
 
+    @mock.patch.dict(os.environ, {"JWE_TOKEN": "fake-token"})
     def test_invalid_service(self):
         """Test that an unknown service name hits the API and fails"""
         stderr = exec_failing_test_command(

tests/integration/nodebalancers/test_node_balancers.py

@@ -482,7 +482,7 @@ def test_update_node_for_node_balancer_udp_configuration(
         == node_id
         + ",defaultnode1,"
         + nodebalancer_with_udp_config_and_node[3]
-        + ":80,Unknown,30,none"
+        + ":80,Unknown,30,none,"
     )
 
 
@@ -511,7 +511,7 @@ def test_list_nodes_for_node_balancer_udp_configuration(
         == node_id
         + ",defaultnode1,"
         + nodebalancer_with_udp_config_and_node[3]
-        + ":80,Unknown,100,none"
+        + ":80,Unknown,100,none,"
     )
 
 
@@ -540,7 +540,7 @@ def test_view_node_for_node_balancer_udp_configuration(
         == node_id
         + ",defaultnode1,"
         + nodebalancer_with_udp_config_and_node[3]
-        + ":80,Unknown,100,none"
+        + ":80,Unknown,100,none,"
     )