@credibledata/cred-cli 0.0.7 → 0.0.102

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

@@ -50,6 +50,7 @@ describe("publish", () => {
       debug: boolean,
       autoConfirm: boolean,
       setLatest: boolean,
+      asyncIndexing?: boolean,
    ) => Promise<void>;
 
    // Store the original archiver module so we can restore it
@@ -183,12 +184,14 @@ describe("publish", () => {
       expect(createOrUpdatePackageStub.firstCall.args[2]).to.equal(
          "test-package",
       );
-      expect(createOrUpdatePackageStub.firstCall.args[3]).to.deep.include({
+      // arg[3] is the new `async` flag; package/version shift by one.
+      expect(createOrUpdatePackageStub.firstCall.args[3]).to.equal(false);
+      expect(createOrUpdatePackageStub.firstCall.args[4]).to.deep.include({
          name: "test-package",
          description: "Test package",
          replicationCount: 2,
       });
-      expect(createOrUpdatePackageStub.firstCall.args[4]).to.deep.include({
+      expect(createOrUpdatePackageStub.firstCall.args[5]).to.deep.include({
          id: "1.0.0",
       });
       expect(
@@ -217,7 +220,7 @@ describe("publish", () => {
 
       await publish("http://test-server", 2, false, true, true);
 
-      expect(createOrUpdatePackageStub.firstCall.args[3]).to.deep.include({
+      expect(createOrUpdatePackageStub.firstCall.args[4]).to.deep.include({
          latestVersion: "1.0.0",
       });
    });
@@ -241,7 +244,7 @@ describe("publish", () => {
 
       await publish("http://test-server", 2, false, true, false);
 
-      expect(createOrUpdatePackageStub.firstCall.args[3]).to.not.have.property(
+      expect(createOrUpdatePackageStub.firstCall.args[4]).to.not.have.property(
          "latestVersion",
       );
    });
@@ -315,7 +318,7 @@ describe("publish", () => {
 
       await publish("http://test-server", 2, false, true, false);
 
-      expect(createOrUpdatePackageStub.firstCall.args[6]).to.equal(
+      expect(createOrUpdatePackageStub.firstCall.args[7]).to.equal(
          expectedHash,
       );
    });
@@ -416,6 +419,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")
@@ -473,7 +481,7 @@ 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;
    });
@@ -564,6 +572,28 @@ describe("publish", () => {
       ).to.be.true;
    });
 
+   it("should pass async=true to the API when asyncIndexing is set", async function () {
+      this.timeout(5000);
+      const mockManifest = {
+         name: "test-package",
+         version: "1.0.0",
+         description: "Test package",
+      };
+      const mockPackageData = Buffer.from("test package data");
+
+      readFileSyncStub.callsFake((filePath: string) => {
+         if (filePath === "publisher.json") return JSON.stringify(mockManifest);
+         return mockPackageData;
+      });
+      getConfirmationStub.resolves(true);
+      createOrUpdatePackageStub.resolves({ data: {} });
+      unlinkStub.callsArg(1);
+
+      await publish("http://test-server", 2, false, true, false, true);
+
+      expect(createOrUpdatePackageStub.firstCall.args[3]).to.equal(true);
+   });
+
    it("should log package URL after successful publish", async function () {
       this.timeout(5000);
       const mockManifest = {

package/src/commands/package/publish.ts

@@ -19,6 +19,7 @@ export async function publish(
    debug: boolean,
    autoConfirm: boolean,
    setLatest: boolean,
+   asyncIndexing: boolean = false,
 ) {
    const clientConfig = new ClientConfiguration();
 
@@ -39,7 +40,7 @@ export async function publish(
       return;
    }
 
-   const projectName = clientConfig.getProject();
+   const environmentName = clientConfig.getProject();
    const organizationName = clientConfig.getOrganization();
 
    if (!organizationName) {
@@ -47,8 +48,8 @@ export async function publish(
       return;
    }
 
-   if (!projectName) {
-      logger.error("Please, make sure to set a project");
+   if (!environmentName) {
+      logger.error("Please, make sure to set an environment");
       return;
    }
 
@@ -82,13 +83,14 @@ export async function publish(
       controlPlane,
       replicationCount,
       organizationName,
-      projectName,
+      environmentName,
       tmpPackagePath,
       packageManifest.name,
       packageManifest.description,
       packageManifest.version,
       debug,
       setLatest,
+      asyncIndexing,
    );
    await removeTmpPackage(tmpPackagePath);
 }
@@ -126,13 +128,14 @@ async function pushTmpPackageToRemoteServer(
    controlPlane: string,
    replicationCount: number,
    organizationName: string,
-   projectName: string,
+   environmentName: string,
    tmpPackagePath: string,
    name: string,
    description: string,
    versionId: string,
    debug: boolean,
    setLatest: boolean,
+   asyncIndexing: boolean,
 ): Promise<undefined> {
    logger.info("Pushing package " + name + " version " + versionId);
 
@@ -164,7 +167,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,8 +178,9 @@ async function pushTmpPackageToRemoteServer(
       }
       const response = await packagesApi.createOrUpdatePackage(
          organizationName,
-         projectName,
+         environmentName,
          name,
+         asyncIndexing,
          _package,
          version,
          packageContents,
@@ -190,7 +194,7 @@ async function pushTmpPackageToRemoteServer(
       logger.info(prettifyJson(response.data));
       const packageUrl = path.join(
          organizationName,
-         projectName,
+         environmentName,
          name,
          versionId,
       );

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,
          {

package/src/commands/rm.ts

@@ -5,7 +5,8 @@ import { deleteGroup } from "./group/deletegroup";
 import { removeMember } from "./group/removemember";
 import { deleteGroupAccessToken } from "./groupaccesstoken/deleteToken";
 import { deletePackage } from "./package/deletepackage";
-import { deleteProject } from "./project/deleteproject";
+import { deleteEnvironment } from "./environment/deleteenvironment";
+import { warnProjectDeprecated } from "./legacy";
 
 export const registerRmCommands = (cli: Command, environment: Environment) => {
    const rm = cli
@@ -27,18 +28,33 @@ export const registerRmCommands = (cli: Command, environment: Environment) => {
          );
       });
 
+   const rmEnvironmentAction = (
+      environmentName: string,
+      options: { debug?: boolean; yes?: boolean },
+   ) => {
+      deleteEnvironment(
+         controlPlanesByEnv[environment],
+         environmentName,
+         options.debug,
+         options.yes,
+      );
+   };
+
+   rm.command("environment")
+      .description("Delete an environment.")
+      .argument("<environmentName>", "The name of the environment to delete.")
+      .option("--debug")
+      .option("-y, --yes", "Skip confirmation.")
+      .action(rmEnvironmentAction);
+
    rm.command("project")
-      .description("Delete a project.")
-      .argument("<projectName>", "The name of the project to delete.")
+      .description("[deprecated] Alias for 'rm environment'.")
+      .argument("<projectName>", "The name of the environment to delete.")
       .option("--debug")
       .option("-y, --yes", "Skip confirmation.")
       .action((projectName, options) => {
-         deleteProject(
-            controlPlanesByEnv[environment],
-            projectName,
-            options.debug,
-            options.yes,
-         );
+         warnProjectDeprecated("rm environment");
+         rmEnvironmentAction(projectName, options);
       });
 
    rm.command("connection")

package/src/commands/set.ts

@@ -1,5 +1,6 @@
 import { Command } from "commander";
-import { setProject } from "./project/setproject";
+import { setEnvironment } from "./environment/setenvironment";
+import { warnProjectDeprecated } from "./legacy";
 
 export const registerSetCommands = (cli: Command) => {
    const set = cli
@@ -7,10 +8,18 @@ export const registerSetCommands = (cli: Command) => {
       .description("Set a resource")
       .argument("<resource>", "The resource to set");
 
+   set.command("environment")
+      .description("Set the default environment.")
+      .argument("<environmentName>", "The name of the environment to set.")
+      .action(setEnvironment);
+
    set.command("project")
-      .description("Set the default project.")
-      .argument("<projectName>", "The name of the project to set.")
-      .action(setProject);
+      .description("[deprecated] Alias for 'set environment'.")
+      .argument("<projectName>", "The name of the environment to set.")
+      .action((projectName) => {
+         warnProjectDeprecated("set environment");
+         setEnvironment(projectName);
+      });
 
    // TODO: It would be nice to `cred set org` and avoid logging again when switching orgs.
 };

package/src/commands/update.ts

@@ -1,7 +1,9 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Command } from "commander";
 import { controlPlanesByEnv, Environment } from "../constants";
 import { updatePackage } from "./package/updatepackage";
-import { updateProject } from "./project/updateproject";
+import { updateEnvironment } from "./environment/updateenvironment";
+import { warnProjectDeprecated } from "./legacy";
 
 export const registerUpdateCommands = (
    cli: Command,
@@ -12,10 +14,35 @@ export const registerUpdateCommands = (
       .description("Update a resource")
       .argument("<resource>", "The resource to update");
 
+   const updateEnvironmentAction = (environmentName: string, options: any) => {
+      updateEnvironment(
+         controlPlanesByEnv[environment],
+         environmentName,
+         {
+            replicationCount: options.replication,
+         },
+         options.debug,
+         options.yes,
+      );
+   };
+
+   update
+      .command("environment")
+      .description("Update an environment.")
+      .argument("<environmentName>", "The name of the environment to update.")
+      .option(
+         "--replication <replicationCount>",
+         "The new replication count (must be at least 1).",
+         parseInt,
+      )
+      .option("--debug")
+      .option("-y, --yes", "Skip confirmation.")
+      .action(updateEnvironmentAction);
+
    update
       .command("project")
-      .description("Update a project.")
-      .argument("<projectName>", "The name of the project to update.")
+      .description("[deprecated] Alias for 'update environment'.")
+      .argument("<projectName>", "The name of the environment to update.")
       .option(
          "--replication <replicationCount>",
          "The new replication count (must be at least 1).",
@@ -24,15 +51,8 @@ export const registerUpdateCommands = (
       .option("--debug")
       .option("-y, --yes", "Skip confirmation.")
       .action((projectName, options) => {
-         updateProject(
-            controlPlanesByEnv[environment],
-            projectName,
-            {
-               replicationCount: options.replication,
-            },
-            options.debug,
-            options.yes,
-         );
+         warnProjectDeprecated("update environment");
+         updateEnvironmentAction(projectName, options);
       });
 
    update

package/src/commands/version/archive-unarchive-version.spec.ts

@@ -50,7 +50,7 @@ describe("archive-unarchive-version", () => {
 
          expect(axiosStub.calledOnce).to.be.true;
          expect(axiosStub.firstCall.args[0]).to.equal(
-            "http://test-server/organizations/test-org/projects/test-project/packages/test-package/versions/1.0.0",
+            "http://test-server/organizations/test-org/environments/test-project/packages/test-package/versions/1.0.0",
          );
          expect(axiosStub.firstCall.args[1]).to.deep.equal({
             archiveStatus: "archive",
@@ -96,7 +96,7 @@ describe("archive-unarchive-version", () => {
 
          expect(axiosStub.calledOnce).to.be.true;
          expect(axiosStub.firstCall.args[0]).to.equal(
-            "http://test-server/organizations/test-org/projects/test-project/packages/test-package/versions/1.0.0",
+            "http://test-server/organizations/test-org/environments/test-project/packages/test-package/versions/1.0.0",
          );
          expect(axiosStub.firstCall.args[1]).to.deep.equal({
             archiveStatus: "unarchive",
@@ -215,7 +215,7 @@ describe("archive-unarchive-version", () => {
             expect(axiosStub.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;
          });
@@ -425,7 +425,7 @@ describe("archive-unarchive-version", () => {
             );
 
             expect(axiosStub.firstCall.args[0]).to.equal(
-               "https://api.example.com/organizations/test-org/projects/test-project/packages/my-package/versions/2.0.0",
+               "https://api.example.com/organizations/test-org/environments/test-project/packages/my-package/versions/2.0.0",
             );
          });
 

package/src/commands/version/archive-unarchive-version.ts

@@ -47,15 +47,15 @@ async function updateVersionArchiveStatus(
 ) {
    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;
    }
 
@@ -81,12 +81,9 @@ async function updateVersionArchiveStatus(
    logger.info(
       `${action === "archive" ? "Archiving" : "Unarchiving"} version ${packageName}/${versionId}`,
    );
-   console.log(
-      `${packageServer}/organizations/${organizationName}/projects/${projectName}/packages/${packageName}/versions/${versionId}`,
-   );
    try {
       const response = await axios.patch(
-         `${packageServer}/organizations/${organizationName}/projects/${projectName}/packages/${packageName}/versions/${versionId}`,
+         `${packageServer}/organizations/${organizationName}/environments/${environmentName}/packages/${packageName}/versions/${versionId}`,
          {
             archiveStatus: action,
          },

package/src/commands/version/listversions.spec.ts

@@ -119,7 +119,7 @@ describe("list-versions", () => {
       expect(listVersionsStub.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/version/listversions.ts

@@ -13,15 +13,15 @@ export async function listVersions(
 ) {
    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;
    }
 
@@ -29,7 +29,7 @@ export async function listVersions(
       const packageName = packagePath.replace("/", "");
       const response = await versionsApi.listVersions(
          organizationName,
-         projectName,
+         environmentName,
          packageName,
          {
             baseURL: controlPlane,

package/src/constants.spec.ts

@@ -0,0 +1,111 @@
+import { expect } from "chai";
+import {
+   CLUSTER_BY_ENVIRONMENT,
+   DEFAULT_ENVIRONMENT_BY_CLUSTER,
+   getAuth0OrganizationIdForCliLogin,
+   getCliOrgConfig,
+} from "./constants";
+
+describe("constants", () => {
+   describe("DEFAULT_ENVIRONMENT_BY_CLUSTER", () => {
+      it("defaults gcp to production", () => {
+         expect(DEFAULT_ENVIRONMENT_BY_CLUSTER.gcp).to.equal("production");
+      });
+
+      it("defaults aws to videoamp", () => {
+         expect(DEFAULT_ENVIRONMENT_BY_CLUSTER.aws).to.equal("videoamp");
+      });
+   });
+
+   describe("CLUSTER_BY_ENVIRONMENT", () => {
+      it("places videoamp on aws", () => {
+         expect(CLUSTER_BY_ENVIRONMENT.videoamp).to.equal("aws");
+      });
+
+      it("places every other env on gcp", () => {
+         expect(CLUSTER_BY_ENVIRONMENT.production).to.equal("gcp");
+         expect(CLUSTER_BY_ENVIRONMENT.staging).to.equal("gcp");
+         expect(CLUSTER_BY_ENVIRONMENT.dev).to.equal("gcp");
+         expect(CLUSTER_BY_ENVIRONMENT.localhost).to.equal("gcp");
+         expect(CLUSTER_BY_ENVIRONMENT["e2e-test"]).to.equal("gcp");
+      });
+
+      it("agrees with DEFAULT_ENVIRONMENT_BY_CLUSTER round-trip", () => {
+         for (const cluster of ["gcp", "aws"] as const) {
+            const defaultEnv = DEFAULT_ENVIRONMENT_BY_CLUSTER[cluster];
+            expect(CLUSTER_BY_ENVIRONMENT[defaultEnv]).to.equal(cluster);
+         }
+      });
+   });
+
+   describe("getCliOrgConfig", () => {
+      it("returns the videoamp registry entry", () => {
+         const cfg = getCliOrgConfig("videoamp");
+         expect(cfg).to.not.be.undefined;
+         expect(cfg!.cliOrgName).to.equal("videoamp");
+      });
+
+      it("lists videoamp's supported clusters and default", () => {
+         const cfg = getCliOrgConfig("videoamp")!;
+         expect(cfg.supportedClusters).to.have.members(["gcp", "aws"]);
+         expect(cfg.defaultCluster).to.be.oneOf(cfg.supportedClusters);
+      });
+
+      it("exposes the aws Auth0 org id for videoamp", () => {
+         const cfg = getCliOrgConfig("videoamp")!;
+         expect(cfg.auth0OrganizationIds?.aws).to.equal("org_nMRKafeSuxOiuJeG");
+      });
+
+      it("is case-insensitive on the org name", () => {
+         expect(getCliOrgConfig("VideoAmp")?.cliOrgName).to.equal("videoamp");
+         expect(getCliOrgConfig("VIDEOAMP")?.cliOrgName).to.equal("videoamp");
+      });
+
+      it("returns undefined for unregistered orgs (default gcp/device-flow path)", () => {
+         expect(getCliOrgConfig("acme")).to.be.undefined;
+         expect(getCliOrgConfig("some-new-customer")).to.be.undefined;
+      });
+
+      it("guarantees defaultCluster is in supportedClusters for every entry", () => {
+         for (const name of ["videoamp"]) {
+            const cfg = getCliOrgConfig(name)!;
+            expect(cfg.supportedClusters).to.include(cfg.defaultCluster);
+         }
+      });
+   });
+
+   describe("getAuth0OrganizationIdForCliLogin", () => {
+      it("returns the aws Auth0 org id when -c aws is the active cluster", () => {
+         expect(getAuth0OrganizationIdForCliLogin("videoamp", "aws")).to.equal(
+            "org_nMRKafeSuxOiuJeG",
+         );
+      });
+
+      it("returns undefined for videoamp on gcp (no aws-only Auth0 id maps to gcp)", () => {
+         expect(getAuth0OrganizationIdForCliLogin("videoamp", "gcp")).to.be
+            .undefined;
+      });
+
+      it("falls back to the org's defaultCluster when no cluster is passed", () => {
+         const cfg = getCliOrgConfig("videoamp")!;
+         const expected = cfg.auth0OrganizationIds?.[cfg.defaultCluster];
+         expect(getAuth0OrganizationIdForCliLogin("videoamp")).to.equal(
+            expected,
+         );
+      });
+
+      it("is case-insensitive on the org name", () => {
+         expect(getAuth0OrganizationIdForCliLogin("VideoAmp", "aws")).to.equal(
+            "org_nMRKafeSuxOiuJeG",
+         );
+      });
+
+      it("returns undefined for unregistered orgs (forces device-code flow)", () => {
+         expect(getAuth0OrganizationIdForCliLogin("acme")).to.be.undefined;
+         expect(getAuth0OrganizationIdForCliLogin("acme", "aws")).to.be
+            .undefined;
+         expect(getAuth0OrganizationIdForCliLogin("acme", "gcp")).to.be
+            .undefined;
+      });
+   });
+});