@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-3df5566d

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());

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

@@ -0,0 +1,12 @@
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+export const removeFirstLinesFromCommandOutput = (
+  cmd: string,
+  removeFirstN: number,
+) => (removeFirstN === 0 ? cmd : `${cmd} | tail -n +${removeFirstN + 1}`);

package/src/deploy/cloudSql/utils.ts

@@ -1,4 +1,6 @@
 import type { Config } from "../..";
+import type { StringOrBashExpression } from "../../bash/BashExpression";
+import { joinBashExpressions } from "../../bash/BashExpression";
 import type {
   DeployConfigCloudRunCloudSql,
   DeployConfigKubernetesValuesCloudSQLUnmanaged,
@@ -9,15 +11,16 @@ export const getFullDbName = (
     | DeployConfigCloudRunCloudSql
     | DeployConfigKubernetesValuesCloudSQLUnmanaged,
   fullConfig: Config<never>,
-  environmentSlugPrefix: string,
-  componentName: string
+  environmentSlugPrefix: StringOrBashExpression,
+  componentName: string,
 ) => {
-  return [
-    cloudSqlConfig.dbNamePrefix ??
-      `${fullConfig.customerName}-${fullConfig.appName}`,
-    environmentSlugPrefix,
-    cloudSqlConfig.dbBaseName ?? componentName,
-  ]
-    .filter(Boolean)
-    .join("-");
+  return joinBashExpressions(
+    [
+      cloudSqlConfig.dbNamePrefix ??
+        `${fullConfig.customerName}-${fullConfig.appName}`,
+      environmentSlugPrefix,
+      cloudSqlConfig.dbBaseName ?? componentName,
+    ].flatMap((part) => (part ? [part] : [])),
+    "-",
+  );
 };

package/src/deploy/custom/deployJob.ts

@@ -1,6 +1,7 @@
+import { getAllCacheConfigsFromConfig } from "../../build/cache/getAllCacheConfigsFromConfig";
 import { getYarnInstall } from "../../build/node/yarn";
 import { getRunnerImage } from "../../runner";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createDeployementJobs } from "../base";
 import {
@@ -9,23 +10,26 @@ import {
 } from "../sbom";
 import { isOfDeployType } from "../types";
 
-export const createCustomDeployJobs = (context: Context): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+export const createCustomDeployJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const deployConfig = context.deploy?.config;
+
   if (!isOfDeployType(deployConfig, "custom")) {
     // should not happen
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  const yarnInstall = getYarnInstall(context, { noCustomPostInstall: true });
-  return createDeployementJobs(context, {
+  const yarnInstall = getYarnInstall(context, {
+    noCustomPostInstall: true,
+  });
+
+  const result = createDeployementJobs(context, {
     deploy: {
       image: deployConfig.jobImage ?? getRunnerImage("jobs-default"),
-      cache: deployConfig.jobCache ?? [],
+      cache: getAllCacheConfigsFromConfig(context, deployConfig),
       script: [
-        `cd ${context.componentConfig.dir}`,
+        `cd ${context.build.dir}`,
         ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
         ...deployConfig.script,
         ...getDependencyTrackUploadScript(context),
@@ -43,4 +47,5 @@ export const createCustomDeployJobs = (context: Context): CatladderJob[] => {
         }
       : undefined,
   });
+  return result;
 };

package/src/deploy/custom/index.ts

@@ -1,7 +1,7 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCustom, DeployTypeDefinition } from "..";
 import { createCustomDeployJobs } from "./deployJob";
 
-export const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom"> = {
+export const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCustom> = {
   jobs: createCustomDeployJobs,
   defaults: () => ({}),
   additionalSecretKeys: () => [],

package/src/deploy/dockerTag/deployJob.ts

@@ -1,15 +1,14 @@
 import { getDockerJobBaseProps, gitlabDockerLogin } from "../../build/docker";
 
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createDeployementJobs } from "../base";
 import { isOfDeployType } from "../types";
 
-export const createDockerTagDeployJobs = (context: Context): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+export const createDockerTagDeployJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "dockerTag")) {
     // should not happen
     throw new Error("deploy config is not dockerTag");
@@ -17,9 +16,9 @@ export const createDockerTagDeployJobs = (context: Context): CatladderJob[] => {
   const tag = deployConfig.tag;
   return createDeployementJobs(context, {
     deploy: {
-      ...getDockerJobBaseProps(context),
+      ...getDockerJobBaseProps(),
       script: [
-        gitlabDockerLogin,
+        ...gitlabDockerLogin(context),
         `docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG`,
         `docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:${tag}`,
         `docker push $DOCKER_IMAGE:${tag}`,

package/src/deploy/dockerTag/index.ts

@@ -1,9 +1,10 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigDockerTag, DeployTypeDefinition } from "..";
 import { createDockerTagDeployJobs } from "./deployJob";
 
-export const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<"dockerTag"> = {
-  jobs: createDockerTagDeployJobs,
-  defaults: () => ({}),
-  additionalSecretKeys: () => [],
-  getAdditionalEnvVars: () => ({}),
-};
+export const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigDockerTag> =
+  {
+    jobs: createDockerTagDeployJobs,
+    defaults: () => ({}),
+    additionalSecretKeys: () => [],
+    getAdditionalEnvVars: () => ({}),
+  };

package/src/deploy/index.ts

@@ -1,5 +1,6 @@
-import type { SecretEnvVar } from "..";
-import type { Context } from "../types/context";
+import type { BuildConfig, SecretEnvVar } from "..";
+import type { BashExpression } from "../bash/BashExpression";
+import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { PartialDeep } from "../types/utils";
@@ -7,26 +8,28 @@ import { GCLOUD_RUN_DEPLOY_TYPE } from "./cloudRun";
 import { CUSTOM_DEPLOY_TYPE } from "./custom";
 import { DOCKER_TAG_DEPLOY_TYPE } from "./dockerTag";
 import { KUBERNETES_DEPLOY_TYPE } from "./kubernetes";
-import type { DeployConfigGeneric, DeployConfigType } from "./types";
+import type {
+  DeployConfig,
+  DeployConfigGeneric,
+  DeployConfigType,
+} from "./types";
 export * from "./cloudRun";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
 
-export type DeployTypeDefinition<T extends DeployConfigType> = {
-  jobs: (context: Context) => CatladderJob[];
-  defaults: (
-    envContext: EnvironmentContext<any, T>
-  ) => PartialDeep<DeployConfigGeneric<T>>;
+export type DeployTypeDefinition<D extends DeployConfig> = {
+  jobs: (context: ComponentContext) => CatladderJob[];
+  defaults: (envContext: EnvironmentContext<BuildConfig, D>) => PartialDeep<D>;
   additionalSecretKeys: (
-    envContext: EnvironmentContext<any, T>
+    envContext: EnvironmentContext<BuildConfig, D>,
   ) => SecretEnvVar[];
   getAdditionalEnvVars: (
-    envContext: EnvironmentContext<any, T>
-  ) => Record<string, string | undefined | null>;
+    envContext: EnvironmentContext<BuildConfig, D>,
+  ) => Record<string, string | BashExpression | undefined | null>;
 };
 export type DeployTypes = {
-  [T in DeployConfigType]: DeployTypeDefinition<T>;
+  [T in DeployConfigType]: DeployTypeDefinition<DeployConfigGeneric<T>>;
 };
 
 export const DEPLOY_TYPES: DeployTypes = {

package/src/deploy/kubernetes/additionalSecretKeys.ts

@@ -1,8 +1,10 @@
+import type { BuildConfig } from "../../build";
 import type { EnvironmentContext } from "../../types/environmentContext";
+import type { DeployConfigKubernetes } from "../types";
 
 export const additionalKubernetesSecretKeys = ({
   deployConfigRaw,
-}: EnvironmentContext<any, "kubernetes">) => {
+}: EnvironmentContext<BuildConfig, DeployConfigKubernetes>) => {
   if (!deployConfigRaw) {
     return [];
   }

package/src/deploy/kubernetes/cloudSql/index.ts

@@ -1,11 +1,15 @@
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
 import { getSecretVarNameForContext } from "../../../context";
-import type { Context } from "../../../types";
+import type { ComponentContext } from "../../../types";
+import type { VariableValue } from "../../../variables/VariableValue";
 import { getFullDbName } from "../../cloudSql/utils";
 import { isOfDeployType } from "../../types";
 
-export const hasKubernetesCloudSQL = (context: Context) => {
-  if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
-    return context.componentConfig.deploy.values?.cloudsql?.enabled;
+export const hasKubernetesCloudSQL = (context: ComponentContext) => {
+  const deployConfig = context.deploy?.config;
+
+  if (isOfDeployType(deployConfig, "kubernetes")) {
+    return deployConfig.values?.cloudsql?.enabled;
   }
   return false;
 };
@@ -15,19 +19,20 @@ type CloudSqlValues = {
   proxyCredentials: string;
 
   instanceConnectionName: string;
-  fullDbName: string;
+  fullDbName: VariableValue;
   dbUser: string;
 };
 export const createKubernetesCloudsqlBaseValues = (
-  context: Context
+  context: ComponentContext,
 ): {
   cloudsql: CloudSqlValues;
 } => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  const deployConfig = context.deploy?.config;
+  if (!isOfDeployType(deployConfig, "kubernetes")) {
     throw new Error("cannot get cloud sql config");
   }
 
-  const config = context.componentConfig.deploy.values?.cloudsql;
+  const config = deployConfig.values?.cloudsql;
 
   if (!config) {
     throw new Error("cannot get cloud sql config");
@@ -35,23 +40,9 @@ export const createKubernetesCloudsqlBaseValues = (
 
   const proxyCredentials = `$${getSecretVarNameForContext(
     context,
-    "cloudsqlProxyCredentials"
+    "cloudsqlProxyCredentials",
   )}`;
-  if (config?.type !== "unmanaged") {
-    const instanceConnectionName = `${config.projectId ?? "skynet-164509"}:${
-      config.region ?? "europe-west6"
-    }:${config.instanceId ?? context.environment.envVars.KUBE_NAMESPACE}`;
-
-    return {
-      cloudsql: {
-        enabled: config.enabled,
-        dbUser: "postgres",
-        instanceConnectionName,
-        proxyCredentials,
-        fullDbName: context.environment.envVars.KUBE_APP_NAME,
-      },
-    };
-  } else if (config.type === "unmanaged") {
+  if (config.type === "unmanaged") {
     return {
       cloudsql: {
         enabled: config.enabled,
@@ -62,7 +53,7 @@ export const createKubernetesCloudsqlBaseValues = (
           config,
           context.fullConfig,
           context.environment.slugPrefix,
-          context.componentName
+          context.name,
         ),
       },
     };