Update command scripts

Author: mnieber

dodo_webdev_commands/aws-connect.py

@@ -21,9 +21,15 @@ def _args():
     profiles = Dodo.get_config("/AWS/profiles", {})
     profile = profiles[args.profile]
 
+    Dodo.run(["pass", "landler/aws"])
     Dodo.run(["aws", "configure", "sso", f"--profile={profile}"])
     Dodo.run(["aws", "sts", "get-caller-identity", f"--profile={profile}"])
 
+    for key, value in dict(AWS_PROFILE=profile).items():
+        Dodo.get_container().command_line.env_vars_from_input_args.append(
+            f"{key}={value}"
+        )
+
     print("Connecting to tailscale")
     Dodo.run(["sudo", "tailscale", "up", "--accept-dns", "--accept-routes"])
     Dodo.run(
@@ -35,5 +41,4 @@ def _args():
             f"--name={profile}-eks",
             f"--alias={profile}",
         ],
-        variable_map=dict(AWS_PROFILE=profile),
     )

dodo_webdev_commands/django-manage.py

@@ -7,7 +7,7 @@ def _args():
     Dodo.parser.add_argument(
         "--name",
     )
-    Dodo.parser.add_argument("cmd_args", nargs="?")
+    Dodo.parser.add_argument("cmd_args", nargs="*")
     args = Dodo.parse_args()
     args.python = Dodo.get_config("/DJANGO/python")
     args.cwd = Dodo.get_config("/DJANGO/cwd")

dodo_webdev_commands/download-dump.py

@@ -2,40 +2,44 @@
 from argparse import ArgumentParser
 
 from dodo_commands import Dodo
-from dodo_commands.framework.config import merge_into_config
 from dodo_commands.framework.choice_picker import ChoicePicker
+from dodo_commands.framework.config import merge_into_config
 from dodo_ssh_agent_commands.utils import add_ssh_agent_args
 
 
 def _args():
     parser = ArgumentParser()
-    parser.add_argument('host')
+    parser.add_argument("host")
     args = Dodo.parse_args(parser)
     return args
 
 
 def _get_timestamp(fn):
-    return fn.split('_')[-1]
+    return fn.split("_")[-1]
 
 
 if Dodo.is_main(__name__, safe=True):
     args = _args()
-    project_name = Dodo.get_config('/ROOT/project_name')
-    cmd = 'root@{host}:/srv/{projectName}/dumps'.format(
-        host=args.host, projectName=project_name)
-    dumps_dir = '/srv/%s/dumps' % project_name
+    project_name = Dodo.get_config("/ROOT/project_name")
+    cmd = "root@{host}:/srv/{projectName}/dumps".format(
+        host=args.host, projectName=project_name
+    )
+    dumps_dir = "/srv/%s/dumps" % project_name
 
     merge_into_config(
-        Dodo.get_config('/DOCKER').setdefault('options', {}),
-        {Dodo.command_name: add_ssh_agent_args({'is_interactive': False})})
-
-    dump_fns = Dodo.run([
-        'ssh',
-        'root@%s' % args.host,
-        'ls',
-        os.path.join(dumps_dir, '*.sql'),
-    ],
-                        capture=True).split()
+        Dodo.get_config("/DOCKER").setdefault("options", {}),
+        {Dodo.command_name: add_ssh_agent_args({"is_interactive": False})},
+    )
+
+    dump_fns = Dodo.run(
+        [
+            "ssh",
+            "root@%s" % args.host,
+            "ls",
+            os.path.join(dumps_dir, "*.sql"),
+        ],
+        capture=True,
+    ).split()
 
     dump_fns = sorted([x for x in dump_fns if x], key=_get_timestamp)
 
@@ -45,10 +49,10 @@ def print_choices(self, choices):
                 print("%d: %s" % (idx + 1, dump_fn))
 
         def question(self):
-            return 'Select files to download (e.g. 1,3-4): '
+            return "Select files to download (e.g. 1,3-4): "
 
     picker = Picker()
     picker.pick(dump_fns)
 
     for dump_fn in picker.get_choices():
-        Dodo.run(['scp', 'root@%s:%s' % (args.host, dump_fn), dump_fn])
+        Dodo.run(["scp", "root@%s:%s" % (args.host, dump_fn), dump_fn])

dodo_webdev_commands/kubectl-cp.py

@@ -1,3 +1,4 @@
+import os
 from argparse import ArgumentParser
 
 from dodo_commands import Dodo
@@ -9,6 +10,7 @@
 def _args():
     parser = ArgumentParser(description="")
     parser.add_argument("filename")
+    parser.add_argument("--rev", action="store_true")
 
     # Use the parser to create the command arguments
     args = Dodo.parse_args(parser, config_args=[])
@@ -21,4 +23,14 @@ def _args():
     args = _args()
     container_name = KubeCtlDecorator.get_full_container_name(Dodo.get_config)
 
-    Dodo.run(["kubectl", "cp", args.filename, f"{container_name}:/app"])
+    if args.rev:
+        Dodo.run(
+            [
+                "kubectl",
+                "cp",
+                f"{container_name}:/app/{args.filename}",
+                f"./{os.path.basename(args.filename)}",
+            ]
+        )
+    else:
+        Dodo.run(["kubectl", "cp", args.filename, f"{container_name}:/app"])