tft-cli 0.0.21__py3-none-any.whl → 0.0.22__py3-none-any.whl

tft/cli/commands.py

@@ -1296,6 +1296,9 @@ def reserve(
     worker_image: Optional[str] = OPTION_WORKER_IMAGE,
     security_group_rule_ingress: Optional[List[str]] = OPTION_SECURITY_GROUP_RULE_INGRESS,
     security_group_rule_egress: Optional[List[str]] = OPTION_SECURITY_GROUP_RULE_EGRESS,
+    skip_workstation_access: bool = typer.Option(
+        False, help="Do not allow ingress traffic from this workstation's ip to the reserved machine"
+    ),
 ):
     """
     Reserve a system in Testing Farm.
@@ -1393,8 +1396,22 @@ def reserve(
     if post_install_script:
         environment["settings"]["provisioning"]["post_install_script"] = post_install_script
 
-    if security_group_rule_ingress or security_group_rule_egress:
-        rules = _parse_security_group_rules(security_group_rule_ingress or [], security_group_rule_egress or [])
+    if not skip_workstation_access or security_group_rule_ingress or security_group_rule_egress:
+        ingress_rules = security_group_rule_ingress or []
+        if not skip_workstation_access:
+            try:
+                get_ip = requests.get(settings.PUBLIC_IP_CHECKER_URL)
+            except requests.exceptions.RequestException as err:
+                exit_error(f"Could not get workstation ip to form a security group rule: {err}")
+
+            if get_ip.ok:
+                ip = get_ip.text.strip()
+                ingress_rules.append(f'-1:{ip}:-1')  # noqa: E231
+
+            else:
+                exit_error(f"Got {get_ip.status_code} while checking {settings.PUBLIC_IP_CHECKER_URL}")
+
+        rules = _parse_security_group_rules(ingress_rules, security_group_rule_egress or [])
         environment["settings"]["provisioning"].update(rules)
 
     console.print(f"🕗 Reserved for [blue]{str(reservation_duration)}[/blue] minutes")
@@ -1577,27 +1594,10 @@ def reserve(
 
             time.sleep(1)
 
-    sshproxy_url = urllib.parse.urljoin(str(settings.API_URL), f"v0.1/sshproxy?api_key={settings.API_TOKEN}")
-    response = session.get(sshproxy_url)
-
-    content = response.json()
-
-    ssh_private_key = ""
-    if content.get('ssh_private_key_base_64'):
-        ssh_private_key = base64.b64decode(content['ssh_private_key_base_64']).decode()
-
-    ssh_proxy_option = f" -J {content['ssh_proxy']}" if content.get('ssh_proxy') else ""
-
-    if ssh_private_key:
-        console.print("🔑 [blue]Adding SSH proxy key[/blue]")
-        subprocess.run(["ssh-add", "-"], input=ssh_private_key.encode())
-
-    console.print(f"🌎 ssh{ssh_proxy_option} root@{guest}")
+    console.print(f"🌎 ssh root@{guest}")
 
     if autoconnect:
-        os.system(
-            f"ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null{ssh_proxy_option} root@{guest}"  # noqa: E501
-        )
+        os.system(f"ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@{guest}")  # noqa: E501
 
 
 def update():

tft/cli/config.py

@@ -24,4 +24,5 @@ settings = LazySettings(
     # Testing Farm sanity test,
     TESTING_FARM_TESTS_GIT_URL="https://gitlab.com/testing-farm/tests",
     TESTING_FARM_SANITY_PLAN="/testing-farm/sanity",
+    PUBLIC_IP_CHECKER_URL="http://icanhazip.com",
 )

{tft_cli-0.0.21.dist-info → tft_cli-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tft-cli
-Version: 0.0.21
+Version: 0.0.22
 Summary: Testing Farm CLI tool
 License: Apache-2.0
 Author: Miroslav Vadkerti

tft_cli-0.0.22.dist-info/RECORD

@@ -0,0 +1,10 @@
+tft/cli/__init__.py,sha256=uEJkNJbqC583PBtNI30kxWdeOr3Wj6zJzIYKf0AD72I,92
+tft/cli/commands.py,sha256=mRIeB9JsvRHhiAGJUxXLFMTKuvEt2AGN8AhVujBQcZo,62824
+tft/cli/config.py,sha256=CQrqucLMNlRrjK_y5WY6vLbAYA5TcnHG_kw8CgJ09OA,1165
+tft/cli/tool.py,sha256=wFcVxe1NRGW8stputOZlKMasZHjpysas7f0sgpEzipQ,865
+tft/cli/utils.py,sha256=iWQnjA5rYhwMaz8cP_zmfJ5HihTbaKE3XzZk0N4nfcE,7664
+tft_cli-0.0.22.dist-info/LICENSE,sha256=YpVAQfXkIyzQAdm5LZkI6L5UWqLppa6O8_tgDSdoabQ,574
+tft_cli-0.0.22.dist-info/METADATA,sha256=1FC__NfxUWFgQUr-8R1glWqIKi3kBvsSpZrM4rEBUEM,762
+tft_cli-0.0.22.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+tft_cli-0.0.22.dist-info/entry_points.txt,sha256=xzdebHkH5Bx-YRf-XPMsIoVpvgfUqqcRQGuo8DFkiao,49
+tft_cli-0.0.22.dist-info/RECORD,,

tft_cli-0.0.21.dist-info/RECORD

@@ -1,10 +0,0 @@
-tft/cli/__init__.py,sha256=uEJkNJbqC583PBtNI30kxWdeOr3Wj6zJzIYKf0AD72I,92
-tft/cli/commands.py,sha256=RTLThzZsT7JPfLgODez9EyqEp3j-sntpP6-qGNXeegs,62704
-tft/cli/config.py,sha256=lJ9TtsBAdcNDbh4xZd0x1b48V7IsGl3t7kALmNjCqNs,1115
-tft/cli/tool.py,sha256=wFcVxe1NRGW8stputOZlKMasZHjpysas7f0sgpEzipQ,865
-tft/cli/utils.py,sha256=iWQnjA5rYhwMaz8cP_zmfJ5HihTbaKE3XzZk0N4nfcE,7664
-tft_cli-0.0.21.dist-info/LICENSE,sha256=YpVAQfXkIyzQAdm5LZkI6L5UWqLppa6O8_tgDSdoabQ,574
-tft_cli-0.0.21.dist-info/METADATA,sha256=58RB9HSg-rtSx7POEf6hu_0gt-GU32S8Z96w5fh_5CU,762
-tft_cli-0.0.21.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-tft_cli-0.0.21.dist-info/entry_points.txt,sha256=xzdebHkH5Bx-YRf-XPMsIoVpvgfUqqcRQGuo8DFkiao,49
-tft_cli-0.0.21.dist-info/RECORD,,