@catladder/pipeline 0.0.0-mongodb-tolerations-bc2a3387 → 0.0.0-multiple-gitlab-includes-1a40efc0

package/src/deploy/cloudRun/createJobs/cloudRunServices.ts

@@ -0,0 +1,86 @@
+import { getLabels } from "../../../context/getLabels";
+import type { ComponentContext } from "../../../types/context";
+
+import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
+import { createArgsString } from "../utils/createArgsString";
+import { getServiceName } from "../utils/getServiceName";
+import {
+  gcloudRunCmd,
+  getCommonCloudRunArgs,
+  getCommonDeployArgs,
+  makeLabelString,
+} from "./common";
+import { ENV_VARS_FILENAME } from "./constants";
+import { createVolumeConfig } from "./volumes";
+
+export const getServiceDeployScript = (
+  context: ComponentContext,
+  service: DeployConfigCloudRunService | true | undefined,
+  nameSuffix?: string,
+) => {
+  const commonDeployArgs = getCommonDeployArgs(context);
+
+  const serviceName = getServiceName(context);
+
+  const customConfig = service !== true ? service : undefined;
+  const command =
+    service !== true
+      ? (service?.command ?? context.build.config.startCommand)
+      : undefined;
+
+  const commandArray = command
+    ? Array.isArray(command)
+      ? command
+      : command.split(" ")
+    : undefined;
+  const fullServiceName = serviceName.concat(nameSuffix ?? "");
+  const argsString = createArgsString(
+    {
+      // command as empty string resets it to default (uses the image's entrypoint)
+      command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+      ...commonDeployArgs,
+      labels: makeLabelString({
+        ...getLabels(context),
+        "cloud-run-service-name": fullServiceName,
+      }),
+      "env-vars-file": ENV_VARS_FILENAME,
+      "min-instances": customConfig?.minInstances ?? 0,
+      "max-instances": customConfig?.maxInstances ?? 100,
+      "cpu-throttling": customConfig?.noCpuThrottling !== true,
+      cpu: customConfig?.cpu,
+      memory: customConfig?.memory,
+      timeout: customConfig?.timeout,
+      "vpc-connector": customConfig?.vpcConnector,
+      "vpc-egress": customConfig?.vpcEgress,
+      network: customConfig?.network,
+      subnet: customConfig?.subnet,
+      "use-http2": customConfig?.http2,
+      "allow-unauthenticated": customConfig?.allowUnauthenticated ?? true,
+      ingress: customConfig?.ingress ?? "all",
+      "cpu-boost": true,
+      "execution-environment": customConfig?.executionEnvironment,
+    },
+    ...createVolumeConfig(customConfig?.volumes, "service"),
+  );
+
+  return `${gcloudRunCmd()} deploy ${fullServiceName} ${argsString}`;
+};
+
+export const getServiceDeleteScript = (
+  context: ComponentContext,
+  serviceSuffix?: string,
+) => {
+  const commonArgs = getCommonCloudRunArgs(context);
+
+  const commonArgsString = createArgsString(commonArgs);
+
+  const serviceName = getServiceName(context);
+
+  const fullServiceName = serviceSuffix
+    ? `${serviceName}-${serviceSuffix}`
+    : serviceName;
+
+  return [
+    `${gcloudRunCmd()} services delete ${fullServiceName} ${commonArgsString}`,
+  ];
+};

package/src/deploy/cloudRun/createJobs/common.ts

