@catladder/pipeline 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2 → 0.0.0-reference-database-url-1befbbee

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

@@ -1,6 +1,25 @@
+import { type StringOrBashExpression } from "../../../bash";
 import type { ComponentContext } from "../../../types";
 import type { DeployConfigCloudRun, DeployConfigCloudRunCloudSql } from "../../types";
 export declare const getDatabaseDeleteScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
 export declare const getDatabaseCreateScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
-export declare 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 declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql) => string;
+export type DBVariables = {
+  CLOUD_SQL_INSTANCE_CONNECTION_NAME: StringOrBashExpression;
+  DB_NAME: StringOrBashExpression;
+  DB_USER: StringOrBashExpression;
+  DB_PASSWORD: StringOrBashExpression;
+};
+/**
+ * controls how variables in the connection string are handled
+ *
+ * - legacy: variables like $DB_USER will be kept as environment variables to be replaced at runtime (default). It is not using BashExpressions as this was not the case in the past.
+ * - embedded: variables will be replaced with their actual values in the connection string
+ *
+ * We will remove the legacy mode in the future, as it is confusing. But its unclear whether its a breaking change in some edge cases
+ */
+export type DBVariablesMode = "legacy" | "embedded";
+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;

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

@@ -25,7 +25,8 @@ var __read = this && this.__read || function (o, n) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+exports.getDatabaseConnectionString = exports.getPrismaDatabaseConnectionString = exports.getRailsDatabaseConnectionString = exports.getDatabaseJdbcUrl = exports.DEFAULT_DB_VARIABLES_MODE = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+var bash_1 = require("../../../bash");
 var gitlab_1 = require("../../../utils/gitlab");
 var getDatabaseDeleteScript = function (context, deployConfig) {
   if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
@@ -62,16 +63,36 @@ var getDatabaseCreateScript = function (context, deployConfig) {
   return (0, gitlab_1.allowFailureInScripts)(["echo \"ensuring Database...\"", "gcloud sql databases create ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId)]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
-exports.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";
-var getDatabaseConnectionString = function (config) {
+exports.DEFAULT_DB_VARIABLES_MODE = "legacy";
+var getVariableOrValue = function (key, variables, mode) {
+  return mode === "legacy" ? "$".concat(key) : variables[key];
+};
+var getDatabaseJdbcUrl = function (variables, mode) {
+  var 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;
+var getRailsDatabaseConnectionString = function (variables, mode) {
+  var parts = ["postgresql://", getVariableOrValue("DB_USER", variables, mode), ":", getVariableOrValue("DB_PASSWORD", variables, mode), "@", encodeURIComponent("/cloudsql/".concat(variables.CLOUD_SQL_INSTANCE_CONNECTION_NAME)), "/", getVariableOrValue("DB_NAME", variables, mode), "?"];
+  return (0, bash_1.joinBashExpressions)(parts);
+};
+exports.getRailsDatabaseConnectionString = getRailsDatabaseConnectionString;
+var getPrismaDatabaseConnectionString = function (variables, mode) {
+  var 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;
+var getDatabaseConnectionString = function (config, variables) {
+  var _a;
+  var mode = (_a = config.dbConnectionStringVariablesMode) !== null && _a !== void 0 ? _a : exports.DEFAULT_DB_VARIABLES_MODE;
   switch (config.dbConnectionStringFormat) {
     case "jdbc":
-      return exports.DATABASE_JDBC_URL;
+      return (0, exports.getDatabaseJdbcUrl)(variables, mode);
     case "rails":
-      return "postgresql://$DB_USER:$DB_PASSWORD@".concat(encodeURIComponent("/cloudsql/".concat(config.instanceConnectionName)), "/$DB_NAME?");
+      return (0, exports.getRailsDatabaseConnectionString)(variables, mode);
     default:
       // prisma
-      return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+      return (0, exports.getPrismaDatabaseConnectionString)(variables, mode);
   }
 };
 exports.getDatabaseConnectionString = getDatabaseConnectionString;

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

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

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

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCloudRunServiceOrJobArgsArg = void 0;
+var getCloudRunServiceOrJobArgsArg = function (args) {
+  return args !== undefined ? args.length > 0 ? args === null || args === void 0 ? void 0 : args.map(function (arg) {
+    return "\"".concat(arg, "\"");
+  }).join(",") : "" : undefined;
+};
+exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;

package/dist/deploy/kubernetes/kubeValues.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentContext } from "../../types/context";
-export declare const createKubeValues: (context: ComponentContext) => never[] | ({
+import type { BuildContextComponent, ComponentContext } from "../../types/context";
+export declare const createKubeValues: (context: ComponentContext<BuildContextComponent>) => never[] | ({
   env: {
     secret: Record<string, import("../..").VariableValue>;
     public: Record<string, import("../..").VariableValue>;

package/dist/deploy/kubernetes/kubeValues.js

@@ -62,7 +62,7 @@ var createAppConfig = function (context, application) {
     rest = __rest(_a, ["healthRoute", "command"]);
   return (0, utils_1.mergeWithMergingArrays)({
     host: context.environment.envVars.HOSTNAME,
-    command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
+    command: command !== null && command !== void 0 ? command : context.build.type !== "disabled" ? context.build.config.startCommand : undefined,
     livenessProbe: {
       httpGet: {
         path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"

package/dist/deploy/sbom.js

@@ -8,7 +8,7 @@ var BashExpression_1 = require("../bash/BashExpression");
 var sbom_1 = require("../build/sbom");
 var context_1 = require("../types/context");
 var sbomDeactivated = function (context) {
-  return (0, context_1.componentContextIsStandaloneBuild)(context) && context.build.config.type === "custom" && context.build.config.sbom === false;
+  return context.build.type === "disabled" || (0, context_1.componentContextIsStandaloneBuild)(context) && context.build.config.type === "custom" && context.build.config.sbom === false;
 };
 exports.sbomDeactivated = sbomDeactivated;
 var getDependencyTrackUploadScript = function (context) {

package/dist/deploy/types/googleCloudRun.d.ts

@@ -1,3 +1,4 @@
+import type { DBVariablesMode } from "../cloudRun/utils/database";
 import type { DeployConfigBase } from "./base";
 export type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
 export type DeployConfigCloudRunCloudSql = {
@@ -36,6 +37,15 @@ export type DeployConfigCloudRunCloudSql = {
    * defaults to prisma
    */
   dbConnectionStringFormat?: "prisma" | "rails" | "jdbc";
+  /**
+   * controls how variables in the connection string are handled
+   *
+   * - environment: variables like $DB_USER will be kept as environment variables to be replaced at runtime (default)
+   * - embedded: variables will be replaced with their actual values in the connection string
+   *
+   * @default "environment"
+   */
+  dbConnectionStringVariablesMode?: DBVariablesMode;
   /**
    * add additional query params to the database connection string
    */
@@ -116,7 +126,97 @@ export type DeployConfigCloudRunService = {
    *
    */
   http2?: boolean;
+  /**
+   * Number of GPUs to use. Defaults to 0
+   *
+   * This is a preview feature and not all regions support it.
+   */
+  gpu?: number;
+  /**
+   * gpu type to use. Refer to https://cloud.google.com/run/docs/configuring/services/gpu#gcloud for defaults
+   */
+  gpuType?: string;
+  /**
+   * the image to use. Defaults to the image from the build.
+   *
+   * If you specify an image, you usually want to disable the build by setting build: false
+   */
+  image?: string;
+  /**
+   * args to pass to the command
+   */
+  args?: string[];
+  /**
+   * Configuration of the health check.
+   *
+   * When set to `true`, startup and liveness probes will be
+   * configured to `defaultStartupProbe` and `defaultLivenessProbe`.
+   *
+   * When not set, default Cloud Run's health check
+   * configuration is used (startup TCP probe and no liveness probe).
+   */
+  healthCheck?: true | {
+    /**
+     * Startup probe configuration.
+     */
+    startupProbe: DeployConfigCloudRunProbe;
+    /**
+     * Liveness probe configuration.
+     * `false` disables the liveness probe.
+     */
+    livenessProbe: false | DeployConfigCloudRunProbe;
+  };
 } & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
+export declare const defaultStartupProbe: DeployConfigCloudRunProbe;
+export declare const defaultLivenessProbe: DeployConfigCloudRunProbe;
+export type DeployConfigCloudRunProbe = DeployConfigCloudRunHttp1Probe | DeployConfigCloudRunTcpProbe;
+export type DeployConfigCloudRunProbeShared = {
+  /**
+   * The period in seconds at which to perform the probe.
+   * For example 2 to perform the probe every 2 seconds.
+   * Specify a value **from 1 second to 240** seconds.
+   */
+  periodSeconds: number;
+  /**
+   * The number of seconds to wait after the container has started before performing the first probe.
+   * Specify a value **from 0 seconds to 240** seconds.
+   */
+  initialDelaySeconds: number;
+  /**
+   * The number of seconds to wait until the probe times out.
+   * This value cannot exceed the value specified for `period`.
+   * Specify a value **from 1 to 240**.
+   */
+  timeoutSeconds: number;
+  /**
+   * The number of times to retry the probe before shutting down the container.
+   */
+  failureThreshold: number;
+};
+export type DeployConfigCloudRunTcpProbe = DeployConfigCloudRunProbeShared & {
+  /**
+   * Cloud Run makes a TCP connection to open the TCP Socket on the specified port.
+   * If Cloud Run is unable to establish a connection, it indicates a failure.
+   */
+  type: "tcp";
+};
+export type DeployConfigCloudRunHttp1Probe = DeployConfigCloudRunProbeShared & {
+  /**
+   * **This will NOT work with http2 enabled services**
+   *
+   * Cloud Run makes an HTTP GET request to the service health check endpoint (for example, /ready).
+   * Any response between 200 and 400 is a success, everything else indicates failure.
+   *
+   * If a startup probe does not succeed within the specified time (failureThreshold * period), which cannot exceed 240 seconds, the container is shut down.
+   *
+   * If the HTTP startup probe succeeds within the specified time, and you have enabled liveness probe, the HTTP liveness probe is started.
+   */
+  type: "http1";
+  /**
+   * the route path to check for health status of the service starting with a `/`.
+   */
+  path: string;
+};
 export type DeployConfigCloudRunNetworkConfig = {
   network?: string;
   /**

package/dist/deploy/types/googleCloudRun.js

@@ -1,5 +1,30 @@
 "use strict";
 
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
+});
+exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
+exports.defaultStartupProbe = {
+  type: "http1",
+  path: "/__health",
+  initialDelaySeconds: 5,
+  timeoutSeconds: 1,
+  periodSeconds: 30,
+  failureThreshold: 3
+};
+exports.defaultLivenessProbe = __assign(__assign({}, exports.defaultStartupProbe), {
+  initialDelaySeconds: 0,
+  timeoutSeconds: 10,
+  periodSeconds: 30,
+  failureThreshold: 3
 });

package/dist/pipeline/createJobsForComponent.js

@@ -73,7 +73,7 @@ var getCustomJobs = function (context) {
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 var createJobsForComponentContext = function (context) {
-  var buildJobs = build_1.BUILD_TYPES[context.build.buildType].jobs(context);
+  var buildJobs = context.build.type !== "disabled" ? build_1.BUILD_TYPES[context.build.buildType].jobs(context) : [];
   var deployJobs = context.componentConfig.deploy !== false ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context) : [];
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);