@credibledata/cred-cli 0.0.100 → 0.0.103

package/src/commands/misc/login.ts

@@ -7,6 +7,7 @@ import { ClientConfiguration } from "../../clientconfiguration";
 import {
    auth0ConfigsByEnv,
    AUTH_CLI_LOOPBACK_REDIRECT_URI,
+   Cluster,
    Environment,
    getAuth0OrganizationIdForCliLogin,
    LOGIN_TIMEOUT_MS,
@@ -17,10 +18,25 @@ import * as loopbackOAuth from "./loopbackOAuth";
 
 const organizationsApi = new OrganizationsApi(new Configuration());
 
+/**
+ * True when argv is a `cred login ...` invocation (argv = [node, script,
+ * command, ...args]).
+ *
+ * Recovery from a corrupt `~/.cred` is scoped to this command only and must run
+ * at startup (see index.ts), before the eager config reads there. `cred login`
+ * is the one command whose job is to (re)establish config and the documented
+ * reset path; every other command must stay fail-loud so a stray read never
+ * silently resets a user's tokens.
+ */
+export function isLoginInvocation(argv: string[]): boolean {
+   return argv[2] === "login";
+}
+
 export async function login(
    organizationName: string,
    controlPlaneBaseURL?: string,
    configPath?: string,
+   cluster?: Cluster,
 ) {
    const config = new ClientConfiguration(configPath);
    const environment = config.getEnvironment();
@@ -29,8 +45,10 @@ export async function login(
       return loginM2M(organizationName, config);
    }
 
-   const auth0OrganizationId =
-      getAuth0OrganizationIdForCliLogin(organizationName);
+   const auth0OrganizationId = getAuth0OrganizationIdForCliLogin(
+      organizationName,
+      cluster,
+   );
    if (auth0OrganizationId) {
       return loginWithAuthCodePkceOrganization(
          environment,

package/src/commands/package/deletepackage.spec.ts

@@ -123,7 +123,7 @@ describe("delete-package", () => {
       expect(deletePackageStub.called).to.be.false;
       expect(
          loggerStub.error.calledWith(
-            sinon.match("Please, make sure to set a project"),
+            sinon.match("Please, make sure to set an environment"),
          ),
       ).to.be.true;
    });

package/src/commands/package/deletepackage.ts

@@ -14,7 +14,7 @@ export async function deletePackage(
 ) {
    const clientConfig = new ClientConfiguration();
    const organizationName = clientConfig.getOrganization();
-   const projectName = clientConfig.getProject();
+   const environmentName = clientConfig.getProject();
    const packageName = packagePath.replace("/", "");
 
    if (!clientConfig.doesConfigExists()) {
@@ -22,8 +22,8 @@ export async function deletePackage(
       return;
    }
 
-   if (!projectName) {
-      logger.error("Please, make sure to set a project");
+   if (!environmentName) {
+      logger.error("Please, make sure to set an environment");
       return;
    }
 
@@ -42,7 +42,7 @@ export async function deletePackage(
    try {
       await packagesApi.deletePackage(
          organizationName,
-         projectName,
+         environmentName,
          packageName,
          {
             baseURL: packageServer,

package/src/commands/package/listpackages.spec.ts

@@ -114,7 +114,7 @@ describe("list-packages", () => {
       expect(result).to.be.undefined;
       expect(
          loggerStub.error.calledWith(
-            sinon.match("Please, make sure to set a project"),
+            sinon.match("Please, make sure to set an environment"),
          ),
       ).to.be.true;
    });
@@ -144,4 +144,20 @@ describe("list-packages", () => {
 
       expect(consoleLogStub.called).to.be.true;
    });
+
+   it("should exit non-zero and not print on failure in printOutPackages", async () => {
+      // On error, listPackages returns undefined. printOutPackages must NOT print
+      // `undefined` to stdout (which breaks downstream JSON.parse) and must signal
+      // failure with a non-zero exit code.
+      listPackagesStub.rejects(new Error("API Error"));
+      const prevExitCode = process.exitCode;
+      process.exitCode = 0;
+
+      await printOutPackages("http://test-server", false);
+
+      expect(consoleLogStub.called).to.be.false;
+      expect(process.exitCode).to.equal(1);
+
+      process.exitCode = prevExitCode;
+   });
 });

package/src/commands/package/listpackages.ts

@@ -19,15 +19,15 @@ export async function listPackages(
 ) {
    const clientConfig = new ClientConfiguration();
    const organizationName = clientConfig.getOrganization();
-   const projectName = clientConfig.getProject();
+   const environmentName = clientConfig.getProject();
 
    if (!clientConfig.doesConfigExists()) {
       logger.error("Please, make sure that you are logged in");
       return;
    }
 
-   if (!projectName) {
-      logger.error("Please, make sure to set a project");
+   if (!environmentName) {
+      logger.error("Please, make sure to set an environment");
       return;
    }
 
@@ -35,7 +35,7 @@ export async function listPackages(
       const { limit, offset } = parsePaginationParams(page, pageSize);
       const response = await packagesApi.listPackages(
          organizationName,
-         projectName,
+         environmentName,
          limit,
          offset,
          {
@@ -63,5 +63,12 @@ export async function printOutPackages(
    pageSize?: string | number,
 ) {
    const packages = await listPackages(controlPlane, debug, page, pageSize);
+   if (!packages) {
+      // listPackages already logged the failure (to stderr). Signal failure with
+      // a non-zero exit code instead of printing `undefined` to stdout and
+      // exiting 0 — otherwise scripts/tests that JSON.parse stdout choke on it.
+      process.exitCode = 1;
+      return;
+   }
    console.log(prettifyJson(packages));
 }

package/src/commands/package/publish.spec.ts

@@ -56,7 +56,14 @@ describe("publish", () => {
    let originalArchiverModule: any;
    const archiverModulePath = require.resolve("archiver");
 
+   // publish reports failure by setting process.exitCode, so each test starts from a
+   // known 0 and the suite restores whatever the runner had — a leaked non-zero would
+   // fail the whole mocha run regardless of the assertions.
+   let originalExitCode: number | string | undefined;
+
    beforeEach(() => {
+      originalExitCode = process.exitCode;
+      process.exitCode = 0;
       sandbox = sinon.createSandbox();
 
       // Create mock archive
@@ -142,6 +149,7 @@ describe("publish", () => {
    });
 
    afterEach(() => {
+      process.exitCode = originalExitCode;
       sandbox.restore();
       // Restore original archiver module
       if (originalArchiverModule) {
@@ -351,6 +359,10 @@ describe("publish", () => {
             sinon.match("Please, make sure that you are logged in"),
          ),
       ).to.be.true;
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should handle invalid token", async () => {
@@ -387,6 +399,10 @@ describe("publish", () => {
             sinon.match("No token found. Please login."),
          ),
       ).to.be.true;
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should handle invalid manifest", async () => {
@@ -395,6 +411,11 @@ describe("publish", () => {
       await publish("http://test-server", 2, false, true, false);
 
       expect(createOrUpdatePackageStub.called).to.be.false;
+      // validateManifest logs its own reason, so only the exit code is asserted here.
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should handle missing organization", async () => {
@@ -416,6 +437,11 @@ describe("publish", () => {
       sandbox
          .stub(ClientConfiguration.prototype, "getOrganization")
          .returns("");
+      // publish calls getProject before the organization check — stub it too
+      // so we don't fall through into real loadConfig against a stubbed fs.
+      sandbox
+         .stub(ClientConfiguration.prototype, "getProject")
+         .returns("test-project");
       validateManifestStub.returns(true);
       sandbox
          .stub(PackagesApi.prototype, "createOrUpdatePackage")
@@ -435,6 +461,10 @@ describe("publish", () => {
             sinon.match("Please, make sure that you are logged in"),
          ),
       ).to.be.true;
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should handle missing project", async () => {
@@ -473,9 +503,13 @@ describe("publish", () => {
       expect(createOrUpdatePackageStub.called).to.be.false;
       expect(
          loggerStub.error.calledWith(
-            sinon.match("Please, make sure to set a project"),
+            sinon.match("Please, make sure to set an environment"),
          ),
       ).to.be.true;
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should handle missing publisher.json", async () => {
@@ -495,6 +529,10 @@ describe("publish", () => {
             ),
          ),
       ).to.be.true;
+      expect(
+         process.exitCode,
+         "a publish that never ran must not exit 0",
+      ).to.equal(1);
    });
 
    it("should request confirmation when autoConfirm is false", async function () {
@@ -536,6 +574,9 @@ describe("publish", () => {
       expect(createOrUpdatePackageStub.called).to.be.false;
       expect(loggerStub.info.calledWith(sinon.match("Operation cancelled."))).to
          .be.true;
+      // Declining the prompt is an answer, not a failure: it can only happen
+      // interactively, and a human who said no does not want a failed command.
+      expect(process.exitCode, "cancelling is not a failure").to.equal(0);
    });
 
    it("should handle API errors", async function () {
@@ -562,6 +603,10 @@ describe("publish", () => {
       expect(
          loggerStub.error.calledWith(sinon.match("Failed to publish package")),
       ).to.be.true;
+      // The log alone is not the contract: CI and scripts wrap `cred publish` and
+      // read its exit code, so a rejected publish exiting 0 reports success for a
+      // package that was never published.
+      expect(process.exitCode).to.equal(1);
    });
 
    it("should log package URL after successful publish", async function () {

package/src/commands/package/publish.ts

@@ -13,6 +13,23 @@ import { validateManifest } from "../../validator";
 const packagesApi = new PackagesApi(new Configuration());
 const PACKAGE_MANIFEST_NAME = "publisher.json";
 
+/**
+ * Record a publish failure: log it (when the caller has a message of its own to give)
+ * and mark the process failed.
+ *
+ * Every early return below is a publish that did not happen, so each one has to carry the
+ * same non-zero exit as a server rejection. CI and scripts wrap `cred publish` and read
+ * its exit code; exiting 0 tells them a package is there when it is not. Declining the
+ * confirmation prompt is deliberately NOT routed through here — that is an answer rather
+ * than a failure, and it can only happen interactively.
+ */
+function failPublish(message?: string): void {
+   if (message) {
+      logger.error(message);
+   }
+   process.exitCode = 1;
+}
+
 export async function publish(
    controlPlane: string,
    replicationCount: number,
@@ -23,37 +40,39 @@ export async function publish(
    const clientConfig = new ClientConfiguration();
 
    if (!clientConfig.doesConfigExists()) {
-      logger.error("Please, make sure that you are logged in");
+      failPublish("Please, make sure that you are logged in");
       return;
    }
 
    const tokenValidation = clientConfig.isTokenValid();
    if (!tokenValidation.valid) {
-      logger.error(
+      failPublish(
          tokenValidation.reason || "Please, make sure that you are logged in",
       );
       return;
    }
 
    if (!validateManifest()) {
+      // validateManifest logs its own reason; only the exit code is missing.
+      failPublish();
       return;
    }
 
-   const projectName = clientConfig.getProject();
+   const environmentName = clientConfig.getProject();
    const organizationName = clientConfig.getOrganization();
 
    if (!organizationName) {
-      logger.error("Please, make sure that you are logged in");
+      failPublish("Please, make sure that you are logged in");
       return;
    }
 
-   if (!projectName) {
-      logger.error("Please, make sure to set a project");
+   if (!environmentName) {
+      failPublish("Please, make sure to set an environment");
       return;
    }
 
    if (!fs.existsSync(PACKAGE_MANIFEST_NAME)) {
-      logger.error(
+      failPublish(
          `Failed to publish the package. Could not find ${PACKAGE_MANIFEST_NAME}, please ensure you are in a directory containing ${PACKAGE_MANIFEST_NAME}`,
       );
       return;
@@ -82,7 +101,7 @@ export async function publish(
       controlPlane,
       replicationCount,
       organizationName,
-      projectName,
+      environmentName,
       tmpPackagePath,
       packageManifest.name,
       packageManifest.description,
@@ -126,7 +145,7 @@ async function pushTmpPackageToRemoteServer(
    controlPlane: string,
    replicationCount: number,
    organizationName: string,
-   projectName: string,
+   environmentName: string,
    tmpPackagePath: string,
    name: string,
    description: string,
@@ -164,7 +183,7 @@ async function pushTmpPackageToRemoteServer(
       if (debug) {
          logger.debug("Package contents: " + packageContents);
          logger.debug("Organization name: " + organizationName);
-         logger.debug("Project name: " + projectName);
+         logger.debug("Environment name: " + environmentName);
          logger.debug("Name: " + name);
          logger.debug("Package: " + JSON.stringify(_package));
          logger.debug("Version: " + JSON.stringify(version));
@@ -175,12 +194,16 @@ async function pushTmpPackageToRemoteServer(
       }
       const response = await packagesApi.createOrUpdatePackage(
          organizationName,
-         projectName,
+         environmentName,
          name,
          _package,
          version,
          packageContents,
          md5Hash,
+         // draftId / workspace: a zip upload has no git-backed draft, so the server
+         // records no provenance. Positional because `options` must stay last.
+         undefined,
+         undefined,
          {
             baseURL: controlPlane,
             headers: clientConfig.getHeaders(),
@@ -190,13 +213,15 @@ async function pushTmpPackageToRemoteServer(
       logger.info(prettifyJson(response.data));
       const packageUrl = path.join(
          organizationName,
-         projectName,
+         environmentName,
          name,
          versionId,
       );
       logger.info(`Package available at: ${packageUrl}`);
    } catch (e) {
-      logger.error("Failed to publish package");
+      // The server rejected it: a model that does not compile, or a `#@ persist`
+      // declaration the publisher refuses to load.
+      failPublish("Failed to publish package");
       printOutError(e, debug);
    }
 }

package/src/commands/package/updatepackage.spec.ts

@@ -188,7 +188,7 @@ describe("set-replication-count", () => {
 
             expect(
                loggerStub.error.calledWith(
-                  sinon.match("Please, make sure to set a project"),
+                  sinon.match("Please, make sure to set an environment"),
                ),
             ).to.be.true;
          });

package/src/commands/package/updatepackage.ts

@@ -20,15 +20,15 @@ export async function updatePackage(
 ) {
    const clientConfig = new ClientConfiguration();
    const organizationName = clientConfig.getOrganization();
-   const projectName = clientConfig.getProject();
+   const environmentName = clientConfig.getProject();
 
    if (!clientConfig.doesConfigExists()) {
       logger.error("Please, make sure that you are logged in");
       return;
    }
 
-   if (!projectName) {
-      logger.error("Please, make sure to set a project");
+   if (!environmentName) {
+      logger.error("Please, make sure to set an environment");
       return;
    }
 
@@ -68,7 +68,7 @@ export async function updatePackage(
 
       const response = await packagesApi.updatePackage(
          organizationName,
-         projectName,
+         environmentName,
          packageName,
          packageUpdate,
          {