@@ -0,0 +1,59 @@
+import type { ComponentContext } from "../../../types/context";
+
+import { isOfDeployType } from "../../types";
+import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
+import { getArtifactsRegistryImage } from "../artifactsRegistry";
+
+export const gcloudCmd = (version?: "beta") => {
+  return version ? `gcloud ${version}` : "gcloud";
+};
+export const gcloudRunCmd = (version?: "beta") => {
+  return `${gcloudCmd(version)} run`;
+};
+
+export const gcloudSchedulerCmd = (version?: "beta") => {
+  return `${gcloudCmd(version)} scheduler`;
+};
+
+export const setGoogleProjectNumberScript = (
+  deployConfig: DeployConfigCloudRun,
+) => [
+  `export GCLOUD_PROJECT_NUMBER=$(${gcloudCmd()} projects describe ${
+    deployConfig.projectId
+  } --format="value(projectNumber)")`,
+  'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"',
+];
+
+export const makeLabelString = (obj: Record<string, unknown>) =>
+  Object.entries(obj)
+    .map(([key, value]) => `${key}=${value}`)
+    .join(",");
+
+export const getCloudRunDeployConfig = (context: ComponentContext) => {
+  const deployConfig = context.deploy?.config;
+  if (!isOfDeployType(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  return deployConfig;
+};
+
+export function getCommonCloudRunArgs(context: ComponentContext) {
+  const deployConfig = getCloudRunDeployConfig(context);
+  return {
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+  };
+}
+
+export function getCommonDeployArgs(context: ComponentContext) {
+  const commonArgs = getCommonCloudRunArgs(context);
+  const deployConfig = getCloudRunDeployConfig(context);
+  return {
+    image: getArtifactsRegistryImage(context),
+    ...commonArgs,
+    "set-cloudsql-instances": deployConfig.cloudSql
+      ? deployConfig.cloudSql.instanceConnectionName
+      : undefined,
+  };
+}

package/src/deploy/cloudRun/createJobs/constants.ts

@@ -0,0 +1 @@
+export const ENV_VARS_FILENAME = "____envvars.yaml";

package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts

@@ -0,0 +1,71 @@
+import { omit } from "lodash";
+import type { ComponentContext } from "../../../types/context";
+import { collapseableSection } from "../../../utils/gitlab";
+import { getDependencyTrackUploadScript } from "../../sbom";
+
+import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
+import { writeBashYamlToFileScript } from "../../../bash/bashYaml";
+import { getRemoveOldRevisionsAndImagesCommand } from "../cleanup";
+import { getDatabaseCreateScript } from "../utils/database";
+import { gcloudServiceAccountLoginCommands } from "../utils/gcloudServiceAccountLoginCommands";
+import {
+  getCreateScheduleScripts,
+  getJobCreateScripts,
+  getJobRunScripts,
+} from "./cloudRunJobs";
+import { getServiceDeployScript } from "./cloudRunServices";
+import {
+  getCloudRunDeployConfig,
+  setGoogleProjectNumberScript,
+} from "./common";
+import { ENV_VARS_FILENAME } from "./constants";
+
+export function getCloudRunDeployScripts(context: ComponentContext) {
+  const deployConfig = getCloudRunDeployConfig(context);
+  const allEnvVars = omit(
+    context.environment.envVars,
+    GCLOUD_DEPLOY_CREDENTIALS_KEY,
+  );
+
+  return [
+    ...collapseableSection(
+      "prepare",
+      "Prepare...",
+    )([
+      ...gcloudServiceAccountLoginCommands(context),
+      ...setGoogleProjectNumberScript(deployConfig),
+    ]),
+    ...collapseableSection(
+      "writeenvvars",
+      "Write env vars to file",
+    )(writeBashYamlToFileScript(allEnvVars, ENV_VARS_FILENAME)),
+
+    ...collapseableSection(
+      "deploy",
+      "Deploy to cloud run",
+    )([
+      ...(deployConfig.cloudSql
+        ? getDatabaseCreateScript(context, deployConfig) // we create the db, so that we can also delete it afterwards
+        : []),
+      ...getCreateScheduleScripts(context),
+      ...getJobCreateScripts(context),
+      ...getJobRunScripts(context, "preDeploy"),
+
+      ...(deployConfig.service !== false
+        ? [getServiceDeployScript(context, deployConfig.service)]
+        : []),
+      ...Object.entries(deployConfig.additionalServices ?? {}).map(
+        ([name, service]) =>
+          getServiceDeployScript(context, service, "-" + name),
+      ),
+      ...getJobRunScripts(context, "postDeploy"),
+    ]),
+    ...collapseableSection(
+      "cleanup",
+      "Cleanup",
+    )(
+      getRemoveOldRevisionsAndImagesCommand(context, "postDeploy"), // we cleanup inactive images both on deploy and stop
+    ),
+    ...getDependencyTrackUploadScript(context),
+  ];
+}

package/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts

@@ -0,0 +1,34 @@
+import type { ComponentContext } from "../../../types/context";
+import { getDependencyTrackDeleteScript } from "../../sbom";
+
+import { getRemoveOldRevisionsAndImagesCommand } from "../cleanup";
+import { getDatabaseDeleteScript } from "../utils/database";
+import { gcloudServiceAccountLoginCommands } from "../utils/gcloudServiceAccountLoginCommands";
+import {
+  getDeleteJobsScripts,
+  getDeleteSchedulesScripts,
+  getJobRunScripts,
+} from "./cloudRunJobs";
+import { getServiceDeleteScript } from "./cloudRunServices";
+import { getCloudRunDeployConfig } from "./common";
+
+export function getCloudRunStopScripts(context: ComponentContext) {
+  const deployConfig = getCloudRunDeployConfig(context);
+  return [
+    ...gcloudServiceAccountLoginCommands(context),
+    ...getJobRunScripts(context, "preStop"),
+    ...(deployConfig.service !== false ? getServiceDeleteScript(context) : []),
+    ...Object.entries(deployConfig.additionalServices ?? {}).flatMap(([name]) =>
+      getServiceDeleteScript(context, name),
+    ),
+    ...getJobRunScripts(context, "postStop"),
+    ...getDeleteSchedulesScripts(context),
+    ...getDeleteJobsScripts(context),
+    ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop
+      ? getDatabaseDeleteScript(context, deployConfig)
+      : []),
+
+    ...getRemoveOldRevisionsAndImagesCommand(context, "onStop"), // we cleanup inactive images both on deploy and stop
+    ...getDependencyTrackDeleteScript(context),
+  ];
+}

package/src/deploy/cloudRun/createJobs/index.ts

@@ -0,0 +1,51 @@
+import { getRunnerImage } from "../../../runner";
+import type { ComponentContext } from "../../../types/context";
+import type { CatladderJob } from "../../../types/jobs";
+import { allowFailureInScripts } from "../../../utils/gitlab";
+import { createDeployementJobs } from "../../base";
+
+import { isOfDeployType } from "../../types";
+import { ENV_VARS_FILENAME } from "./constants";
+import { getCloudRunDeployScripts } from "./getCloudRunDeployScripts";
+import { getCloudRunStopScripts } from "./getCloudRunStopScripts";
+
+export const createGoogleCloudRunDeployJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const deployConfig = context.deploy?.config;
+  if (!isOfDeployType(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+
+  const deployScripts = getCloudRunDeployScripts(context);
+  const stopScripts = getCloudRunStopScripts(context);
+
+  return createDeployementJobs(context, {
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+      },
+      ...(deployConfig.debug
+        ? {
+            artifacts: {
+              paths: [
+                ENV_VARS_FILENAME, // debug
+              ],
+              when: "always",
+            },
+          }
+        : {}),
+
+      image: getRunnerImage("gcloud"),
+      script: deployScripts,
+    },
+    stop: {
+      image: getRunnerImage("gcloud"),
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+      },
+      script: allowFailureInScripts(stopScripts),
+    },
+  });
+};

