Merge pull request #775 from linode/dev

v5.58.0

Author: zliang-akamai

tests/integration/cli/test_help.py

@@ -22,7 +22,7 @@ def test_help_page_for_non_aliased_actions():
     assert contains_at_least_one_of(
         wrapped_output,
         [
-            "API Documentation:  https://www.linode.com/docs/api/linode-instances/#linodes-list",
+            "API Documentation: https://techdocs.akamai.com/linode-api/reference/get-linode",
             "API Documentation:  https://techdocs.akamai.com/linode-api/reference/get-linode-instances",
         ],
     )
@@ -44,7 +44,7 @@ def test_help_page_for_aliased_actions():
     assert contains_at_least_one_of(
         wrapped_output,
         [
-            "API Documentation:  https://www.linode.com/docs/api/linode-instances/#linodes-list",
+            "API Documentation: https://techdocs.akamai.com/linode-api/reference/get-linode",
             "API Documentation:  https://techdocs.akamai.com/linode-api/reference/get-linode-instances",
         ],
     )

tests/integration/firewalls/test_firewalls.py

@@ -1,17 +1,20 @@
+import json
 import re
 import time
 
 import pytest
+from pytest import MonkeyPatch
 
 from linodecli.exit_codes import ExitCodes
 from tests.integration.helpers import (
     delete_target_id,
     exec_failing_test_command,
     exec_test_command,
+    get_random_text,
 )
 
 BASE_CMD = ["linode-cli", "firewalls"]
-FIREWALL_LABEL = "label-fw-test" + str(int(time.time()))
+FIREWALL_LABEL = "fw-" + get_random_text(5)
 
 
 @pytest.fixture
@@ -253,3 +256,87 @@ def test_update_firewall(test_firewall_id):
     )
 
     assert re.search(firewall_id + "," + updated_label + ",enabled", result)
+
+
+@pytest.mark.skip("skip until there is a way to delete default firewall")
+def test_firewall_settings_update_and_list(test_firewall_id):
+    for cmd in [
+        BASE_CMD
+        + [
+            "firewall-settings-update",
+            "--default_firewall_ids.vpc_interfac",
+            test_firewall_id,
+            "--default_firewall_ids.public_interface",
+            test_firewall_id,
+            "--default_firewall_ids.nodebalancer",
+            test_firewall_id,
+            "--default_firewall_ids.linode",
+            test_firewall_id,
+            "--json",
+        ],
+        BASE_CMD
+        + [
+            "firewall-settings-list",
+            "--json",
+        ],
+    ]:
+        data = json.loads(exec_test_command(cmd).stdout.decode().rstrip())
+        firewall_ids = data[0]["default_firewall_ids"]
+        for key in [
+            "linode",
+            "nodebalancer",
+            "public_interface",
+            "vpc_interface",
+        ]:
+            assert firewall_ids[key] == int(test_firewall_id)
+
+
+def test_firewall_templates_list(monkeypatch: MonkeyPatch):
+    monkeypatch.setenv("LINODE_CLI_API_VERSION", "v4beta")
+    data = json.loads(
+        exec_test_command(BASE_CMD + ["templates-list", "--json"])
+        .stdout.decode()
+        .rstrip()
+    )
+
+    slugs = {template["slug"] for template in data}
+    expected_slugs = {"akamai-non-prod", "vpc", "public"}
+    assert expected_slugs.issubset(slugs)
+
+    for template in data:
+        assert "slug" in template
+        assert "rules" in template
+        rules = template["rules"]
+
+        assert "inbound_policy" in rules
+        assert "outbound_policy" in rules
+        assert isinstance(rules.get("inbound", []), list)
+        assert isinstance(rules.get("outbound", []), list)
+
+        for rule in rules.get("inbound", []):
+            assert "action" in rule
+            assert "protocol" in rule
+            assert "label" in rule
+            assert "addresses" in rule
+
+
+def test_firewall_template_view(monkeypatch: MonkeyPatch):
+    monkeypatch.setenv("LINODE_CLI_API_VERSION", "v4beta")
+    for slug in ["akamai-non-prod", "vpc", "public"]:
+        data = json.loads(
+            exec_test_command(BASE_CMD + ["template-view", slug, "--json"])
+            .stdout.decode()
+            .rstrip()
+        )
+        template = data[0]
+
+        assert template["slug"] == slug
+        assert "rules" in template
+        assert "inbound" in template["rules"]
+        assert "outbound" in template["rules"]
+        assert "inbound_policy" in template["rules"]
+        assert "outbound_policy" in template["rules"]
+        assert template["rules"]["inbound_policy"] == "DROP"
+        assert template["rules"]["outbound_policy"] == "ACCEPT"
+        assert isinstance(template["rules"]["inbound"], list)
+        assert isinstance(template["rules"]["outbound"], list)

