Target/source of app upload|download command should be arg, not flag

Fixes #394
mittwald · Sep 4, 2024 · a30d42d · a30d42d
1 parent 0855c6e
commit a30d42d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/commands/app/download.tsx b/src/commands/app/download.tsx
@@ -4,7 +4,7 @@ import {
   makeProcessRenderer,
   processFlags,
 } from "../../rendering/process/process_flags.js";
-import { Flags } from "@oclif/core";
+import { Args } from "@oclif/core";
 import { Success } from "../../rendering/react/components/Success.js";
 import { ReactNode } from "react";
 import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
@@ -30,21 +30,22 @@ export class Download extends ExecRenderBaseCommand<typeof Download, void> {
     filterFileDocumentation;
   static args = {
     ...appInstallationArgs,
+    target: Args.directory({
+      description: "target directory to download the app installation to",
+      required: true,
+      exists: false,
+    }),
   };
   static flags = {
     ...processFlags,
     ...sshConnectionFlags,
     ...appInstallationSyncFlags("download"),
-    target: Flags.directory({
-      description: "target directory to download the app installation to",
-      required: true,
-      exists: false,
-    }),
   };
 
   protected async exec(): Promise<void> {
     const appInstallationId = await this.withAppInstallationId(Download);
-    const { "dry-run": dryRun, target, "ssh-user": sshUser } = this.flags;
+    const { "dry-run": dryRun, "ssh-user": sshUser } = this.flags;
+    const { target } = this.args;
 
     const p = makeProcessRenderer(this.flags, "Downloading app installation");
 

diff --git a/src/commands/app/upload.tsx b/src/commands/app/upload.tsx
@@ -4,7 +4,7 @@ import {
   makeProcessRenderer,
   processFlags,
 } from "../../rendering/process/process_flags.js";
-import { Flags } from "@oclif/core";
+import { Args } from "@oclif/core";
 import { Success } from "../../rendering/react/components/Success.js";
 import { ReactNode } from "react";
 import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
@@ -31,21 +31,22 @@ export class Upload extends ExecRenderBaseCommand<typeof Upload, void> {
     filterFileDocumentation;
   static args = {
     ...appInstallationArgs,
+    source: Args.directory({
+      description: "source directory from which to upload the app installation",
+      required: true,
+      exists: true,
+    }),
   };
   static flags = {
     ...processFlags,
     ...sshConnectionFlags,
     ...appInstallationSyncFlags("upload"),
-    source: Flags.directory({
-      description: "source directory from which to upload the app installation",
-      required: true,
-      exists: true,
-    }),
   };
 
   protected async exec(): Promise<void> {
     const appInstallationId = await this.withAppInstallationId(Upload);
-    const { "dry-run": dryRun, source, "ssh-user": sshUser } = this.flags;
+    const { "dry-run": dryRun, "ssh-user": sshUser } = this.flags;
+    const { source } = this.args;
 
     const p = makeProcessRenderer(this.flags, "Uploading app installation");