@reventlessdev/reventless-aws 3.0.0-alpha.355 → 3.0.0-alpha.356

package/scripts/DeployApp.res.mjs

@@ -16,6 +16,7 @@ import * as Stdlib_Result from "@rescript/runtime/lib/es6/Stdlib_Result.js";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as CliArgs$Reventless from "@reventlessdev/reventless-spec/src/CliArgs.res.mjs";
 import * as ClientSsm from "@aws-sdk/client-ssm";
 import * as ClientSts from "@aws-sdk/client-sts";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -30,131 +31,68 @@ import * as IndexJs from "@pulumi/pulumi/automation/index.js";
 let defaultStack = "dev";
 
 function parseArgs(argv) {
-  let acc = {
-    TAG: "Ok",
-    _0: {
+  return Stdlib_Result.flatMap(CliArgs$Reventless.parse([
+    "manifest",
+    "stack"
+  ], undefined, undefined, undefined, argv), a => {
+    let help = CliArgs$Reventless.help(a);
+    let args_manifest = CliArgs$Reventless.string(a, "manifest");
+    let args_stack = Stdlib_Option.getOr(CliArgs$Reventless.string(a, "stack"), defaultStack);
+    let args = {
       command: undefined,
-      manifest: undefined,
-      stack: defaultStack,
-      help: false
+      manifest: args_manifest,
+      stack: args_stack,
+      help: help
+    };
+    let positionals = CliArgs$Reventless.positionals(a);
+    let match = positionals[0];
+    let match$1 = positionals[1];
+    if (match$1 !== undefined) {
+      return CliArgs$Reventless.extra(match$1);
     }
-  };
-  let i = 0;
-  let count = argv.length;
-  while (i < count) {
-    let flag = argv[i];
-    let value = argv[i + 1 | 0];
-    let match = acc;
-    let exit = 0;
-    if (match.TAG === "Ok") {
-      let a = match._0;
-      let exit$1 = 0;
-      switch (flag) {
-        case "--manifest" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                command: a.command,
-                manifest: value,
-                stack: a.stack,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--stack" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                command: a.command,
-                manifest: a.manifest,
-                stack: value,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--help" :
-        case "-h" :
-          exit$1 = 2;
-          break;
-        case "down" :
-          if (a.command === undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                command: "Down",
-                manifest: a.manifest,
-                stack: a.stack,
-                help: a.help
-              }
-            };
-            i = i + 1 | 0;
-          } else {
-            exit$1 = 3;
-          }
-          break;
-        case "up" :
-          if (a.command === undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                command: "Up",
-                manifest: a.manifest,
-                stack: a.stack,
-                help: a.help
-              }
-            };
-            i = i + 1 | 0;
-          } else {
-            exit$1 = 3;
-          }
-          break;
-        default:
-          exit$1 = 3;
-      }
-      switch (exit$1) {
-        case 2 :
-          acc = {
-            TAG: "Ok",
-            _0: {
-              command: a.command,
-              manifest: a.manifest,
-              stack: a.stack,
-              help: true
-            }
-          };
-          i = i + 1 | 0;
-          break;
-        case 3 :
-          acc = {
-            TAG: "Error",
-            _0: `unknown argument "` + flag + `"`
-          };
-          break;
+    if (match === undefined) {
+      if (help) {
+        return {
+          TAG: "Ok",
+          _0: args
+        };
+      } else {
+        return {
+          TAG: "Error",
+          _0: "say `up` or `down`"
+        };
       }
-    } else {
-      i = count;
     }
-    if (exit === 1) {
-      acc = {
-        TAG: "Error",
-        _0: flag + ` needs a value`
-      };
+    switch (match) {
+      case "down" :
+        return {
+          TAG: "Ok",
+          _0: {
+            command: "Down",
+            manifest: args_manifest,
+            stack: args_stack,
+            help: help
+          }
+        };
+      case "up" :
+        return {
+          TAG: "Ok",
+          _0: {
+            command: "Up",
+            manifest: args_manifest,
+            stack: args_stack,
+            help: help
+          }
+        };
+      default:
+        return CliArgs$Reventless.extra(match);
     }
-  };
-  return acc;
+  });
 }
 
 let usage = `
+Usage: deploy-app up|down [--manifest <path>] [--stack <name>]
+
 Deploy an app to AWS, or remove it again.
 
   deploy-app up     Deploy the platform and every plugin, bake the component
@@ -907,32 +845,20 @@ async function down(manifest, stack) {
   };
 }
 
-async function run() {
-  let e = parseArgs(process.argv.slice(2, process.argv.length));
+async function run(param) {
+  let stack = param.stack;
+  let command = param.command;
+  let e = DeployManifest$ReventlessAws.load(Stdlib_Option.getOr(param.manifest, DeployManifest$ReventlessAws.defaultFile));
   if (e.TAG !== "Ok") {
     return e;
   }
-  let args = e._0;
-  let command = args.command;
-  if (args.help) {
-    console.log(usage);
-    return {
-      TAG: "Ok",
-      _0: undefined
-    };
-  }
   if (command === undefined) {
     return {
       TAG: "Error",
-      _0: "say `up` or `down` (--help for more)"
+      _0: "say `up` or `down`"
     };
   }
-  let stack = args.stack;
-  let e$1 = DeployManifest$ReventlessAws.load(Stdlib_Option.getOr(args.manifest, DeployManifest$ReventlessAws.defaultFile));
-  if (e$1.TAG !== "Ok") {
-    return e$1;
-  }
-  let manifest = e$1._0;
+  let manifest = e._0;
   if (command === "Up") {
     return await up(manifest, stack);
   } else {
@@ -940,21 +866,29 @@ async function run() {
   }
 }
 
-async function main() {
-  let message;
-  try {
-    message = await run();
-  } catch (raw_exn) {
-    let exn = Primitive_exceptions.internalToException(raw_exn);
-    console.error(`deploy-app: ` + Util_AwsError$ReventlessAws.describe(exn));
+let cli = {
+  bin: "deploy-app",
+  usage: usage,
+  parse: parseArgs
+};
+
+function main() {
+  return CliArgs$Reventless.run(cli, undefined, undefined, async args => {
+    let message;
+    try {
+      message = await run(args);
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      console.error(`deploy-app: ` + Util_AwsError$ReventlessAws.describe(exn));
+      process.exit(1);
+      return;
+    }
+    if (message.TAG === "Ok") {
+      return;
+    }
+    console.error(`deploy-app: ` + message._0);
     process.exit(1);
-    return;
-  }
-  if (message.TAG === "Ok") {
-    return;
-  }
-  console.error(`deploy-app: ` + message._0);
-  process.exit(1);
+  });
 }
 
 let Automation;
@@ -1010,6 +944,7 @@ export {
   up,
   down,
   run,
+  cli,
   main,
 }
 /* yaml Not a pure module */

package/scripts/ProvisionAccounts.res

@@ -54,36 +54,19 @@ type args = {
   [ProvisionAdmin.parseArgs] gives, which lands harder here: a typo'd
   `--provider-id` would fall through to the environment and create the whole cast
   in a *different pool* than the operator named. */
-let parseArgs = (argv: array<string>): result<args, string> => {
-  let acc = ref(Ok({providerId: None, stack: None, file: None, help: false}))
-  let i = ref(0)
-  let count = argv->Array.length
-  while i.contents < count {
-    let flag = argv->Array.getUnsafe(i.contents)
-    let value = argv->Array.get(i.contents + 1)
-    switch (acc.contents, flag, value) {
-    | (Error(_), _, _) => i := count
-    | (Ok(a), "--provider-id", Some(v)) =>
-      acc := Ok({...a, providerId: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--stack", Some(v)) =>
-      acc := Ok({...a, stack: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--file", Some(v)) =>
-      acc := Ok({...a, file: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--help", _) | (Ok(a), "-h", _) =>
-      acc := Ok({...a, help: true})
-      i := i.contents + 1
-    | (Ok(_), "--provider-id", None) | (Ok(_), "--file", None) | (Ok(_), "--stack", None) =>
-      acc := Error(`${flag} needs a value`)
-    | (Ok(_), unknown, _) => acc := Error(`unknown argument "${unknown}"`)
-    }
-  }
-  acc.contents
-}
+let parseArgs = (argv: array<string>): result<args, string> =>
+  Reventless.CliArgs.parse(~strings=["provider-id", "stack", "file"], argv)
+  ->Result.flatMap(Reventless.CliArgs.noPositionals)
+  ->Result.map(a => {
+    providerId: a->Reventless.CliArgs.string("provider-id"),
+    stack: a->Reventless.CliArgs.string("stack"),
+    file: a->Reventless.CliArgs.string("file"),
+    help: a->Reventless.CliArgs.help,
+  })
 
 let usage = `