package/src/deploy/cloudRun/createJobs/volumes.ts

@@ -0,0 +1,23 @@
+import type { DeployConfigCloudRunVolumes } from "../../types";
+import type { keyValuesArg } from "../utils/createArgsString";
+
+export const createVolumeConfig = (
+  volumes: DeployConfigCloudRunVolumes | undefined,
+  type: "service" | "job",
+): keyValuesArg[] => {
+  if (!volumes) {
+    return [];
+  }
+
+  return [
+    ...Object.entries(volumes).map(
+      ([volumeName, { type, bucket, mountPath, readonly }]) => ({
+        "add-volume": `name=${volumeName},type=${type},bucket=${bucket}${
+          readonly ? ",readonly=true" : ""
+        }`,
+        "add-volume-mount": `volume=${volumeName},mount-path=${mountPath}`,
+      }),
+    ),
+    type === "service" ? { "execution-environment": "gen2" } : {},
+  ];
+};

package/src/deploy/cloudRun/index.ts

@@ -1,13 +1,23 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCloudRun, DeployTypeDefinition } from "..";
+import {
+  getBashVariable,
+  joinBashExpressions,
+} from "../../bash/BashExpression";
+import type { BuildConfig } from "../../build";
 import { getSecretVarName } from "../../context";
 import type { EnvironmentContext } from "../../types/environmentContext";
 import { sanitizeForBashVariable } from "../../utils/gitlab";
 import { getFullDbName } from "../cloudSql/utils";
