@catladder/cli 0.0.0-next-e9e5af68 → 0.0.0-next-aea5d3ad

package/dist/pipeline/src/deploy/cloudRun/index.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
 const BashExpression_1 = require("../../bash/BashExpression");
 const context_1 = require("../../context");
@@ -14,93 +11,105 @@ const cloudRunExecutionUrl_1 = require("./utils/cloudRunExecutionUrl");
 const database_1 = require("./utils/database");
 const getServiceName_1 = require("./utils/getServiceName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
-const getCloudSqlVariables = ({
-  deployConfigRaw,
-  environmentSlugPrefix,
-  env,
-  componentName,
-  fullConfig
-}) => {
-  var _a, _b, _c;
-  if (deployConfigRaw && deployConfigRaw.cloudSql) {
-    const DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
-    const additionalQueryParamsString = Object.entries((_a = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _a !== void 0 ? _a : {}).map(([key, value]) => `&${key}=${value}`).join("");
-    const dbVars = {
-      CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
-      DB_NAME: DB_NAME,
-      DB_USER: (_b = deployConfigRaw.cloudSql.dbUser) !== null && _b !== void 0 ? _b : "postgres",
-      DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD")
-    };
-    return {
-      ...dbVars,
-      DATABASE_URL: (0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql, dbVars).concat(additionalQueryParamsString),
-      DATABASE_JDBC_URL: (0, database_1.getDatabaseJdbcUrl)(dbVars, (_c = deployConfigRaw.cloudSql.dbConnectionStringVariablesMode) !== null && _c !== void 0 ? _c : database_1.DEFAULT_DB_VARIABLES_MODE)
-    };
-  }
-  return {};
-};
-exports.GCLOUD_RUN_DEPLOY_TYPE = {
-  jobs: createJobs_1.createGoogleCloudRunDeployJobs,
-  defaults: ({
-    deployConfigRaw,
-    envType
-  }) => {
+const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, env, componentName, fullConfig, }) => {
+    var _a, _b, _c;
     if (deployConfigRaw && deployConfigRaw.cloudSql) {
-      return {
-        cloudSql: {
-          deleteDatabaseOnStop: envType === "review"
-        }
-      };
+        const DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
+        const additionalQueryParamsString = Object.entries((_a = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _a !== void 0 ? _a : {})
+            .map(([key, value]) => `&${key}=${value}`)
+            .join("");
+        const dbVars = {
+            CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
+            DB_NAME: DB_NAME,
+            DB_USER: (_b = deployConfigRaw.cloudSql.dbUser) !== null && _b !== void 0 ? _b : "postgres",
+            DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
+        };
+        return {
+            ...dbVars,
+            DATABASE_URL: (0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql, dbVars).concat(additionalQueryParamsString),
+            DATABASE_JDBC_URL: (0, database_1.getDatabaseJdbcUrl)(dbVars, (_c = deployConfigRaw.cloudSql.dbConnectionStringVariablesMode) !== null && _c !== void 0 ? _c : database_1.DEFAULT_DB_VARIABLES_MODE),
+        };
     }
     return {};
-  },
-  additionalSecretKeys: ctx => [
-  // deploy-time credentials don't exist for the local env
-  ...(ctx.envType !== "local" ? [{
-    key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
-    hidden: true
-  }] : []), ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? [{
-    key: "DB_PASSWORD"
-  }] : [])],
-  getAdditionalEnvVars: ctx => {
-    const {
-      fullName,
-      deployConfigRaw,
-      envType,
-      fullConfig
-    } = ctx;
-    // cloud run's deterministic url host:
-    // `<service>-<projectNumber>.<region>.run.app` — computable at
-    // generation time. For review envs the service name part still
-    // contains a runtime expression (the review slug), so the host stays
-    // a bash expression there; the suffix is always a literal.
-    const HOSTNAME_INTERNAL = deployConfigRaw && envType !== "local" ? (0, BashExpression_1.joinBashExpressions)([fullName, `${(0, store_1.getGcloudProjectNumber)(fullConfig, deployConfigRaw.projectId)}.${deployConfigRaw.region}.run.app`], "-").toLowerCase() : undefined;
-    const jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).filter(([name, job]) => Boolean(job)).map(([name, job]) => ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(name, {
-      appFullName: fullName,
-      projectId: deployConfigRaw.projectId,
-      region: deployConfigRaw.region
-    })])) : {};
-    return {
-      ...(HOSTNAME_INTERNAL ? {
-        HOSTNAME_INTERNAL
-      } : {}),
-      ...getCloudSqlVariables(ctx),
-      ...jobTriggers,
-      DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
-      DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
-      DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
-    };
-  },
-  verifyJobSetupScript: context => {
-    var _a;
-    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
-    const service = deployConfig === null || deployConfig === void 0 ? void 0 : deployConfig.service;
-    const serviceConfig = typeof service === "object" ? service : undefined;
-    if ((serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.allowUnauthenticated) !== false) {
-      return [];
-    }
-    // the service requires IAM auth: provide application default credentials
-    // so the verify command can fetch identity tokens for the deployed service
-    return (0, gitlab_1.collapseableSection)("verifygcloudauth", "Setup google application credentials")([`echo "$${exports.GCLOUD_DEPLOY_CREDENTIALS_KEY}" > "$CI_PROJECT_DIR/.gcloud-sa.json"`, `export GOOGLE_APPLICATION_CREDENTIALS="$CI_PROJECT_DIR/.gcloud-sa.json"`]);
-  }
-};
+};
+exports.GCLOUD_RUN_DEPLOY_TYPE = {
+    jobs: createJobs_1.createGoogleCloudRunDeployJobs,
+    defaults: ({ deployConfigRaw, envType }) => {
+        if (deployConfigRaw && deployConfigRaw.cloudSql) {
+            return {
+                cloudSql: {
+                    deleteDatabaseOnStop: envType === "review",
+                },
+            };
+        }
+        return {};
+    },
+    additionalSecretKeys: (ctx) => [
+        // deploy-time credentials don't exist for the local env
+        ...(ctx.envType !== "local"
+            ? [
+                {
+                    key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
+                    hidden: true,
+                },
+            ]
+            : []),
+        ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
+            ? [{ key: "DB_PASSWORD" }]
+            : []),
+    ],
+    getAdditionalEnvVars: (ctx) => {
+        const { fullName, deployConfigRaw, envType, fullConfig } = ctx;
+        // cloud run's deterministic url host:
+        // `<service>-<projectNumber>.<region>.run.app` — computable at
+        // generation time. For review envs the service name part still
+        // contains a runtime expression (the review slug), so the host stays
+        // a bash expression there; the suffix is always a literal.
+        const HOSTNAME_INTERNAL = deployConfigRaw && envType !== "local"
+            ? (0, BashExpression_1.joinBashExpressions)([
+                fullName,
+                `${(0, store_1.getGcloudProjectNumber)(fullConfig, deployConfigRaw.projectId)}.${deployConfigRaw.region}.run.app`,
+            ], "-").toLowerCase()
+            : undefined;
+        const jobTriggers = deployConfigRaw && deployConfigRaw.jobs
+            ? Object.fromEntries(Object.entries(deployConfigRaw.jobs)
+                .filter(([name, job]) => Boolean(job))
+                .map(([name, job]) => [
+                "CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name),
+                (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(name, {
+                    appFullName: fullName,
+                    projectId: deployConfigRaw.projectId,
+                    region: deployConfigRaw.region,
+                }),
+            ]))
+            : {};
+        return {
+            ...(HOSTNAME_INTERNAL ? { HOSTNAME_INTERNAL } : {}),
+            ...getCloudSqlVariables(ctx),
+            ...jobTriggers,
+            DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
+            DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
+                ? deployConfigRaw.projectId
+                : undefined,
+            DEPLOY_CLOUD_RUN_REGION: deployConfigRaw
+                ? deployConfigRaw.region
+                : undefined,
+        };
+    },
+    verifyJobSetupScript: (context) => {
+        var _a;
+        const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+        const service = deployConfig === null || deployConfig === void 0 ? void 0 : deployConfig.service;
+        const serviceConfig = typeof service === "object" ? service : undefined;
+        if ((serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.allowUnauthenticated) !== false) {
+            return [];
+        }
+        // the service requires IAM auth: provide application default credentials
+        // so the verify command can fetch identity tokens for the deployed service
+        return (0, gitlab_1.collapseableSection)("verifygcloudauth", "Setup google application credentials")([
+            `echo "$${exports.GCLOUD_DEPLOY_CREDENTIALS_KEY}" > "$CI_PROJECT_DIR/.gcloud-sa.json"`,
+            `export GOOGLE_APPLICATION_CREDENTIALS="$CI_PROJECT_DIR/.gcloud-sa.json"`,
+        ]);
+    },
+};
+//# sourceMappingURL=index.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.d.ts

