@openfn/cli 0.3.1 → 0.4.1

package/dist/index.js

@@ -113,6 +113,9 @@ var ensureLogOpts = (opts2) => {
       } else {
         component = "default";
         level = l.toLowerCase();
+        if (level === "none" && !parts.find((p) => p.startsWith("job"))) {
+          components["job"] = "none";
+        }
       }
       if (!/^(cli|runtime|compiler|job|default)$/i.test(component)) {
         throw new Error(ERROR_MESSAGE_LOG_COMPONENT);
@@ -416,8 +419,26 @@ var useAdaptorsMonorepo = {
     }
   }
 };
+var sanitize = {
+  name: "sanitize",
+  yargs: {
+    string: true,
+    alias: ["sanitise"],
+    description: "Sanitize logging of objects and arrays: none (default), remove, summarize, obfuscate.",
+    default: "none"
+  },
+  ensure: (opts2) => {
+    if (!opts2.sanitize || opts2.sanitize?.match(/^(none|summarize|remove|obfuscate)$/)) {
+      return;
+    }
+    const err = "Unknown sanitize value provided: " + opts2.sanitize;
+    console.error(err);
+    throw new Error(err);
+  }
+};
 
 // src/util/command-builders.ts
+import c from "chalk";
 var expandYargs = (y2) => {
   if (typeof y2 === "function") {
     return y2();
@@ -433,7 +454,18 @@ function build(opts2, yargs2) {
 var ensure = (command, opts2) => (yargs2) => {
   yargs2.command = command;
   opts2.filter((opt) => opt.ensure).forEach((opt) => {
-    opt.ensure(yargs2);
+    try {
+      opt.ensure(yargs2);
+    } catch (e) {
+      console.error(
+        c.red(`
+Error parsing command arguments: ${command}.${opt.name}
+`)
+      );
+      console.error(c.red("Aborting"));
+      console.error();
+      process.exit(9);
+    }
   });
 };
 var override = (command, yargs2) => {
@@ -537,6 +569,7 @@ var options4 = [
   outputStdout,
   repoDir,
   skipAdaptorValidation,
+  sanitize,
   start,
   statePath,
   stateStdin,

package/dist/process/runner.js

@@ -24,6 +24,7 @@ var createLogger = (name = "", options) => {
   return actualCreateLogger(namespaces[name] || name, {
     level,
     json,
+    sanitize: options.sanitize || "none",
     ...logOptions
   });
 };
@@ -1082,16 +1083,32 @@ import path5 from "path";
 import fs3 from "node:fs/promises";
 import {
   getConfig as getConfig2,
-  getState,
-  mergeSpecIntoState,
-  getSpec
+  getProject,
+  getSpec,
+  getStateFromProjectPayload
 } from "@openfn/deploy";
 async function pullHandler(options, logger) {
   try {
     assert_path_default(options.projectId);
     const config = mergeOverrides2(await getConfig2(options.configPath), options);
-    logger.always("Downloading project yaml and state from instance");
-    const state = await getState(config.statePath);
+    logger.always("Downloading existing project state (as JSON) from the server.");
+    const { data: project } = await getProject(config, options.projectId);
+    if (!project) {
+      logger.error("ERROR: Project not found.");
+      logger.warn(
+        "Please check the UUID and verify your endpoint and apiKey in your config."
+      );
+      process.exitCode = 1;
+      process.exit(1);
+    }
+    const state = getStateFromProjectPayload(project);
+    await fs3.writeFile(
+      path5.resolve(config.statePath),
+      JSON.stringify(state, null, 2)
+    );
+    logger.always(
+      "Downloading the project spec (as YAML) from the server."
+    );
     const url2 = new URL(
       `api/provision/yaml?id=${options.projectId}`,
       config.endpoint
@@ -1103,22 +1120,24 @@ async function pullHandler(options, logger) {
         Accept: "application/json"
       }
     });
+    if (res.status != 200) {
+      logger.error("ERROR: Project spec not retrieved.");
+      logger.warn(
+        "No YAML representation of this project could be retrieved from the server."
+      );
+      process.exitCode = 1;
+      process.exit(1);
+    }
     const resolvedPath = path5.resolve(config.specPath);
     logger.debug("reading spec from", resolvedPath);
     await fs3.writeFile(resolvedPath, res.body);
-    const spec = await getSpec(config.specPath);
-    logger.debug("validated spec: ", spec);
+    const spec = await getSpec(resolvedPath);
     if (spec.errors.length > 0) {
       logger.error("ERROR: invalid spec");
       logger.error(spec.errors);
       process.exitCode = 1;
       process.exit(1);
     }
-    const nextState = mergeSpecIntoState(state, spec.doc);
-    await fs3.writeFile(
-      path5.resolve(config.statePath),
-      JSON.stringify(nextState, null, 2)
-    );
     logger.success("Project pulled successfully");
     process.exitCode = 0;
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -39,15 +39,16 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^1.1.4",
+    "chalk": "^5.1.2",
     "figures": "^5.0.0",
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",
     "yargs": "^17.7.2",
-    "@openfn/compiler": "0.0.35",
-    "@openfn/deploy": "0.2.5",
+    "@openfn/compiler": "0.0.36",
+    "@openfn/deploy": "0.2.7",
     "@openfn/describe-package": "0.0.18",
-    "@openfn/logger": "0.0.16",
-    "@openfn/runtime": "0.0.29"
+    "@openfn/logger": "0.0.17",
+    "@openfn/runtime": "0.0.31"
   },
   "files": [
     "dist",