-import { createGoogleCloudRunDeployJobs } from "./deployJob";
+import { createGoogleCloudRunDeployJobs } from "./createJobs";
+import {
+  DATABASE_JDBC_URL,
+  getDatabaseConnectionString,
+} from "./utils/database";
 import { getCloudRunJobName } from "./utils/jobName";
 
 export const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 
+// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 export const GCLOUD_RUN_CANONICAL_HOST_SUFFIX =
   "GCLOUD_RUN_canonicalHostSuffix";
 
@@ -17,17 +27,17 @@ const getCloudSqlVariables = ({
   env,
   componentName,
   fullConfig,
-}: EnvironmentContext<any, "google-cloudrun">) => {
+}: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => {
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
     const DB_NAME = getFullDbName(
       deployConfigRaw.cloudSql,
       fullConfig,
       environmentSlugPrefix,
-      componentName
+      componentName,
     );
 
     const additionalQueryParamsString = Object.entries(
-      deployConfigRaw.cloudSql.dbAdditionalQueryParams ?? {}
+      deployConfigRaw.cloudSql.dbAdditionalQueryParams ?? {},
     )
       .map(([key, value]) => `&${key}=${value}`)
       .join("");
@@ -38,64 +48,80 @@ const getCloudSqlVariables = ({
       DB_NAME: DB_NAME,
       DB_USER: deployConfigRaw.cloudSql.dbUser ?? "postgres",
       DB_PASSWORD: "$" + getSecretVarName(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: `postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME${additionalQueryParamsString}`,
-      DATABASE_JDBC_URL: `jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD${additionalQueryParamsString}`,
+      DATABASE_URL: `${getDatabaseConnectionString(
+        deployConfigRaw.cloudSql,
+      )}${additionalQueryParamsString}`,
+      DATABASE_JDBC_URL: DATABASE_JDBC_URL,
     };
   }
   return {};
 };
-export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun"> = {
-  jobs: createGoogleCloudRunDeployJobs,
-  defaults: ({ deployConfigRaw, envType }) => {
-    if (deployConfigRaw && deployConfigRaw.cloudSql) {
-      return {
-        cloudSql: {
-          deleteDatabaseOnStop: envType === "review",
-        },
-      };
-    }
-    return {};
-  },
-  additionalSecretKeys: (ctx) => [
-    {
-      key: GCLOUD_DEPLOY_CREDENTIALS_KEY,
-      hidden: true,
-    },
-    {
-      key: GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
-      hidden: true,
+export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun> =
+  {
+    jobs: createGoogleCloudRunDeployJobs,
+    defaults: ({ deployConfigRaw, envType }) => {
+      if (deployConfigRaw && deployConfigRaw.cloudSql) {
+        return {
+          cloudSql: {
+            deleteDatabaseOnStop: envType === "review",
+          },
+        };
+      }
+      return {};
     },
-    ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
-      ? [{ key: "DB_PASSWORD" }]
-      : []),
-  ],
-  getAdditionalEnvVars: (ctx) => {
-    const { fullName, env, componentName, deployConfigRaw } = ctx;
-    const HOST_CANONICAL =
-      fullName.toLowerCase() +
-      "-" +
-      (process.env[
-        getSecretVarName(env, componentName, GCLOUD_RUN_CANONICAL_HOST_SUFFIX)
-      ] ?? "unknown-host.example.com");
+    additionalSecretKeys: (ctx) => [
+      {
+        key: GCLOUD_DEPLOY_CREDENTIALS_KEY,
+        hidden: true,
+      },
+      {
+        key: GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+        hidden: true,
+      },
+      ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
+        ? [{ key: "DB_PASSWORD" }]
+        : []),
+    ],
+    getAdditionalEnvVars: (ctx) => {
+      const { fullName, env, componentName, deployConfigRaw } = ctx;
 
-    const jobTriggers =
-      deployConfigRaw && deployConfigRaw.jobs
-        ? Object.fromEntries(
-            Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
-              "CLOUD_RUN_JOB_TRIGGER_URL_" + sanitizeForBashVariable(name),
-              `https://${
-                deployConfigRaw.region
-              }-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${
-                deployConfigRaw.projectId
-              }/jobs/${getCloudRunJobName(fullName, name)}:run`,
-            ])
-          )
-        : {};
+      const HOSTNAME_INTERNAL = joinBashExpressions(
+        [
+          fullName,
+          getBashVariable(
+            getSecretVarName(
+              env,
+              componentName,
+              GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+            ),
+          ),
+        ],
+        "-",
+      ).toLowerCase();
+      const jobTriggers =
+        deployConfigRaw && deployConfigRaw.jobs
+          ? Object.fromEntries(
+              Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
+                "CLOUD_RUN_JOB_TRIGGER_URL_" + sanitizeForBashVariable(name),
+                `https://${
+                  deployConfigRaw.region
+                }-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${
+                  deployConfigRaw.projectId
+                }/jobs/${getCloudRunJobName(fullName, name)}:run`,
+              ]),
+            )
+          : {};
 