@@ -1,10 +1,6 @@
 import type { StringOrBashExpression } from "../../../bash";
-export declare function getCloudRunJobExecuteUrl(jobName: string, {
-  region,
-  projectId,
-  appFullName
-}: {
-  appFullName: StringOrBashExpression;
-  region: string;
-  projectId: string;
-}): string;
+export declare function getCloudRunJobExecuteUrl(jobName: string, { region, projectId, appFullName, }: {
+    appFullName: StringOrBashExpression;
+    region: string;
+    projectId: string;
+}): string;

package/dist/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.js

@@ -1,17 +1,11 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudRunJobExecuteUrl = void 0;
 const jobName_1 = require("./jobName");
-function getCloudRunJobExecuteUrl(jobName, {
-  region,
-  projectId,
-  appFullName
-}) {
-  const uriBase = `https://${region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${projectId}/jobs`;
-  const fullJobName = (0, jobName_1.getCloudRunJobName)(appFullName, jobName);
-  return `${uriBase}/${fullJobName}:run`;
+function getCloudRunJobExecuteUrl(jobName, { region, projectId, appFullName, }) {
+    const uriBase = `https://${region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${projectId}/jobs`;
+    const fullJobName = (0, jobName_1.getCloudRunJobName)(appFullName, jobName);
+    return `${uriBase}/${fullJobName}:run`;
 }
-exports.getCloudRunJobExecuteUrl = getCloudRunJobExecuteUrl;
+exports.getCloudRunJobExecuteUrl = getCloudRunJobExecuteUrl;
+//# sourceMappingURL=cloudRunExecutionUrl.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/createArgsString.d.ts

@@ -10,4 +10,4 @@ import type { BashExpression } from "../../../bash/BashExpression";
  * @returns
  */
 export declare const createArgsString: (...args: keyValuesArg[]) => string;
-export type keyValuesArg = Record<string, string | number | true | false | undefined | BashExpression>;
+export type keyValuesArg = Record<string, string | number | true | false | undefined | BashExpression>;

package/dist/pipeline/src/deploy/cloudRun/utils/createArgsString.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.createArgsString = void 0;
 const lodash_es_1 = require("lodash-es");
 /**
@@ -15,12 +12,19 @@ const lodash_es_1 = require("lodash-es");
  * @param args args record
  * @returns
  */
-const createArgsString = (...args) => args.map(argObj => Object.entries(argObj).filter(([, value]) => !(0, lodash_es_1.isNil)(value)).map(([key, value]) => {
-  if (value === true) {
-    return `--${key}`;
-  } else if (value === false) {
-    return `--no-${key}`;
-  }
-  return `--${key}=${value}`;
-})).flat().join(" ");
-exports.createArgsString = createArgsString;
+const createArgsString = (...args) => args
+    .map((argObj) => Object.entries(argObj)
+    .filter(([, value]) => !(0, lodash_es_1.isNil)(value))
+    .map(([key, value]) => {
+    if (value === true) {
+        return `--${key}`;
+    }
+    else if (value === false) {
+        return `--no-${key}`;
+    }
+    return `--${key}=${value}`;
+}))
+    .flat()
+    .join(" ");
+exports.createArgsString = createArgsString;
+//# sourceMappingURL=createArgsString.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/database.d.ts

@@ -4,10 +4,10 @@ import type { DeployConfigCloudRun, DeployConfigCloudRunCloudSql } from "../../t
 export declare const getDatabaseDeleteScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
 export declare const getDatabaseCreateScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
 export type DBVariables = {
-  CLOUD_SQL_INSTANCE_CONNECTION_NAME: StringOrBashExpression;
-  DB_NAME: StringOrBashExpression;
-  DB_USER: StringOrBashExpression;
-  DB_PASSWORD: StringOrBashExpression;
+    CLOUD_SQL_INSTANCE_CONNECTION_NAME: StringOrBashExpression;
+    DB_NAME: StringOrBashExpression;
+    DB_USER: StringOrBashExpression;
+    DB_PASSWORD: StringOrBashExpression;
 };
 /**
  * controls how variables in the connection string are handled
@@ -22,4 +22,4 @@ export declare const DEFAULT_DB_VARIABLES_MODE: DBVariablesMode;
 export declare const getDatabaseJdbcUrl: (variables: DBVariables, mode: DBVariablesMode) => StringOrBashExpression;
 export declare const getRailsDatabaseConnectionString: (variables: DBVariables, mode: DBVariablesMode) => StringOrBashExpression;
 export declare const getPrismaDatabaseConnectionString: (variables: DBVariables, mode: DBVariablesMode) => StringOrBashExpression;
-export declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql, variables: DBVariables) => StringOrBashExpression;
+export declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql, variables: DBVariables) => StringOrBashExpression;

package/dist/pipeline/src/deploy/cloudRun/utils/database.js

@@ -1,73 +1,106 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatabaseConnectionString = exports.getPrismaDatabaseConnectionString = exports.getRailsDatabaseConnectionString = exports.getDatabaseJdbcUrl = exports.DEFAULT_DB_VARIABLES_MODE = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
 const bash_1 = require("../../../bash");
 const gitlab_1 = require("../../../utils/gitlab");
 const getDatabaseDeleteScript = (context, deployConfig) => {
-  if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
-    throw new Error("not possible");
-  }
-  const DB_NAME = context.environment.envVars["DB_NAME"];
-  if (!DB_NAME) {
-    throw new Error("error: env vars did not specify DB_NAME");
-  }
-  const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
-  // unfortunatly the database cannot be deleted right after the service has stopped, as it might still have connections
-  // we have to repeate this process
-  return [`echo "deleting database ${DB_NAME}..."`, `echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"`, (0, gitlab_1.repeatOnFailure)(`gcloud sql databases delete ${DB_NAME} --instance=${instanceId} --project ${projectId}`, {
-    pauseInSeconds: 10,
-    // connections normally clear within 3-5min; anything beyond is
-    // a permanent error (missing permission, wrong instance, ...)
-    maxAttempts: 30
-  })];
+    if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
+        throw new Error("not possible");
+    }
+    const DB_NAME = context.environment.envVars["DB_NAME"];
+    if (!DB_NAME) {
+        throw new Error("error: env vars did not specify DB_NAME");
+    }
+    const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
+    // unfortunatly the database cannot be deleted right after the service has stopped, as it might still have connections
+    // we have to repeate this process
+    return [
+        `echo "deleting database ${DB_NAME}..."`,
+        `echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"`,
+        (0, gitlab_1.repeatOnFailure)(`gcloud sql databases delete ${DB_NAME} --instance=${instanceId} --project ${projectId}`, {
+            pauseInSeconds: 10,
+            // connections normally clear within 3-5min; anything beyond is
+            // a permanent error (missing permission, wrong instance, ...)
+            maxAttempts: 30,
+        }),
+    ];
 };
 exports.getDatabaseDeleteScript = getDatabaseDeleteScript;
 const getDatabaseCreateScript = (context, deployConfig) => {
-  if (!deployConfig.cloudSql) {
-    throw new Error("not possible");
-  }
-  const DB_NAME = context.environment.envVars["DB_NAME"];
-  if (!DB_NAME) {
-    throw new Error("error: env vars did not specify DB_NAME");
-  }
-  const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
-  // may fail if it already exists
-  return (0, gitlab_1.allowFailureInScripts)([`echo "ensuring Database..."`, `gcloud sql databases create ${DB_NAME} --instance=${instanceId} --project ${projectId}`]);
+    if (!deployConfig.cloudSql) {
+        throw new Error("not possible");
+    }
+    const DB_NAME = context.environment.envVars["DB_NAME"];
+    if (!DB_NAME) {
+        throw new Error("error: env vars did not specify DB_NAME");
+    }
+    const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
+    // may fail if it already exists
+    return (0, gitlab_1.allowFailureInScripts)([
+        `echo "ensuring Database..."`,
+        `gcloud sql databases create ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
+    ]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
 exports.DEFAULT_DB_VARIABLES_MODE = "legacy";
 const getVariableOrValue = (key, variables, mode) => {
-  return mode === "legacy" ? `$${key}` : variables[key];
+    return mode === "legacy" ? `$${key}` : variables[key];
 };
 const getDatabaseJdbcUrl = (variables, mode) => {
-  const parts = ["jdbc:postgresql:///", getVariableOrValue("DB_NAME", variables, mode), "?cloudSqlInstance=", getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode), "&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=", getVariableOrValue("DB_USER", variables, mode), "&password=", getVariableOrValue("DB_PASSWORD", variables, mode)];
-  return (0, bash_1.joinBashExpressions)(parts);
+    const parts = [
+        "jdbc:postgresql:///",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?cloudSqlInstance=",
+        getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+        "&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=",
+        getVariableOrValue("DB_USER", variables, mode),
+        "&password=",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
 };
 exports.getDatabaseJdbcUrl = getDatabaseJdbcUrl;
 const getRailsDatabaseConnectionString = (variables, mode) => {
-  const parts = ["postgresql://", getVariableOrValue("DB_USER", variables, mode), ":", getVariableOrValue("DB_PASSWORD", variables, mode), "@", encodeURIComponent(`/cloudsql/${variables.CLOUD_SQL_INSTANCE_CONNECTION_NAME}`), "/", getVariableOrValue("DB_NAME", variables, mode), "?"];
-  return (0, bash_1.joinBashExpressions)(parts);
+    const parts = [
+        "postgresql://",
+        getVariableOrValue("DB_USER", variables, mode),
+        ":",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+        "@",
+        encodeURIComponent(`/cloudsql/${variables.CLOUD_SQL_INSTANCE_CONNECTION_NAME}`),
+        "/",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?",
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
 };
 exports.getRailsDatabaseConnectionString = getRailsDatabaseConnectionString;
 const getPrismaDatabaseConnectionString = (variables, mode) => {
-  const parts = ["postgresql://", getVariableOrValue("DB_USER", variables, mode), ":", getVariableOrValue("DB_PASSWORD", variables, mode), "@localhost/", getVariableOrValue("DB_NAME", variables, mode), "?host=/cloudsql/", getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode)];
-  return (0, bash_1.joinBashExpressions)(parts);
+    const parts = [
+        "postgresql://",
+        getVariableOrValue("DB_USER", variables, mode),
+        ":",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+        "@localhost/",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?host=/cloudsql/",
+        getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
 };
 exports.getPrismaDatabaseConnectionString = getPrismaDatabaseConnectionString;
 const getDatabaseConnectionString = (config, variables) => {
-  var _a;
-  const mode = (_a = config.dbConnectionStringVariablesMode) !== null && _a !== void 0 ? _a : exports.DEFAULT_DB_VARIABLES_MODE;
-  switch (config.dbConnectionStringFormat) {
-    case "jdbc":
-      return (0, exports.getDatabaseJdbcUrl)(variables, mode);
-    case "rails":
-      return (0, exports.getRailsDatabaseConnectionString)(variables, mode);
-    default:
-      // prisma
-      return (0, exports.getPrismaDatabaseConnectionString)(variables, mode);
-  }
+    var _a;
+    const mode = (_a = config.dbConnectionStringVariablesMode) !== null && _a !== void 0 ? _a : exports.DEFAULT_DB_VARIABLES_MODE;
+    switch (config.dbConnectionStringFormat) {
+        case "jdbc":
+            return (0, exports.getDatabaseJdbcUrl)(variables, mode);
+        case "rails":
+            return (0, exports.getRailsDatabaseConnectionString)(variables, mode);
+        default:
+            // prisma
+            return (0, exports.getPrismaDatabaseConnectionString)(variables, mode);
+    }
 };
-exports.getDatabaseConnectionString = getDatabaseConnectionString;
+exports.getDatabaseConnectionString = getDatabaseConnectionString;
+//# sourceMappingURL=database.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.d.ts

@@ -1,2 +1,2 @@
 import type { ComponentContext } from "../../../types";
-export declare const gcloudServiceAccountLoginCommands: (context: ComponentContext) => string[];
+export declare const gcloudServiceAccountLoginCommands: (context: ComponentContext) => string[];

package/dist/pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.js

@@ -1,10 +1,10 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.gcloudServiceAccountLoginCommands = void 0;
 const __1 = require("..");
 const context_1 = require("../../../context");
-const gcloudServiceAccountLoginCommands = context => [`gcloud auth activate-service-account --key-file=<(echo "$${(0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY)}")`];
-exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
+const gcloudServiceAccountLoginCommands = (context) => [
+    `gcloud auth activate-service-account --key-file=<(echo "$${(0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY)}")`,
+];
+exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
+//# sourceMappingURL=gcloudServiceAccountLoginCommands.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.d.ts

@@ -1,2 +1,2 @@
 import type { DeployConfigCloudRunExecuteOnDeploy, DeployConfigCloudRunJob, DeployConfigCloudRunService } from "../../types";
-export declare const getCloudRunServiceOrJobArgsArg: (args: DeployConfigCloudRunExecuteOnDeploy["args"] | DeployConfigCloudRunJob["args"] | DeployConfigCloudRunService["args"]) => string;
+export declare const getCloudRunServiceOrJobArgsArg: (args: DeployConfigCloudRunExecuteOnDeploy["args"] | DeployConfigCloudRunJob["args"] | DeployConfigCloudRunService["args"]) => string;

package/dist/pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.js

@@ -1,10 +1,12 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudRunServiceOrJobArgsArg = void 0;
-const getCloudRunServiceOrJobArgsArg = args => {
-  return args !== undefined ? args.length > 0 ? args === null || args === void 0 ? void 0 : args.map(arg => `"${arg}"`).join(",") : "" : undefined;
+const getCloudRunServiceOrJobArgsArg = (args) => {
+    return args !== undefined
+        ? args.length > 0
+            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
+            : ""
+        : undefined;
 };
-exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
+exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
+//# sourceMappingURL=getJobOrServiceArgs.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.d.ts

@@ -3,4 +3,4 @@ import type { BuildConfig } from "../../../build/types";
 import type { ComponentContext } from "../../../types/context";
 import type { EnvironmentContext } from "../../../types/environmentContext";
 export declare const getServiceName: (context: ComponentContext) => string | import("../../..").BashExpression;
-export declare const getServiceNameForEnvContext: (context: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => string | import("../../..").BashExpression;
+export declare const getServiceNameForEnvContext: (context: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => string | import("../../..").BashExpression;

package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.js

@@ -1,10 +1,8 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceNameForEnvContext = exports.getServiceName = void 0;
-const getServiceName = context => context.environment.fullName.toLowerCase();
+const getServiceName = (context) => context.environment.fullName.toLowerCase();
 exports.getServiceName = getServiceName;
-const getServiceNameForEnvContext = context => context.fullName.toLowerCase();
-exports.getServiceNameForEnvContext = getServiceNameForEnvContext;
+const getServiceNameForEnvContext = (context) => context.fullName.toLowerCase();
+exports.getServiceNameForEnvContext = getServiceNameForEnvContext;
+//# sourceMappingURL=getServiceName.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/jobName.d.ts

@@ -3,4 +3,4 @@ import type { ComponentContext } from "../../../types";
 export declare const getCloudRunJobName: (fullAppName: StringOrBashExpression, jobName: StringOrBashExpression) => StringOrBashExpression;
 export declare const getFullJobName: (context: ComponentContext, name: StringOrBashExpression) => StringOrBashExpression;
 export declare const getCloudRunSchedulerName: (fullAppName: StringOrBashExpression, schedulerName: string) => StringOrBashExpression;
-export declare const getFullSchedulerName: (context: ComponentContext, name: string) => StringOrBashExpression;
+export declare const getFullSchedulerName: (context: ComponentContext, name: string) => StringOrBashExpression;

package/dist/pipeline/src/deploy/cloudRun/utils/jobName.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFullSchedulerName = exports.getCloudRunSchedulerName = exports.getFullJobName = exports.getCloudRunJobName = void 0;
 const getCloudRunJobName = (fullAppName, jobName) => fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
 exports.getCloudRunJobName = getCloudRunJobName;
@@ -11,4 +8,5 @@ exports.getFullJobName = getFullJobName;
 const getCloudRunSchedulerName = (fullAppName, schedulerName) => fullAppName.toLowerCase().concat("-" + schedulerName.toLowerCase());
 exports.getCloudRunSchedulerName = getCloudRunSchedulerName;
 const getFullSchedulerName = (context, name) => (0, exports.getCloudRunSchedulerName)(context.environment.fullName, name);
-exports.getFullSchedulerName = getFullSchedulerName;
+exports.getFullSchedulerName = getFullSchedulerName;
+//# sourceMappingURL=jobName.js.map

package/dist/pipeline/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.d.ts

@@ -6,4 +6,4 @@
  * @param removeFirstN how many lines to remove at the start of the command
  * @returns
  */
-export declare const removeFirstLinesFromCommandOutput: (cmd: string, removeFirstN: number) => string;
+export declare const removeFirstLinesFromCommandOutput: (cmd: string, removeFirstN: number) => string;

package/dist/pipeline/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeFirstLinesFromCommandOutput = void 0;
 /**
  *
@@ -12,5 +9,6 @@ exports.removeFirstLinesFromCommandOutput = void 0;
  * @param removeFirstN how many lines to remove at the start of the command
  * @returns
  */
-const removeFirstLinesFromCommandOutput = (cmd, removeFirstN) => removeFirstN === 0 ? cmd : `${cmd} | tail -n +${removeFirstN + 1}`;
-exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
+const removeFirstLinesFromCommandOutput = (cmd, removeFirstN) => (removeFirstN === 0 ? cmd : `${cmd} | tail -n +${removeFirstN + 1}`);
+exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
+//# sourceMappingURL=removeFirstLinesFromCommandOutput.js.map

package/dist/pipeline/src/deploy/cloudSql/utils.d.ts

@@ -1,4 +1,4 @@
 import type { Config } from "../..";
 import type { StringOrBashExpression } from "../../bash/BashExpression";
 import type { DeployConfigCloudRunCloudSql, DeployConfigKubernetesValuesCloudSQLUnmanaged } from "../types";
-export declare const getFullDbName: (cloudSqlConfig: DeployConfigCloudRunCloudSql | DeployConfigKubernetesValuesCloudSQLUnmanaged, fullConfig: Config<never>, environmentSlugPrefix: StringOrBashExpression, componentName: string) => StringOrBashExpression;
+export declare const getFullDbName: (cloudSqlConfig: DeployConfigCloudRunCloudSql | DeployConfigKubernetesValuesCloudSQLUnmanaged, fullConfig: Config<never>, environmentSlugPrefix: StringOrBashExpression, componentName: string) => StringOrBashExpression;

package/dist/pipeline/src/deploy/cloudSql/utils.js

@@ -1,12 +1,14 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFullDbName = void 0;
 const BashExpression_1 = require("../../bash/BashExpression");
 const getFullDbName = (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) => {
-  var _a, _b;
-  return (0, BashExpression_1.joinBashExpressions)([(_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : `${fullConfig.customerName}-${fullConfig.appName}`, environmentSlugPrefix, (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName].flatMap(part => part ? [part] : []), "-");
+    var _a, _b;
+    return (0, BashExpression_1.joinBashExpressions)([
+        (_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : `${fullConfig.customerName}-${fullConfig.appName}`,
+        environmentSlugPrefix,
+        (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName,
+    ].flatMap((part) => (part ? [part] : [])), "-");
 };
-exports.getFullDbName = getFullDbName;
+exports.getFullDbName = getFullDbName;
+//# sourceMappingURL=utils.js.map