tests/integration/firewalls/test_firewalls_rules.py

@@ -1,13 +1,16 @@
 import json
 import re
-import time
 
 import pytest
 
-from tests.integration.helpers import delete_target_id, exec_test_command
+from tests.integration.helpers import (
+    delete_target_id,
+    exec_test_command,
+    get_random_text,
+)
 
 BASE_CMD = ["linode-cli", "firewalls", "rules-update"]
-FIREWALL_LABEL = "label-fw-test" + str(int(time.time()))
+FIREWALL_LABEL = "fw-" + get_random_text(5)
 
 
 @pytest.fixture
@@ -35,7 +38,7 @@ def test_firewall_id():
     )
 
     yield firewall_id
-    # teardown - delete all firewalls
+
     delete_target_id(target="firewalls", id=firewall_id)
 
 
@@ -81,8 +84,7 @@ def test_add_multiple_rules(test_firewall_id):
 
 
 def test_swap_rules():
-    timestamp = str(time.time_ns())
-    firewall_label = "label-fw-test" + timestamp
+    firewall_label = "fw-" + get_random_text(5)
     inbound_rule_1 = '{"ports": "22", "protocol": "TCP", "addresses": {"ipv4": ["198.0.0.1/32"]}, "action": "ACCEPT", "label": "swap_rule_1"}'
     inbound_rule_2 = '{"ports": "22", "protocol": "TCP", "addresses": {"ipv4": ["198.0.0.2/32"]}, "action": "ACCEPT", "label": "swap_rule_2"}'
     inbound_rules = "[" + inbound_rule_1 + "," + inbound_rule_2 + "]"
@@ -160,8 +162,7 @@ def test_update_inbound_and_outbound_policy(test_firewall_id):
 
 
 def test_remove_one_rule_via_rules_update():
-    timestamp = str(time.time_ns())
-    firewall_label = "label-fw-test" + timestamp
+    firewall_label = "fw-" + get_random_text(5)
     inbound_rule_1 = '{"ports": "22", "protocol": "TCP", "addresses": {"ipv4": ["198.0.0.1/32"]}, "action": "ACCEPT", "label": "test_rule_1"}'
     inbound_rule_2 = '{"ports": "22", "protocol": "TCP", "addresses": {"ipv4": ["198.0.0.2/32"]}, "action": "ACCEPT", "label": "rule_to_delete"}'
     inbound_rules = "[" + inbound_rule_1 + "," + inbound_rule_2 + "]"

tests/integration/helpers.py

@@ -36,8 +36,16 @@ def wait_for_condition(interval: int, timeout: int, condition: Callable):
 
 
 def exec_test_command(args: List[str]):
