@credibledata/cred-cli 0.0.102 → 0.0.103

package/src/constants.ts

@@ -4,7 +4,8 @@ export type Environment =
    | "dev"
    | "localhost"
    | "e2e-test"
-   | "videoamp";
+   | "videoamp"
+   | "aws-dev";
 
 export const controlPlanesByEnv: Record<Environment, string> = {
    production: "https://admin.credibledata.com/api/v0",
@@ -13,6 +14,9 @@ export const controlPlanesByEnv: Record<Environment, string> = {
    localhost: "http://admin.ms2.localhost/api/v0",
    "e2e-test": "http://admin.ms2.localhost/api/v0",
    videoamp: "https://admin.videoamp-aws-us-east-1.credibledata.com/api/v0",
+   // The AWS development cell (credible/dev on EKS). Its public hostnames compose onto the shared
+   // apex as aws-dev-<service>.credibledata.com, unlike videoamp's, which live under its own zone.
+   "aws-dev": "https://aws-dev-admin.credibledata.com/api/v0",
 };
 
 /** Environments that must have an object in `~/.cred` `configPerEnvironment` (avoids undefined on write). */
@@ -61,6 +65,14 @@ export const auth0ConfigsByEnv: Record<
       clientId: "ge8JL5TJNwqy7bygAaJkD92KdluqEZgO",
       audience: "https://ms2data.us.auth0.com/api/v2/",
    },
+   // The DEV Auth0 tenant, not production: this cell takes its per-tier secrets from gcp/credible/dev,
+   // so it authenticates against the same tenant that dev, staging and localhost do. videoamp is the
+   // exception here, being a production cell.
+   "aws-dev": {
+      domain: "https://dev-auth.credibledata.com",
+      clientId: "rr6mzJNj9b104MjCc9xWKPPehq1MJx0L",
+      audience: "https://dev-ohaafogw5p8uyx1m.us.auth0.com/api/v2/",
+   },
 };
 
 /** Clusters a CLI org can target via `cred login <org> -c <cluster>`. */