-    return {
-      HOST_CANONICAL,
-      ...getCloudSqlVariables(ctx),
-      ...jobTriggers,
-    };
-  },
-};
+      return {
+        HOSTNAME_INTERNAL,
+        ...getCloudSqlVariables(ctx),
+        ...jobTriggers,
+        DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
+          ? deployConfigRaw.projectId
+          : undefined,
+        DEPLOY_CLOUD_RUN_REGION: deployConfigRaw
+          ? deployConfigRaw.region
+          : undefined,
+      };
+    },
+  };

package/src/deploy/cloudRun/utils/createArgsString.ts

@@ -1,4 +1,5 @@
 import { isNil } from "lodash";
+import type { BashExpression } from "../../../bash/BashExpression";
 
 /**
  * creates arguments string:
@@ -10,17 +11,24 @@ import { isNil } from "lodash";
  * @param args args record
  * @returns
  */
-export const createArgsString = (
-  args: Record<string, string | number | true | false | undefined>
-) =>
-  Object.entries(args)
-    .filter(([, value]) => !isNil(value))
-    .map(([key, value]) => {
-      if (value === true) {
-        return `--${key}`;
-      } else if (value === false) {
-        return `--no-${key}`;
-      }
-      return `--${key}=${value}`;
-    })
+export const createArgsString = (...args: keyValuesArg[]) =>
+  args
+    .map((argObj) =>
+      Object.entries(argObj)
+        .filter(([, value]) => !isNil(value))
+        .map(([key, value]) => {
+          if (value === true) {
+            return `--${key}`;
+          } else if (value === false) {
+            return `--no-${key}`;
+          }
+          return `--${key}=${value}`;
+        }),
+    )
+    .flat()
     .join(" ");