-    process = subprocess.run(args, stdout=subprocess.PIPE)
-    assert process.returncode == 0
+    process = subprocess.run(
+        args, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+    if process.returncode != 0:
+        raise RuntimeError(
+            f"Command failed with exit code {process.returncode}\n"
+            f"Command: {' '.join(args)}\n"
+            f"Stdout:\n{process.stdout.decode()}\n"
+            f"Stderr:\n{process.stderr.decode()}"
+        )
     return process
 
 

tests/integration/linodes/helpers_linodes.py

@@ -72,35 +72,40 @@ def wait_until(linode_id: "str", timeout, status: "str", period=5):
 
 
 def create_linode(
-    firewall_id: "str", test_region=DEFAULT_REGION, disk_encryption=False
+    firewall_id: str,
+    test_region=DEFAULT_REGION,
+    disk_encryption=False,
+    interface_generation: str = None,
+    interfaces: str = None,
 ):
-    # create linode
-    linode_id = (
-        exec_test_command(
-            [
-                "linode-cli",
-                "linodes",
-                "create",
-                "--type",
-                DEFAULT_LINODE_TYPE,
-                "--region",
-                test_region,
-                "--image",
-                DEFAULT_TEST_IMAGE,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                firewall_id,
-                "--disk_encryption",
-                "enabled" if disk_encryption else "disabled",
-                "--format=id",
-                "--text",
-                "--no-headers",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
+    # Base command
+    command = [
+        "linode-cli",
+        "linodes",
+        "create",
+        "--type",
+        DEFAULT_LINODE_TYPE,
+        "--region",
+        test_region,
+        "--image",
+        DEFAULT_TEST_IMAGE,
+        "--root_pass",
+        DEFAULT_RANDOM_PASS,
+        "--firewall_id",
+        firewall_id,
+        "--disk_encryption",
+        "enabled" if disk_encryption else "disabled",
+    ]
+
+    if interface_generation:
+        command.extend(["--interface_generation", interface_generation])
+
+    if interfaces:
+        command.extend(["--interfaces", interfaces])
+
+    command.extend(["--format=id", "--text", "--no-headers"])
+
+    linode_id = exec_test_command(command).stdout.decode().rstrip()
 
     return linode_id
 

tests/integration/linodes/test_interfaces.py

@@ -17,57 +17,6 @@
 linode_label = DEFAULT_LABEL + timestamp
 
 
-@pytest.fixture
-def linode_with_vpc_interface(linode_cloud_firewall):
-    vpc_json = create_vpc_w_subnet()
-
-    vpc_region = vpc_json["region"]
-    vpc_id = str(vpc_json["id"])
-    subnet_id = str(vpc_json["subnets"][0]["id"])
-
-    linode_json = json.loads(
-        exec_test_command(
-            BASE_CMD
-            + [
-                "create",
-                "--type",
-                "g6-nanode-1",
-                "--region",
-                vpc_region,
-                "--image",
-                DEFAULT_TEST_IMAGE,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--interfaces.purpose",
-                "vpc",
-                "--interfaces.primary",
-                "true",
-                "--interfaces.subnet_id",
-                subnet_id,
-                "--interfaces.ipv4.nat_1_1",
-                "any",
-                "--interfaces.ipv4.vpc",
-                "10.0.0.5",
-                "--interfaces.ip_ranges",
-                json.dumps(["10.0.0.6/32"]),
-                "--interfaces.purpose",
-                "public",
-                "--json",
-                "--suppress-warnings",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )[0]
-
-    yield linode_json, vpc_json
-
-    delete_target_id(target="linodes", id=str(linode_json["id"]))
-    delete_target_id(target="vpcs", id=vpc_id)
-
-
 @pytest.fixture
 def linode_with_vpc_interface_as_json(linode_cloud_firewall):
     vpc_json = create_vpc_w_subnet()
@@ -150,9 +99,5 @@ def assert_interface_configuration(
     assert public_interface["purpose"] == "public"
 
 
-def test_with_vpc_interface(linode_with_vpc_interface):
-    assert_interface_configuration(*linode_with_vpc_interface)
-
-
 def test_with_vpc_interface_as_json(linode_with_vpc_interface_as_json):
     assert_interface_configuration(*linode_with_vpc_interface_as_json)