@@ -74,6 +86,7 @@ export const CLUSTER_BY_ENVIRONMENT: Record<Environment, Cluster> = {
    localhost: "gcp",
    "e2e-test": "gcp",
    videoamp: "aws",
+   "aws-dev": "aws",
 };
 
 /**
@@ -122,6 +135,42 @@ const CLI_ORG_CONFIGS: CliOrgConfig[] = [
          aws: "org_nMRKafeSuxOiuJeG",
       },
    },
+   {
+      // Exists on both clouds -- gcp dev and the aws development cell both have a `demo` org -- so
+      // both are listed. Registered at all only because an UNREGISTERED org is assumed gcp-only
+      // (`supportedClusters ?? ["gcp"]`), which is why `cred login demo` on an aws cell reports the
+      // org as unavailable rather than anything about the cell.
+      //
+      // defaultCluster stays gcp so a bare `cred login demo` behaves exactly as it did before this
+      // entry existed; reach the aws cell with `-c aws`.
+      //
+      // No auth0OrganizationIds: their presence selects the PKCE + loopback flow, whose redirect
+      // (127.0.0.1:18240/callback) is registered on the production Auth0 tenant only. Omitting them
+      // selects the Device Authorization Flow, which needs no callback URL and therefore works on a
+      // cell authenticating against the dev tenant.
+      cliOrgName: "demo",
+      supportedClusters: ["gcp", "aws"],
+      defaultCluster: "gcp",
+   },
+   {
+      // The tenant the PROBES measure, on every cell in both clouds -- probe_organization in
+      // stacks/{aws,gcp}/services. Distinct from `demo` above, which is a cell's own first
+      // organization; a cell has both, and they were seeded by different bootstrap steps.
+      //
+      // Needed for the same reason the `demo` entry is, and missed for a reason worth naming: the
+      // gcp-only fallback (`supportedClusters ?? ["gcp"]`) makes an unregistered org work perfectly
+      // on gcp, so nothing surfaced until an operator tried to reach the fixture on an AWS cell and
+      // got "Organization 'k6-experiments' is not available on the aws cluster" -- a message about
+      // the org, for a fact about this list. Asserted against the recipe by
+      // test_probe_organization_is_reachable_on_its_cells_clusters.
+      //
+      // defaultCluster gcp and no auth0OrganizationIds, both for the reasons given on `demo`: a bare
+      // `cred login k6-experiments` keeps behaving exactly as it did before this entry existed, and
+      // the Device Authorization Flow is the one that works against a cell on the dev Auth0 tenant.
+      cliOrgName: "k6-experiments",
+      supportedClusters: ["gcp", "aws"],
+      defaultCluster: "gcp",
+   },
 ];
 
 const CLI_ORG_CONFIGS_BY_NAME: Record<string, CliOrgConfig> =

package/src/index.ts

@@ -8,7 +8,7 @@ import { ClientConfiguration } from "./clientconfiguration";
 import { registerAddCommands } from "./commands/add";
 import { registerGetCommands } from "./commands/get";
 import { registerListCommands } from "./commands/list";
-import { login } from "./commands/misc/login";
+import { isLoginInvocation, login } from "./commands/misc/login";
 import { logout } from "./commands/misc/logout";
 import { setAccessToken } from "./commands/misc/set-access-token";
 import { listPackages } from "./commands/package/listpackages";
@@ -21,6 +21,8 @@ import {
    archiveVersion,
    unarchiveVersion,
 } from "./commands/version/archive-unarchive-version";
+import { rerun } from "./commands/materialization/rerun";
+import { cancelRun } from "./commands/materialization/cancelrun";
 import {
    ASCII_TITLE,
    Cluster,
@@ -32,6 +34,18 @@ import {
 
 const clientConfig = new ClientConfiguration();
 
+// `cred login` is the documented recovery path for a corrupt `~/.cred`, and the
+// one command whose job is to (re)establish config. The startup reads below —
+// the axios baseURL and every getActiveEnvironment() call during command
+// registration — invoke loadConfig() eagerly at module load, so a corrupt
+// config throws here, before the login action ever runs, dead-ending the very
+// command meant to fix it. Recover up front, but ONLY for login: every other
+// command stays fail-loud (the thrown error still names `cred login` as the
+// fix) so a stray read never silently resets a user's tokens.
+if (isLoginInvocation(process.argv)) {
+   clientConfig.recoverIfCorrupt();
+}
+
 const getActiveEnvironment = () => {
    return clientConfig.getEnvironment();
 };
@@ -69,13 +83,6 @@ cli.command("publish")
       "Set this version as the latest version of the package.",
       false,
    )
-   .option(
-      "--async",
-      "Return as soon as the package is uploaded and let indexing run in " +
-         "the background. Without this flag, publish waits for indexing " +
-         "to finish and exits non-zero if it fails.",
-      false,
-   )
    .action((options) => {
       publish(
          controlPlanesByEnv[getActiveEnvironment()],
@@ -83,7 +90,6 @@ cli.command("publish")
          options.debug,
          options.yes,
          options.setLatest,
-         options.async,
       );
    });
 
@@ -125,6 +131,65 @@ cli.command("unarchive")
       );
    });
 
+cli.command("rerun")
+   .description(
+      "Trigger an on-demand run (rebuild/refresh) for a package version. Defaults to a full run (all sources, indexes and pre-aggregations); use --source/--dimension/--measure/--model-file to scope it to a single unit.",
+   )
+   .argument("<packageName>", "The name of the package to run.")
+   .argument("<versionId>", "The version to (re)build (e.g. 0.1.21).")
+   .option("--debug")
+   .option("-y, --yes", "Skip confirmation.")
+   .option("--source <sourceName>", "Scope the run to a single persist source.")
+   .option(
+      "--dimension <dimension>",
+      "Scope the run to a single indexed dimension.",
+   )
+   .option(
+      "--measure <measure>",
+      "Scope the run to a single pre-aggregated measure. Rebuilds the rollup serving it; add --source when the measure is declared at more than one grain.",
+   )
+   .option(
+      "--model-file <modelFilePath>",
+      "Disambiguate a dimension/source defined in more than one model file.",
+   )
+   .option(
+      "--include-upstream",
+      "Also force-rebuild the target's upstream persisted closure (only meaningful with --source/--dimension/--measure).",
+      false,
+   )
+   .action((packageName, versionId, options) => {
+      rerun(
+         controlPlanesByEnv[getActiveEnvironment()],
+         packageName,
+         versionId,
+         {
+            source: options.source,
+            dimension: options.dimension,
+            measure: options.measure,
+            modelFile: options.modelFile,
+            includeUpstream: options.includeUpstream,
+         },
+         options.debug,
+         options.yes,
+      );
+   });
+
+cli.command("cancel-run")
+   .description("Cancel an in-flight (non-terminal) run.")
+   .argument("<packageName>", "The name of the package that owns the run.")
+   .argument("<runId>", "The id of the run to cancel.")
+   .option("--debug")
+   .option("-y, --yes", "Skip confirmation.")
+   .action((packageName, runId, options) => {
+      cancelRun(
+         controlPlanesByEnv[getActiveEnvironment()],
+         packageName,
+         runId,
+         options.debug,
+         options.yes,
+      );
+   });
+
 cli.command("login")
    .description("Login into Credible service.")
    .argument("<organizationName>", "The organization to login to.")
@@ -201,7 +266,9 @@ cli.command("set-access-token")
    });
 
 cli.command("status")
-   .description("Shows the currently active organization and environment.")
+   .description(
+      "Shows the cell this CLI targets, and the active organization and environment.",
+   )
    .action(() => {
       const config = new ClientConfiguration();
       config.printStatus();
@@ -209,15 +276,27 @@ cli.command("status")
 
 const complete = omelette("credible").tree({
    // CRUD commands
-   get: ["environment", "project", "group"],
+   get: [
+      "environment",
+      "project",
+      "group",
+      "permission",
+      "materialization",
+      "index",
+      "run",
+   ],
    ls: [
       "environment",
       "project",
       "connection",
       "package",
       "version",
+      "materialization",
+      "index",
+      "run",
       "group",
       "group-access-token",
+      "permission",
    ],
    update: ["environment", "project", "package"],
    rm: [
@@ -228,6 +307,7 @@ const complete = omelette("credible").tree({
       "group",
       "member",
       "group-access-token",
+      "permission",
    ],
    add: [
       "environment",
@@ -236,6 +316,7 @@ const complete = omelette("credible").tree({
       "group",
       "member",
       "group-access-token",
+      "permission",
    ],
    // Misc commands
    set: ["environment", "project"],
@@ -246,6 +327,8 @@ const complete = omelette("credible").tree({
    publish: [],
    archive: [],
    unarchive: [],
+   rerun: [],
+   "cancel-run": [],
 });
 
 complete.onAsync("$3", async ({ reply, line }) => {

package/src/logger.ts

@@ -25,9 +25,13 @@ export const logger = winston.createLogger({
       winston.format.splat(),
    ),
    transports: [
-      // Console transport with colored logs
+      // Console transport with colored logs. Error/warn go to stderr so they
+      // never pollute stdout — commands like `cred ls packages` print JSON to
+      // stdout, and a log line landing there makes downstream `JSON.parse`
+      // (e.g. the e2e harness) fail cryptically.
       new winston.transports.Console({
          format: consoleFormat,
+         stderrLevels: ["error", "warn"],
       }),
 
       // NOTE disabled app.log logging