@catladder/cli 3.46.1 → 3.46.2

package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js

@@ -1,152 +1,152 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
 const startProxy_1 = require("../../../../../gcloud/cloudSql/startProxy");
 const parseConnectionString_1 = require("../../../../../gcloud/cloudSql/parseConnectionString");
 const copyDb_1 = require("../../../../../gcloud/cloudSql/copyDb");
 const pipeline_1 = require("../../../../../../../pipeline/src/index.js");
-const hasCloudSql = (context) => {
-    var _a, _b, _c;
-    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
-    if ((0, pipeline_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
-        return !!deployConfig.cloudSql;
-    }
-    if ((0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
-        return !!((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled);
-    }
-    return false;
+const hasCloudSql = context => {
+  var _a, _b, _c;
+  const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if ((0, pipeline_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    return !!deployConfig.cloudSql;
+  }
+  if ((0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
+    return !!((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled);
+  }
+  return false;
 };
-exports.default = async (vorpal) => vorpal
-    .command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
-    .action(async function restoreDb() {
-    var _a, _b, _c, _d, _e;
-    const allContexts = await (0, getProjectConfig_1.getAllPipelineContexts)(undefined, {
-        includeLocal: true,
-    });
-    const filteredContexts = allContexts.filter(hasCloudSql);
-    const sortByEnv = (a, b) => {
-        const aLocal = a.startsWith("local:");
-        const bLocal = b.startsWith("local:");
-        if (aLocal !== bLocal)
-            return aLocal ? 1 : -1;
-        return a.localeCompare(b);
+exports.default = async vorpal => vorpal.command("project-cloud-sql-restore-db", "restores a project db from one source to another target").action(async function restoreDb() {
+  var _a, _b, _c, _d, _e;
+  const allContexts = await (0, getProjectConfig_1.getAllPipelineContexts)(undefined, {
+    includeLocal: true
+  });
+  const filteredContexts = allContexts.filter(hasCloudSql);
+  const sortByEnv = (a, b) => {
+    const aLocal = a.startsWith("local:");
+    const bLocal = b.startsWith("local:");
+    if (aLocal !== bLocal) return aLocal ? 1 : -1;
+    return a.localeCompare(b);
+  };
+  const envs = filteredContexts.map(c => `${c.env}:${c.name}`).sort(sortByEnv);
+  const targetEnvChoices = filteredContexts.map(c => {
+    const value = `${c.env}:${c.name}`;
+    const isProd = c.environment.envType === "prod";
+    return {
+      name: isProd ? `⚠️ ${value}` : value,
+      value
     };
-    const envs = filteredContexts
-        .map((c) => `${c.env}:${c.name}`)
-        .sort(sortByEnv);
-    const targetEnvChoices = filteredContexts
-        .map((c) => {
-        const value = `${c.env}:${c.name}`;
-        const isProd = c.environment.envType === "prod";
-        return {
-            name: isProd ? `⚠️ ${value}` : value,
-            value,
-        };
-    })
-        .sort((a, b) => sortByEnv(a.value, b.value));
-    const { sourceEnvAndComponent } = await this.prompt({
-        type: "list",
-        name: "sourceEnvAndComponent",
-        choices: envs,
-        message: "Source instance (connection string or 'local')? 🤔 ",
+  }).sort((a, b) => sortByEnv(a.value, b.value));
+  const {
+    sourceEnvAndComponent
+  } = await this.prompt({
+    type: "list",
+    name: "sourceEnvAndComponent",
+    choices: envs,
+    message: "Source instance (connection string or 'local')? 🤔 "
+  });
+  const [sourceEnv, sourceComponent] = sourceEnvAndComponent.split(":");
+  const sourceContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(sourceEnv, sourceComponent);
+  const sourceEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, sourceContext.env, sourceContext.name);
+  let sourceProxy;
+  let sourceDbName;
+  let sourceUsername;
+  let sourcePassword;
+  let targetUsername;
+  let targetPassword;
+  let targetProxy;
+  let sourcePort;
+  let targetPort;
+  let targetDbName;
+  const closeAll = () => {
+    sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
+    targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
+  };
+  if (sourceEnv === "local") {
+    const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
+    sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
+    sourceUsername = parsersResult.username;
+    sourcePassword = parsersResult.password;
+    sourceDbName = parsersResult.endpoint;
+  } else {
+    sourcePort = 54399;
+    sourceProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
+      instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
+      localPort: sourcePort
     });
-    const [sourceEnv, sourceComponent] = sourceEnvAndComponent.split(":");
-    const sourceContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(sourceEnv, sourceComponent);
-    const sourceEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, sourceContext.env, sourceContext.name);
-    let sourceProxy;
-    let sourceDbName;
-    let sourceUsername;
-    let sourcePassword;
-    let targetUsername;
-    let targetPassword;
-    let targetProxy;
-    let sourcePort;
-    let targetPort;
-    let targetDbName;
-    const closeAll = () => {
-        sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
-        targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
-    };
-    if (sourceEnv === "local") {
-        const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
-        sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
-        sourceUsername = parsersResult.username;
-        sourcePassword = parsersResult.password;
-        sourceDbName = parsersResult.endpoint;
-    }
-    else {
-        sourcePort = 54399;
-        sourceProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-            instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
-            localPort: sourcePort,
-        });
-        sourceUsername = sourceEnvVars.DB_USER.toString();
-        sourcePassword = sourceEnvVars.DB_PASSWORD.toString();
-        sourceDbName = (_c = sourceEnvVars.DB_NAME) === null || _c === void 0 ? void 0 : _c.toString();
-    }
-    const { targetEnvAndComponent } = await this.prompt({
-        type: "list",
-        name: "targetEnvAndComponent",
-        choices: targetEnvChoices,
-        message: "target env? 🤔 ",
+    sourceUsername = sourceEnvVars.DB_USER.toString();
+    sourcePassword = sourceEnvVars.DB_PASSWORD.toString();
+    sourceDbName = (_c = sourceEnvVars.DB_NAME) === null || _c === void 0 ? void 0 : _c.toString();
+  }
+  const {
+    targetEnvAndComponent
+  } = await this.prompt({
+    type: "list",
+    name: "targetEnvAndComponent",
+    choices: targetEnvChoices,
+    message: "target env? 🤔 "
+  });
+  const [targetEnv, targetComponent] = targetEnvAndComponent.split(":");
+  const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
+  const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
+  if (targetEnv === "local") {
+    const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
+    targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
+    targetUsername = parsersResult.username;
+    targetPassword = parsersResult.password;
+    targetDbName = parsersResult.endpoint;
+  } else {
+    targetPort = 54499;
+    targetProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
+      instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
+      localPort: targetPort
     });
-    const [targetEnv, targetComponent] = targetEnvAndComponent.split(":");
-    const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
-    const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
-    if (targetEnv === "local") {
-        const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
-        targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
-        targetUsername = parsersResult.username;
-        targetPassword = parsersResult.password;
-        targetDbName = parsersResult.endpoint;
-    }
-    else {
-        targetPort = 54499;
-        targetProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
-            instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
-            localPort: targetPort,
-        });
-        targetUsername = targetEnvVars.DB_USER.toString();
-        targetPassword = targetEnvVars.DB_PASSWORD.toString();
-        targetDbName = targetEnvVars.DB_NAME.toString();
-    }
-    const { shouldContinue } = await this.prompt({
-        type: "confirm",
-        name: "shouldContinue",
-        message: `This will drop ${targetEnv}/${targetDbName} and replace it with ${sourceEnv}/${sourceDbName}. Continue? 🤔 `,
+    targetUsername = targetEnvVars.DB_USER.toString();
+    targetPassword = targetEnvVars.DB_PASSWORD.toString();
+    targetDbName = targetEnvVars.DB_NAME.toString();
+  }
+  const {
+    shouldContinue
+  } = await this.prompt({
+    type: "confirm",
+    name: "shouldContinue",
+    message: `This will drop ${targetEnv}/${targetDbName} and replace it with ${sourceEnv}/${sourceDbName}. Continue? 🤔 `
+  });
+  if (!shouldContinue) {
+    this.log("abort");
+    closeAll();
+    return;
+  }
+  if (targetContext.environment.envType === "prod") {
+    this.log(`\n🚨 You are overriding a production environment. Please type in ${targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME} to continue\n\n`);
+    const {
+      confirmInstance
+    } = await this.prompt({
+      type: "input",
+      name: "confirmInstance",
+      message: "confirm: "
     });
-    if (!shouldContinue) {
-        this.log("abort");
-        closeAll();
-        return;
-    }
-    if (targetContext.environment.envType === "prod") {
-        this.log(`\n🚨 You are overriding a production environment. Please type in ${targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME} to continue\n\n`);
-        const { confirmInstance } = await this.prompt({
-            type: "input",
-            name: "confirmInstance",
-            message: "confirm: ",
-        });
-        if (confirmInstance !== targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME) {
-            this.log("abort");
-            closeAll();
-            return;
-        }
-    }
-    try {
-        await (0, copyDb_1.spawnCopyDb)({
-            targetPassword,
-            targetPort,
-            targetUsername,
-            sourceUsername,
-            sourcePassword,
-            sourcePort,
-            sourceDbName,
-            targetDbName,
-        });
+    if (confirmInstance !== targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME) {
+      this.log("abort");
+      closeAll();
+      return;
     }
-    finally {
-        closeAll();
-    }
-});
-//# sourceMappingURL=commandProjectRestoreDb.js.map
+  }
+  try {
+    await (0, copyDb_1.spawnCopyDb)({
+      targetPassword,
+      targetPort,
+      targetUsername,
+      sourceUsername,
+      sourcePassword,
+      sourcePort,
+      sourceDbName,
+      targetDbName
+    });
+  } finally {
+    closeAll();
+  }
+});

package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.d.ts

@@ -1,3 +1,3 @@
 import type Vorpal from "vorpal";
 declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
-export default _default;
+export default _default;

package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js

@@ -1,121 +1,120 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 const pipeline_1 = require("../../../../../../pipeline/src/index.js");
 const clipboardy_1 = __importDefault(require("clipboardy"));
 const getProjectConfig_1 = require("../../../../config/getProjectConfig");
 const autocompletions_1 = require("./utils/autocompletions");
 const startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
 const log_1 = require("../../../../utils/log");
-const getProxyInfo = (context) => {
-    var _a, _b, _c, _d;
-    if ((0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
-        return getProxyInfoForKubernetes(this, context);
-    }
-    else if ((0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
-        return getProxyInfoForCloudRun(this, context);
-    }
-    throw new Error(`unsupported environment: ${(_d = (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.type}`);
+const getProxyInfo = context => {
+  var _a, _b, _c, _d;
+  if ((0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
+    return getProxyInfoForKubernetes(this, context);
+  } else if ((0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
+    return getProxyInfoForCloudRun(this, context);
+  }
+  throw new Error(`unsupported environment: ${(_d = (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.type}`);
 };
 const getProxyInfoForKubernetes = async (vorpal, context) => {
-    var _a, _b;
-    if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
-        throw new Error("unsupported");
-    }
-    const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
-    // bit hacky, would be nicer if we would also declare this through env vars
-    const cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
-    const DB_PASSWORD = (_b = ((envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD))) === null || _b === void 0 ? void 0 : _b.toString();
-    const DB_NAME = cloudSqlValues.cloudsql.fullDbName.toString();
-    const instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
-    return {
-        instanceName,
-        DB_PASSWORD,
-        DB_NAME,
-        DB_USER: "postgres",
-    };
+  var _a, _b;
+  if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
+    throw new Error("unsupported");
+  }
+  const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
+  // bit hacky, would be nicer if we would also declare this through env vars
+  const cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
+  const DB_PASSWORD = (_b = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD)) === null || _b === void 0 ? void 0 : _b.toString();
+  const DB_NAME = cloudSqlValues.cloudsql.fullDbName.toString();
+  const instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
+  return {
+    instanceName,
+    DB_PASSWORD,
+    DB_NAME,
+    DB_USER: "postgres"
+  };
 };
 const getProxyInfoForCloudRun = async (vorpal, context) => {
-    var _a, _b, _c, _d, _e, _f;
-    if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
-        !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
-        const deployType = (0, pipeline_1.getDeployConfigType)((_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config);
-        const errorMessage = deployType === "google-cloudrun"
-            ? `DeployConfig is missing the cloudSql property`
-            : `Unsupported DeployConfig type: ${deployType}`;
-        (0, log_1.logError)(vorpal, errorMessage);
-        throw new Error(errorMessage);
-    }
-    const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
-    return {
-        instanceName: (_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config.cloudSql.instanceConnectionName,
-        DB_PASSWORD: (_e = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _e === void 0 ? void 0 : _e.toString(),
-        DB_NAME: context.environment.envVars.DB_NAME.toString(),
-        DB_USER: (_f = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _f === void 0 ? void 0 : _f.toString(),
-    };
+  var _a, _b, _c, _d, _e, _f;
+  if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") || !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
+    const deployType = (0, pipeline_1.getDeployConfigType)((_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config);
+    const errorMessage = deployType === "google-cloudrun" ? `DeployConfig is missing the cloudSql property` : `Unsupported DeployConfig type: ${deployType}`;
+    (0, log_1.logError)(vorpal, errorMessage);
+    throw new Error(errorMessage);
+  }
+  const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
+  return {
+    instanceName: (_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config.cloudSql.instanceConnectionName,
+    DB_PASSWORD: (_e = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _e === void 0 ? void 0 : _e.toString(),
+    DB_NAME: context.environment.envVars.DB_NAME.toString(),
+    DB_USER: (_f = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _f === void 0 ? void 0 : _f.toString()
+  };
 };
-const getDbUrl = ({ DB_PASSWORD, DB_NAME, DB_USER }, localPort, additional = "") => `DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}${additional}"`;
-const getJdbcUrl = ({ DB_PASSWORD, DB_NAME, DB_USER }, localPort) => `DATABASE_JDBC_URL="jdbc:postgresql://localhost:${localPort}/${DB_NAME}?schema=public&user=${DB_USER}&password=${DB_PASSWORD}"`;
-exports.default = async (vorpal) => vorpal
-    .command("project-cloud-sql-proxy <envComponent>", "proxy to cloud sql db")
-    .autocomplete(await (0, autocompletions_1.envAndComponents)())
-    .action(async function ({ envComponent }) {
-    const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
-    if (!componentName) {
-        (0, log_1.logWarning)(this, "need componentName");
-        return;
-    }
-    const context = await (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName);
-    if (env === "review") {
-        (0, log_1.logWarning)(this, "connection string does not include mr information on review environments");
-    }
-    const { localPort } = await this.prompt({
-        type: "number",
-        name: "localPort",
-        default: "54320",
-        message: "Local port: ",
+const getDbUrl = ({
+  DB_PASSWORD,
+  DB_NAME,
+  DB_USER
+}, localPort, additional = "") => `DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}${additional}"`;
+const getJdbcUrl = ({
+  DB_PASSWORD,
+  DB_NAME,
+  DB_USER
+}, localPort) => `DATABASE_JDBC_URL="jdbc:postgresql://localhost:${localPort}/${DB_NAME}?schema=public&user=${DB_USER}&password=${DB_PASSWORD}"`;
+exports.default = async vorpal => vorpal.command("project-cloud-sql-proxy <envComponent>", "proxy to cloud sql db").autocomplete(await (0, autocompletions_1.envAndComponents)()).action(async function ({
+  envComponent
+}) {
+  const {
+    env,
+    componentName
+  } = (0, getProjectConfig_1.parseChoice)(envComponent);
+  if (!componentName) {
+    (0, log_1.logWarning)(this, "need componentName");
+    return;
+  }
+  const context = await (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName);
+  if (env === "review") {
+    (0, log_1.logWarning)(this, "connection string does not include mr information on review environments");
+  }
+  const {
+    localPort
+  } = await this.prompt({
+    type: "number",
+    name: "localPort",
+    default: "54320",
+    message: "Local port: "
+  });
+  const proxyInfo = await getProxyInfo(context);
+  /**
+   * Env variables for libpq (e.g. psql client)
+   * https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS
+   */
+  const psqlEnvVars = {
+    PGPASSWORD: proxyInfo.DB_PASSWORD,
+    PGUSER: proxyInfo.DB_USER,
+    PGDATABASE: proxyInfo.DB_NAME,
+    PGHOST: "localhost",
+    PGPORT: localPort
+  };
+  const lipbqEnvVarDeclarations = Object.entries(psqlEnvVars).map(([key, value]) => `${key}="${value}"`);
+  const dbUrl = getDbUrl(proxyInfo, localPort);
+  const jdbcUrl = getJdbcUrl(proxyInfo, localPort);
+  clipboardy_1.default.writeSync(["", "## CloudSQL proxy connection .env variables", dbUrl, jdbcUrl, "## DATABASE_URL with schema=public parameter (e. g. Prisma requires this):", `# ${getDbUrl(proxyInfo, localPort, `?schema=public`)}`, "## Env variables for libpq (e.g. psql client https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS)", ...lipbqEnvVarDeclarations, ""].join("\n"));
+  (0, log_1.logLines)(this, null, "Connection strings env variables DATABASE_URL and those for the 'psql' client (copied to your clipboard for .env file):", dbUrl, jdbcUrl, ...lipbqEnvVarDeclarations, null, "DATABASE_URL with schema=public parameter (e. g. Prisma requires this):", getDbUrl(proxyInfo, localPort, `?schema=public`), null);
+  try {
+    await (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
+      instanceName: proxyInfo.instanceName,
+      localPort
     });
-    const proxyInfo = await getProxyInfo(context);
-    /**
-     * Env variables for libpq (e.g. psql client)
-     * https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS
-     */
-    const psqlEnvVars = {
-        PGPASSWORD: proxyInfo.DB_PASSWORD,
-        PGUSER: proxyInfo.DB_USER,
-        PGDATABASE: proxyInfo.DB_NAME,
-        PGHOST: "localhost",
-        PGPORT: localPort,
-    };
-    const lipbqEnvVarDeclarations = Object.entries(psqlEnvVars).map(([key, value]) => `${key}="${value}"`);
-    const dbUrl = getDbUrl(proxyInfo, localPort);
-    const jdbcUrl = getJdbcUrl(proxyInfo, localPort);
-    clipboardy_1.default.writeSync([
-        "",
-        "## CloudSQL proxy connection .env variables",
-        dbUrl,
-        jdbcUrl,
-        "## DATABASE_URL with schema=public parameter (e. g. Prisma requires this):",
-        `# ${getDbUrl(proxyInfo, localPort, `?schema=public`)}`,
-        "## Env variables for libpq (e.g. psql client https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS)",
-        ...lipbqEnvVarDeclarations,
-        "",
-    ].join("\n"));
-    (0, log_1.logLines)(this, null, "Connection strings env variables DATABASE_URL and those for the 'psql' client (copied to your clipboard for .env file):", dbUrl, jdbcUrl, ...lipbqEnvVarDeclarations, null, "DATABASE_URL with schema=public parameter (e. g. Prisma requires this):", getDbUrl(proxyInfo, localPort, `?schema=public`), null);
-    try {
-        await (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
-            instanceName: proxyInfo.instanceName,
-            localPort,
-        });
-    }
-    catch (error) {
-        if (!(error instanceof Error))
-            throw error;
-        if (error.message !== startProxy_1.ERROR_NOT_INSTALLED)
-            throw error;
-        (0, log_1.logError)(this, error.message, null, "Please install the Cloud SQL Auth Proxy from:", `https://cloud.google.com/sql/docs/postgres/connect-auth-proxy#install`, null);
-    }
-});
-//# sourceMappingURL=commandCloudSqlProxy.js.map
+  } catch (error) {
+    if (!(error instanceof Error)) throw error;
+    if (error.message !== startProxy_1.ERROR_NOT_INSTALLED) throw error;
+    (0, log_1.logError)(this, error.message, null, "Please install the Cloud SQL Auth Proxy from:", `https://cloud.google.com/sql/docs/postgres/connect-auth-proxy#install`, null);
+  }
+});

package/dist/cli/src/apps/cli/commands/project/commandConfigSecrets.d.ts

@@ -2,4 +2,4 @@ import type { CommandInstance } from "vorpal";
 import type Vorpal from "vorpal";
 export declare const projectConfigSecrets: (vorpal: CommandInstance, envComponent?: string) => Promise<void>;
 declare const _default: (vorpal: Vorpal) => Promise<void>;
-export default _default;
+export default _default;