@catladder/pipeline 3.32.1 → 3.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.js +1 -1
- package/dist/context/getEnvironmentVariables.d.ts +4 -4
- package/dist/context/getEnvironmentVariables.js +15 -10
- package/dist/defaults/index.js +1 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/config.d.ts +5 -1
- package/examples/__snapshots__/automatic-releases.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-execute-script-on-deploy.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-health-check-defaults.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-health-check-only-startup.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-health-check.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-http2.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-llama.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-memory-limit.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-meteor-with-worker.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-nextjs.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-non-public.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-service-gen2.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-service-increase-timout.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-storybook.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-agents.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-gpu.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-ngnix.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-sql-legacy-jobs.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-sql-multiple-dbs.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +0 -3
- package/examples/__snapshots__/cloud-run-with-worker.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-build-job-with-tests.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-build-job.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-deploy.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-docker-file.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-envs.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-sbom-java.test.ts.snap +0 -3
- package/examples/__snapshots__/custom-verify-job.test.ts.snap +0 -3
- package/examples/__snapshots__/git-submodule.test.ts.snap +0 -3
- package/examples/__snapshots__/kubernetes-application-customization.test.ts.snap +0 -3
- package/examples/__snapshots__/kubernetes-with-cloud-sql.test.ts.snap +0 -3
- package/examples/__snapshots__/kubernetes-with-jobs.test.ts.snap +0 -3
- package/examples/__snapshots__/kubernetes-with-mongodb.test.ts.snap +0 -3
- package/examples/__snapshots__/local-dot-env.test.ts.snap +0 -3
- package/examples/__snapshots__/meteor-kubernetes.test.ts.snap +0 -3
- package/examples/__snapshots__/modify-generated-files.test.ts.snap +0 -3
- package/examples/__snapshots__/modify-generated-yaml.test.ts.snap +0 -3
- package/examples/__snapshots__/multiline-var.test.ts.snap +0 -3
- package/examples/__snapshots__/native-app.test.ts.snap +0 -3
- package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap +0 -3
- package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap +0 -3
- package/examples/__snapshots__/override-secrets.test.ts.snap +0 -3
- package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap +0 -3
- package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap +0 -3
- package/examples/__snapshots__/referencing-other-vars.test.ts.snap +0 -3
- package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap +0 -3
- package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap +0 -3
- package/examples/__snapshots__/workspace-api-www.test.ts.snap +0 -3
- package/package.json +1 -1
- package/src/context/getEnvironmentVariables.ts +15 -14
- package/src/defaults/index.ts +0 -1
- package/src/types/config.ts +5 -1
package/package.json
CHANGED
|
@@ -40,10 +40,10 @@ type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
|
|
|
40
40
|
|
|
41
41
|
// we export so that we have later nice autocomplete
|
|
42
42
|
export type PredefinedVariables = BasePredefinedVariables & {
|
|
43
|
-
HOSTNAME
|
|
44
|
-
ROOT_URL
|
|
45
|
-
HOSTNAME_INTERNAL
|
|
46
|
-
ROOT_URL_INTERNAL
|
|
43
|
+
HOSTNAME?: StringOrBashExpression;
|
|
44
|
+
ROOT_URL?: StringOrBashExpression;
|
|
45
|
+
HOSTNAME_INTERNAL?: StringOrBashExpression;
|
|
46
|
+
ROOT_URL_INTERNAL?: StringOrBashExpression;
|
|
47
47
|
};
|
|
48
48
|
|
|
49
49
|
export const getEnvironmentVariables = async (
|
|
@@ -60,22 +60,23 @@ export const getEnvironmentVariables = async (
|
|
|
60
60
|
getBasePredefinedVariables(environmentContext);
|
|
61
61
|
|
|
62
62
|
let predefinedVariables: PredefinedVariables & UnspecifiedEnvVars;
|
|
63
|
-
let host: StringOrBashExpression;
|
|
64
|
-
let url: StringOrBashExpression;
|
|
63
|
+
let host: StringOrBashExpression | null;
|
|
64
|
+
let url: StringOrBashExpression | null;
|
|
65
65
|
|
|
66
66
|
if (envType === "local") {
|
|
67
67
|
const devLocalConfig: DevLocalEnvConfig = envConfigRaw;
|
|
68
|
-
const port =
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
const port =
|
|
69
|
+
devLocalConfig.port !== false ? (devLocalConfig.port ?? 3000) : null;
|
|
70
|
+
host = port ? "localhost:" + port.toString() : null;
|
|
71
|
+
url = host ? "http://" + host : null;
|
|
71
72
|
predefinedVariables = {
|
|
72
73
|
...basePredefinedVariables,
|
|
73
74
|
ENV_SHORT: "local",
|
|
74
|
-
ROOT_URL: url,
|
|
75
|
-
HOSTNAME: host,
|
|
76
|
-
HOSTNAME_INTERNAL: host,
|
|
77
|
-
ROOT_URL_INTERNAL: "http://" + host,
|
|
78
|
-
PORT: port.toString(),
|
|
75
|
+
...(url ? { ROOT_URL: url } : {}),
|
|
76
|
+
...(host ? { HOSTNAME: host } : {}),
|
|
77
|
+
...(host ? { HOSTNAME_INTERNAL: host } : {}),
|
|
78
|
+
...(host ? { ROOT_URL_INTERNAL: "http://" + host } : {}),
|
|
79
|
+
...(port ? { PORT: port.toString() } : {}),
|
|
79
80
|
};
|
|
80
81
|
} else {
|
|
81
82
|
const additionalEnvVars = deployConfigRaw
|
package/src/defaults/index.ts
CHANGED
package/src/types/config.ts
CHANGED
|
@@ -95,7 +95,11 @@ export type DefaultEnvConfig = {
|
|
|
95
95
|
|
|
96
96
|
export type DevLocalEnvConfig = {
|
|
97
97
|
vars?: EnvVars;
|
|
98
|
-
|
|
98
|
+
/**
|
|
99
|
+
* port that is used. If not set, 3000 is used.
|
|
100
|
+
* set false to not set a port at all
|
|
101
|
+
*/
|
|
102
|
+
port?: number | false;
|
|
99
103
|
};
|
|
100
104
|
type AddOverrideFunction<T> = {
|
|
101
105
|
[K in keyof T]:
|