+
+export type keyValuesArg = Record<
+  string,
+  string | number | true | false | undefined | BashExpression
+>;

package/src/deploy/cloudRun/utils/database.ts

@@ -1,16 +1,19 @@
-import type { Context } from "../../../types";
+import type { ComponentContext } from "../../../types";
 import { allowFailureInScripts, repeatOnFailure } from "../../../utils/gitlab";
-import type { DeployConfigCloudRun } from "../../types";
+import type {
+  DeployConfigCloudRun,
+  DeployConfigCloudRunCloudSql,
+} from "../../types";
 
 export const getDatabaseDeleteScript = (
-  context: Context,
-  deployConfig: DeployConfigCloudRun
+  context: ComponentContext,
+  deployConfig: DeployConfigCloudRun,
 ): string[] => {
   if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
     throw new Error("not possible");
   }
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
-  const { DB_NAME } = context.environment.envVars ?? {};
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
   }
@@ -26,20 +29,20 @@ export const getDatabaseDeleteScript = (
       `gcloud sql databases delete ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
       {
         pauseInSeconds: 10,
-      }
+      },
     ),
   ];
 };
 
 export const getDatabaseCreateScript = (
-  context: Context,
-  deployConfig: DeployConfigCloudRun
+  context: ComponentContext,
+  deployConfig: DeployConfigCloudRun,
 ): string[] => {
   if (!deployConfig.cloudSql) {
     throw new Error("not possible");
   }
 
-  const { DB_NAME } = context.environment.envVars ?? {};
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
@@ -53,3 +56,22 @@ export const getDatabaseCreateScript = (
     `gcloud sql databases create ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
   ]);
 };
+
+export const DATABASE_JDBC_URL =
+  "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
+
+export const getDatabaseConnectionString = (
+  config: DeployConfigCloudRunCloudSql,
+): string => {
+  switch (config.dbConnectionStringFormat) {
+    case "jdbc":
+      return DATABASE_JDBC_URL;
+    case "rails":
+      return `postgresql://$DB_USER:$DB_PASSWORD@${encodeURIComponent(
+        `/cloudsql/${config.instanceConnectionName}`,
+      )}/$DB_NAME?`;
+    default:
+      // prisma
+      return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+  }
+};

package/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts

@@ -1,14 +1,12 @@
 import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
 import { getSecretVarNameForContext } from "../../../context";
-import type { Context } from "../../../types";
+import type { ComponentContext } from "../../../types";
 
-export const gcloudServiceAccountLoginCommands = (context: Context) => {
-  return [
-    `echo $${getSecretVarNameForContext(
-      context,
-      GCLOUD_DEPLOY_CREDENTIALS_KEY
-    )} > ./____keyfile.json
-          `,
-    `gcloud auth activate-service-account --key-file="./____keyfile.json"`,
-  ];
-};
+export const gcloudServiceAccountLoginCommands = (
+  context: ComponentContext,
+) => [
+  `gcloud auth activate-service-account --key-file=<(echo "$${getSecretVarNameForContext(
+    context,
+    GCLOUD_DEPLOY_CREDENTIALS_KEY,
+  )}")`,
+];

package/src/deploy/cloudRun/utils/getServiceName.ts

@@ -0,0 +1,3 @@
+import type { ComponentContext } from "../../../types/context";
+export const getServiceName = (context: ComponentContext) =>
+  context.environment.fullName.toLowerCase();

package/src/deploy/cloudRun/utils/jobName.ts

@@ -1,2 +1,7 @@
-export const getCloudRunJobName = (fullAppName: string, jobName: string) =>
-  fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
+
+export const getCloudRunJobName = (
+  fullAppName: StringOrBashExpression,
+  jobName: string,
+): StringOrBashExpression =>
+  fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());