+Usage: provision-accounts [--provider-id <id>] [--stack <name>] [--file <path>]
+
 Turn a declared cast of accounts into working sign-ins.
 
   --provider-id <id>   The identity provider to create the accounts in. Usually
@@ -291,48 +274,44 @@ let provision = async (
     }
   }
 
-let run = async (): result<unit, string> =>
-  // argv[0] is node, argv[1] this script.
-  switch parseArgs(NodeProcess.argv->Array.slice(~start=2, ~end=NodeProcess.argv->Array.length)) {
+let run = async (args: args): result<unit, string> =>
+  switch Manifest.locate(~given=?args.file, ()) {
   | Error(_) as e => e
-  | Ok(args) if args.help =>
-    Console.log(usage)
-    Ok()
-  | Ok(args) =>
-    switch Manifest.locate(~given=?args.file, ()) {
-    | Error(_) as e => e
-    | Ok(located) =>
-      let file = located->Manifest.pathOf
-      switch located {
-      | SeededFrom(_, template) => Console.log(`manifest ${file} (new, copied from ${template})`)
-      | Declared(_) => ()
-      }
-      switch ProvisionProvider.resolve(~given=args.providerId, ~stack=args.stack) {
-      | Error(message) =>
-        Error(`${message}. To fill in the manifest without creating anything, run prepare-accounts`)
-      | Ok((providerId, source)) =>
-        Console.log(`provider ${providerId} (from ${source->ProvisionProvider.describe})`)
-        await provision(~file, ~providerId)
-      }
+  | Ok(located) =>
+    let file = located->Manifest.pathOf
+    switch located {
+    | SeededFrom(_, template) => Console.log(`manifest ${file} (new, copied from ${template})`)
+    | Declared(_) => ()
+    }
+    switch ProvisionProvider.resolve(~given=args.providerId, ~stack=args.stack) {
+    | Error(message) =>
+      Error(`${message}. To fill in the manifest without creating anything, run prepare-accounts`)
+    | Ok((providerId, source)) =>
+      Console.log(`provider ${providerId} (from ${source->ProvisionProvider.describe})`)
+      await provision(~file, ~providerId)
     }
   }
 
+let cli: Reventless.CliArgs.cli<args> = {bin: "provision-accounts", usage, parse: parseArgs}
+
 /**
 🚨 **Catches thrown exceptions, not only `Error` results** — the reason
 [ProvisionAdmin.main] gives. Without it an SDK failure escapes an async function
 nothing awaits and Node reports `UnhandledPromiseRejection ... "#<Object>"`,
 naming neither the call that failed nor why.
 */
-let main = async () =>
-  switch await run() {
-  | Ok() => ()
-  | Error(message) =>
-    Console.error(`provision-accounts: ${message}`)
-    NodeProcess.exit(1)
-  | exception exn =>
-    Console.error(`provision-accounts: ${Util_AwsError.describe(exn)}`)
-    NodeProcess.exit(1)
-  }
+let main = () =>
+  Reventless.CliArgs.run(cli, async args =>
+    switch await run(args) {
+    | Ok() => ()
+    | Error(message) =>
+      Console.error(`provision-accounts: ${message}`)
+      NodeProcess.exit(1)
+    | exception exn =>
+      Console.error(`provision-accounts: ${Util_AwsError.describe(exn)}`)
+      NodeProcess.exit(1)
+    }
+  )
 
 // 🚨 **No top-level call.** `../run-provision-accounts.mjs` invokes [main]; this
 // module only defines it. A module that ran itself on import could not be

package/scripts/ProvisionAccounts.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Stdlib_Result from "@rescript/runtime/lib/es6/Stdlib_Result.js";
+import * as CliArgs$Reventless from "@reventlessdev/reventless-spec/src/CliArgs.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as AccountsManifest$Reventless from "@reventlessdev/reventless-spec/src/types/AccountsManifest.res.mjs";
 import * as Util_AwsError$ReventlessAws from "../src/util/Util_AwsError.res.mjs";
@@ -7,110 +9,21 @@ import * as ProvisionCognito$ReventlessAws from "./ProvisionCognito.res.mjs";
 import * as ProvisionProvider$ReventlessAws from "./ProvisionProvider.res.mjs";
 
 function parseArgs(argv) {
-  let acc = {
-    TAG: "Ok",
-    _0: {
-      providerId: undefined,
-      stack: undefined,
-      file: undefined,
-      help: false
-    }
-  };
-  let i = 0;
-  let count = argv.length;
-  while (i < count) {
-    let flag = argv[i];
-    let value = argv[i + 1 | 0];
-    let match = acc;
-    let exit = 0;
-    if (match.TAG === "Ok") {
-      let a = match._0;
-      let exit$1 = 0;
-      switch (flag) {
-        case "--file" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                providerId: a.providerId,
-                stack: a.stack,
-                file: value,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--provider-id" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                providerId: value,
-                stack: a.stack,
-                file: a.file,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--stack" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                providerId: a.providerId,
-                stack: value,
-                file: a.file,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--help" :
-        case "-h" :
-          exit$1 = 2;
-          break;
-        default:
-          acc = {
-            TAG: "Error",
-            _0: `unknown argument "` + flag + `"`
-          };
-      }
-      if (exit$1 === 2) {
-        acc = {
-          TAG: "Ok",
-          _0: {
-            providerId: a.providerId,
-            stack: a.stack,
-            file: a.file,
-            help: true
-          }
-        };
-        i = i + 1 | 0;
-      }
-    } else {
-      i = count;
-    }
-    if (exit === 1) {
-      acc = {
-        TAG: "Error",
-        _0: flag + ` needs a value`
-      };
-    }
-  };
-  return acc;
+  return Stdlib_Result.map(Stdlib_Result.flatMap(CliArgs$Reventless.parse([
+    "provider-id",
+    "stack",
+    "file"
+  ], undefined, undefined, undefined, argv), CliArgs$Reventless.noPositionals), a => ({
+    providerId: CliArgs$Reventless.string(a, "provider-id"),
+    stack: CliArgs$Reventless.string(a, "stack"),
+    file: CliArgs$Reventless.string(a, "file"),
+    help: CliArgs$Reventless.help(a)
+  }));
 }
 
 let usage = `
+Usage: provision-accounts [--provider-id <id>] [--stack <name>] [--file <path>]
+
 Turn a declared cast of accounts into working sign-ins.
 
   --provider-id <id>   The identity provider to create the accounts in. Usually
@@ -277,24 +190,12 @@ async function provision(file, providerId, checkPoolOpt) {
   };
 }
 
-async function run() {
-  let e = parseArgs(process.argv.slice(2, process.argv.length));
+async function run(args) {
+  let e = AccountsManifest$Reventless.locate(args.file, undefined);
   if (e.TAG !== "Ok") {
     return e;
   }
-  let args = e._0;
-  if (args.help) {
-    console.log(usage);
-    return {
-      TAG: "Ok",
-      _0: undefined
-    };
-  }
-  let e$1 = AccountsManifest$Reventless.locate(args.file, undefined);
-  if (e$1.TAG !== "Ok") {
-    return e$1;
-  }
-  let located = e$1._0;
+  let located = e._0;
   let file = AccountsManifest$Reventless.pathOf(located);
   if (located.TAG !== "Declared") {
     console.log(`manifest ` + file + ` (new, copied from ` + located._1 + `)`);
@@ -312,21 +213,29 @@ async function run() {
   return await provision(file, providerId, undefined);
 }
 
-async function main() {
-  let message;
-  try {
-    message = await run();
-  } catch (raw_exn) {
-    let exn = Primitive_exceptions.internalToException(raw_exn);
-    console.error(`provision-accounts: ` + Util_AwsError$ReventlessAws.describe(exn));
+let cli = {
+  bin: "provision-accounts",
+  usage: usage,
+  parse: parseArgs
+};
+
+function main() {
+  return CliArgs$Reventless.run(cli, undefined, undefined, async args => {
+    let message;
+    try {
+      message = await run(args);
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      console.error(`provision-accounts: ` + Util_AwsError$ReventlessAws.describe(exn));
+      process.exit(1);
+      return;
+    }
+    if (message.TAG === "Ok") {
+      return;
+    }
+    console.error(`provision-accounts: ` + message._0);
     process.exit(1);
-    return;
-  }
-  if (message.TAG === "Ok") {
-    return;
-  }
-  console.error(`provision-accounts: ` + message._0);
-  process.exit(1);
+  });
 }
 
 let Cognito;
@@ -346,6 +255,7 @@ export {
   manifestNote,
   provision,
   run,
+  cli,
   main,
 }
-/* AccountsManifest-Reventless Not a pure module */
+/* CliArgs-Reventless Not a pure module */