Skip to content

Commit

Permalink
add initdeploy job to preview template (#4582)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianedwards
ianedwards authored May 1, 2024
1 parent 5099d3a commit 7e83ed5
Show file tree
Hide file tree
Showing 17 changed files with 362 additions and 161 deletions.
14 changes: 11 additions & 3 deletions dashboard/src/lib/hooks/usePorterYaml.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,18 @@ export const usePorterYaml = ({
ignoreUnknownFields: true,
});

const { services, predeploy, build } = serviceOverrides({
const { services, predeploy, initialDeploy, build } = serviceOverrides({
overrides: proto,
useDefaults,
defaultCPU: newServiceDefaultCpuCores,
defaultRAM: newServiceDefaultRamMegabytes,
});

if (services.length || predeploy || build) {
if (services.length || predeploy || initialDeploy || build) {
setDetectedServices({
build,
services,
initialDeploy,
predeploy,
});
}
Expand All @@ -164,19 +165,26 @@ export const usePorterYaml = ({
const {
services: previewServices,
predeploy: previewPredeploy,
initialDeploy: previewInitialDeploy,
build: previewBuild,
} = serviceOverrides({
overrides: previewProto,
useDefaults,
});

if (previewServices.length || previewPredeploy || previewBuild) {
if (
previewServices.length ||
previewPredeploy ||
previewInitialDeploy ||
previewBuild
) {
setDetectedServices((prev) => ({
...prev,
services: prev?.services ? prev.services : [],
previews: {
services: previewServices,
predeploy: previewPredeploy,
initialDeploy: previewInitialDeploy,
build: previewBuild,
variables: data.preview_app?.env_variables ?? {},
},
Expand Down
249 changes: 150 additions & 99 deletions dashboard/src/lib/porter-apps/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
PorterApp,
Service,
} from "@porter-dev/api-contracts";
import { match } from "ts-pattern";
import { match, P } from "ts-pattern";
import { z } from "zod";

import { BUILDPACK_TO_NAME } from "main/home/app-dashboard/types/buildpack";
Expand Down Expand Up @@ -64,6 +64,11 @@ export const deletionValidator = z.object({
name: z.string(),
})
.array(),
initialDeploy: z
.object({
name: z.string(),
})
.array(),
envGroupNames: z
.object({
name: z.string(),
Expand Down Expand Up @@ -106,6 +111,7 @@ export const clientAppValidator = z.object({
.default([]),
services: serviceValidator.array(),
predeploy: serviceValidator.array().optional(),
initialDeploy: serviceValidator.array().optional(),
env: z
.object({
key: z.string(),
Expand Down Expand Up @@ -236,41 +242,101 @@ export function serviceOverrides({
};
}

if (useDefaults) {
return {
build: validatedBuild,
services,
predeploy: deserializeService({
service: defaultSerialized({
name: "pre-deploy",
type: "predeploy",
defaultCPU,
defaultRAM,
}),
override: serializedServiceFromProto({
const predeploy = match({
predeployOverride: overrides.predeploy,
useDefaults,
})
.with(
{
predeployOverride: P.nullish,
},
() => undefined
)
.with(
{
useDefaults: true,
},
({ predeployOverride }) =>
deserializeService({
service: defaultSerialized({
name: "pre-deploy",
type: "predeploy",
defaultCPU,
defaultRAM,
}),
override: serializedServiceFromProto({
service: new Service({
...predeployOverride,
name: "pre-deploy",
}),
isPredeploy: true,
}),
expanded: true,
})
)
.otherwise(({ predeployOverride }) =>
deserializeService({
service: serializedServiceFromProto({
service: new Service({
...overrides.predeploy,
...predeployOverride,
name: "pre-deploy",
}),
isPredeploy: true,
}),
expanded: true,
}),
};
}
})
);

const initialDeploy = match({
initialDeployOverride: overrides.initialDeploy,
useDefaults,
})
.with(
{
initialDeployOverride: P.nullish,
},
() => undefined
)
.with(
{
useDefaults: true,
initialDeployOverride: P.not(P.nullish),
},
({ initialDeployOverride }) =>
deserializeService({
service: defaultSerialized({
name: "initdeploy",
type: "initdeploy",
defaultCPU,
defaultRAM,
}),
override: serializedServiceFromProto({
service: new Service({
...initialDeployOverride,
name: "initdeploy",
}),
isPredeploy: false,
isInitdeploy: true,
}),
expanded: true,
})
)
.otherwise(({ initialDeployOverride }) =>
deserializeService({
service: serializedServiceFromProto({
service: new Service({
...(initialDeployOverride ?? {}),
name: "initdeploy",
}),
isInitdeploy: true,
}),
})
);

return {
build: validatedBuild,
services,
predeploy: deserializeService({
service: serializedServiceFromProto({
service: new Service({
...overrides.predeploy,
name: "pre-deploy",
}),
isPredeploy: true,
}),
}),
predeploy,
initialDeploy,
};
}

Expand Down Expand Up @@ -312,6 +378,9 @@ export function clientAppToProto(data: PorterAppFormData): PorterApp {
const predeploy = app.predeploy?.[0]?.run.value
? app.predeploy[0]
: undefined;
const initialDeploy = app.initialDeploy?.[0]?.run.value
? app.initialDeploy[0]
: undefined;

const proto = match(source)
.with(
Expand All @@ -329,6 +398,9 @@ export function clientAppToProto(data: PorterAppFormData): PorterApp {
...(predeploy && {
predeploy: serviceProto(serializeService(predeploy)),
}),
...(initialDeploy && {
initialDeploy: serviceProto(serializeService(initialDeploy)),
}),
helmOverrides:
app.helmOverrides != null
? new HelmOverrides({ b64Values: btoa(app.helmOverrides) })
Expand Down Expand Up @@ -477,7 +549,43 @@ export function clientAppFromProto({
});
});

const predeployList = [];
const predeployList = (proto.predeploy ? [proto.predeploy] : [])
.map((service) =>
serializedServiceFromProto({ service, isPredeploy: true })
)
.map((svc) => {
const override = overrides?.predeploy;
if (override) {
return deserializeService({
service: svc,
override: serializeService(override),
});
}

return deserializeService({
service: svc,
lockDeletions: lockServiceDeletions,
});
});
const initialDeployList = (proto.initialDeploy ? [proto.initialDeploy] : [])
.map((service) =>
serializedServiceFromProto({ service, isInitdeploy: true })
)
.map((svc) => {
const override = overrides?.initialDeploy;
if (override) {
return deserializeService({
service: svc,
override: serializeService(override),
});
}

return deserializeService({
service: svc,
lockDeletions: lockServiceDeletions,
});
});

const parsedEnv: KeyValueType[] = [
...Object.entries(variables).map(([key, value]) => ({
key,
Expand All @@ -498,83 +606,14 @@ export function clientAppFromProto({
const helmOverrides =
proto.helmOverrides == null ? "" : atob(proto.helmOverrides.b64Values);

if (proto.predeploy) {
predeployList.push(
deserializeService({
service: serializedServiceFromProto({
service: new Service({
...proto.predeploy,
name: "pre-deploy",
}),
isPredeploy: true,
}),
lockDeletions: lockServiceDeletions,
})
);
}
if (!overrides?.predeploy) {
return {
name: {
readOnly: true,
value: proto.name,
},
services,
predeploy: predeployList,
env: parsedEnv,
envGroups: proto.envGroups.map((eg) => ({
name: eg.name,
version: eg.version,
})),
build: clientBuildFromProto(proto.build) ?? {
method: "pack",
context: "./",
buildpacks: [],
builder: "",
},
helmOverrides,
efsStorage: new EFS({
enabled: proto.efsStorage?.enabled ?? false,
}),
cloudSql: {
enabled: proto.cloudSql?.enabled ?? false,
connectionName: proto.cloudSql?.connectionName ?? "",
serviceAccountJsonSecret:
proto.cloudSql?.serviceAccountJsonSecret ?? "",
dbPort: proto.cloudSql?.dbPort ?? 5432,
},
requiredApps: proto.requiredApps.map((app) => ({
name: app.name,
})),
autoRollback: {
enabled: proto.autoRollback?.enabled ?? true, // enabled by default if not found in proto
readOnly: false, // TODO: detect autorollback from porter.yaml
},
};
}

const predeployOverrides = serializeService(overrides.predeploy);
const predeploy = proto.predeploy
? [
deserializeService({
service: serializedServiceFromProto({
service: new Service({
...proto.predeploy,
name: "pre-deploy",
}),
isPredeploy: true,
}),
override: predeployOverrides,
}),
]
: undefined;

return {
name: {
readOnly: true,
value: proto.name,
},
services,
predeploy,
predeploy: predeployList.length ? predeployList : undefined,
initialDeploy: initialDeployList.length ? initialDeployList : undefined,
env: parsedEnv,
envGroups: proto.envGroups.map((eg) => ({
name: eg.name,
Expand Down Expand Up @@ -667,6 +706,18 @@ export function applyPreviewOverrides({
}
}

if (app.initialDeploy) {
const initialDeployOverride = overrides?.initialDeploy;
if (initialDeployOverride) {
app.initialDeploy = [
deserializeService({
service: serializeService(app.initialDeploy[0]),
override: serializeService(initialDeployOverride),
}),
];
}
}

const envOverrides = overrides?.variables;

const env = app.env.map((e) => {
Expand Down
Loading

0 comments on commit 7e83ed5

Please sign in to comment.