ComputerSurge/komodo
3
0
Fork 0
forked from github-starred/komodo
Code Pull Requests 1 Actions Packages Releases Activity

pull action

Browse Source
This commit is contained in:
mbecker20
2022-04-05 06:20:59 -07:00
parent 32b5e46959
commit bf4d759ae7
12 changed files with 131 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/messages/builds/index.ts
+2 -2
View File
@@ -4,7 +4,7 @@ import {
CLONE_BUILD_REPO,
CREATE_BUILD,
DELETE_BUILD,
PULL,
PULL_BUILD,
UPDATE_BUILD,
} from "@monitor/util";
import { FastifyInstance } from "fastify";
@@ -47,7 +47,7 @@ async function buildMessages(
}
return true;
case PULL:
case PULL_BUILD:
message.buildID && (await pullRepo(app, user, message));
return true;
core/src/messages/builds/pull.ts
+6 -6
View File
@@ -1,5 +1,5 @@
import { User } from "@monitor/types";
import { prettyStringify, pull, PULL } from "@monitor/util";
import { prettyStringify, pull, PULL_BUILD } from "@monitor/util";
import { FastifyInstance } from "fastify";
import { PERMISSIONS_DENY_LOG, BUILD_REPO_PATH } from "../../config";
import { PULLING } from "../../plugins/actionStates";
@@ -16,7 +16,7 @@ async function pullRepo(
addBuildUpdate(
app,
buildID,
PULL,
PULL_BUILD,
"Pull (DENIED)",
PERMISSIONS_DENY_LOG,
user.username,
@@ -27,7 +27,7 @@ async function pullRepo(
}
if (!app.buildActionStates.get(buildID, PULLING)) {
app.buildActionStates.set(buildID, PULLING, true);
app.broadcast(PULL, { complete: false, buildID });
app.broadcast(PULL_BUILD, { complete: false, buildID });
try {
const { pullName, branch } = build;
const { command, log, isError } = await pull(
@@ -37,7 +37,7 @@ async function pullRepo(
addBuildUpdate(
app,
buildID,
PULL,
PULL_BUILD,
command,
log,
user.username,
@@ -48,7 +48,7 @@ async function pullRepo(
addBuildUpdate(
app,
buildID,
PULL,
PULL_BUILD,
"Pull (ERROR)",
{ stderr: prettyStringify(error) },
user.username,
@@ -56,7 +56,7 @@ async function pullRepo(
true
);
}
app.broadcast(PULL, { complete: true, buildID });
app.broadcast(PULL_BUILD, { complete: true, buildID });
app.buildActionStates.set(buildID, PULLING, false);
}
}
core/src/messages/deployments/index.ts
+4 -6
View File
@@ -1,11 +1,10 @@
import { User } from "@monitor/types";
import {
COPY_ENV,
CREATE_DEPLOYMENT,
DELETE_CONTAINER,
DELETE_DEPLOYMENT,
DEPLOY,
REFRESH_CONTAINER_STATUS,
PULL_DEPLOYMENT,
START_CONTAINER,
STOP_CONTAINER,
UPDATE_DEPLOYMENT,
@@ -20,6 +19,7 @@ import {
import createDeployment from "./create";
import deleteDeployment from "./delete";
import deployDeployment from "./deploy";
import pullDeploymentRepo from "./pull";
import updateDeployment from "./update";
async function deploymentMessages(
@@ -65,10 +65,8 @@ async function deploymentMessages(
await deleteDeploymentContainer(app, user, message);
return true;
case REFRESH_CONTAINER_STATUS:
return true;
case COPY_ENV:
case PULL_DEPLOYMENT:
await pullDeploymentRepo(app, user, message)
return true;
default:
core/src/messages/deployments/pull.ts
+80
View File
@@ -0,0 +1,80 @@
import { User } from "@monitor/types";
import { execute, mergeCommandLogError, PULL_DEPLOYMENT, pull } from "@monitor/util";
import { FastifyInstance } from "fastify";
import { join } from "path";
import { DEPLOYMENT_REPO_PATH, PERMISSIONS_DENY_LOG, SYSTEM_OPERATOR } from "../../config";
import { pullPeriphery } from "../../util/periphery/git";
import { addDeploymentUpdate } from "../../util/updates";
async function pullDeploymentRepo(
app: FastifyInstance,
user: User,
{ deploymentID }: { deploymentID: string }
) {
const deployment = await app.deployments.findById(deploymentID);
if (!deployment) {
return;
}
if (user.permissions! < 2 && !deployment.owners.includes(user.username)) {
addDeploymentUpdate(
app,
deploymentID,
PULL_DEPLOYMENT,
"Pull Deployemnt (DENIED)",
PERMISSIONS_DENY_LOG,
user.username,
undefined,
true
);
return;
}
const { branch, containerName, onPull, serverID } = deployment;
const server = await app.servers.findById(serverID!);
if (!server) {
return;
}
app.deployActionStates.set(deploymentID, "pulling", true);
app.broadcast(PULL_DEPLOYMENT, { deploymentID, complete: false });
if (server.isCore) {
const pullCle = await pull(join(DEPLOYMENT_REPO_PATH, containerName!), branch);
const onPullCle =
onPull &&
(await execute(
`cd ${join(
DEPLOYMENT_REPO_PATH,
containerName!,
onPull.path || ""
)} && ${onPull.command}`
));
const { command, log, isError } = mergeCommandLogError(
{ name: "pull", cle: pullCle },
{ name: "on pull", cle: onPullCle }
);
addDeploymentUpdate(
app,
deploymentID,
PULL_DEPLOYMENT,
command,
log,
SYSTEM_OPERATOR,
"",
isError
);
} else {
const { command, log, isError } = await pullPeriphery(server, deployment);
await addDeploymentUpdate(
app,
deploymentID,
PULL_DEPLOYMENT,
command,
log,
SYSTEM_OPERATOR,
"",
isError
);
}
app.deployActionStates.set(deploymentID, "pulling", false);
app.broadcast(PULL_DEPLOYMENT, { deploymentID, complete: true });
}
export default pullDeploymentRepo;
core/src/plugins/actionStates.ts
+1
View File
@@ -81,6 +81,7 @@ const actionStates = fp((app: FastifyInstance, _: {}, done: () => void) => {
stopping: false,
updating: false,
fullDeleting: false,
pulling: false,
};
},
delete: (deploymentID: string) => {
core/src/routes/deployments.ts
+1 -1
View File
@@ -25,7 +25,7 @@ const deployments = fp((app: FastifyInstance, _: {}, done: () => void) => {
}
const deployments = await app.deployments.find(
{ serverID: server._id },
"name containerName serverID owners"
"name containerName serverID owners repo"
);
const status = server.isCore
? await deploymentStatusLocal(app)
core/src/routes/listener.ts
+1 -1
View File
@@ -81,7 +81,7 @@ const listener = fp((app: FastifyInstance, _: {}, done: () => void) => {
return;
}
if (server.isCore) {
const pullCle = await pull(join(BUILD_REPO_PATH, containerName!), branch);
const pullCle = await pull(join(DEPLOYMENT_REPO_PATH, containerName!), branch);
const onPullCle =
onPull &&
(await execute(
frontend/src/components/deployment/ActionStateProvider.tsx
+9 -1
View File
@@ -7,7 +7,7 @@ import {
useContext,
} from "solid-js";
import { createStore } from "solid-js/store";
import { DELETE_CONTAINER, DELETE_DEPLOYMENT, DEPLOY, START_CONTAINER, STOP_CONTAINER } from "../../state/actions";
import { DELETE_CONTAINER, DELETE_DEPLOYMENT, DEPLOY, PULL_DEPLOYMENT, START_CONTAINER, STOP_CONTAINER } from "../../state/actions";
import { useAppState } from "../../state/StateProvider";
import { getDeploymentActionState } from "../../util/query";
@@ -24,6 +24,7 @@ export const ActionStateProvider: Component<{}> = (p) => {
stopping: false,
fullDeleting: false,
updating: false,
pulling: false,
});
createEffect(() => {
getDeploymentActionState(selected.id()).then(setActions);
@@ -63,6 +64,13 @@ export const ActionStateProvider: Component<{}> = (p) => {
}
})
);
onCleanup(
ws.subscribe([PULL_DEPLOYMENT], ({ complete, deploymentID }) => {
if (deploymentID === selected.id()) {
setActions("pulling", !complete);
}
})
);
return <context.Provider value={actions}>{p.children}</context.Provider>;
};
frontend/src/components/deployment/Actions.tsx
+21 -13
View File
@@ -1,23 +1,15 @@
import { ContainerStatus, DeployActionState } from "@monitor/types";
import {
Component,
createEffect,
Match,
onCleanup,
Show,
Switch,
} from "solid-js";
import { createStore } from "solid-js/store";
import { ContainerStatus } from "@monitor/types";
import { Component, Match, Show, Switch } from "solid-js";
import { pushNotification } from "../..";
import {
DELETE_CONTAINER,
DEPLOY,
PULL_DEPLOYMENT,
START_CONTAINER,
STOP_CONTAINER,
} from "../../state/actions";
import { useAppState } from "../../state/StateProvider";
import { useUser } from "../../state/UserProvider";
import { getDeploymentActionState } from "../../util/query";
import ConfirmButton from "../util/ConfirmButton";
import Icon from "../util/icons/Icon";
import Flex from "../util/layout/Flex";
@@ -57,7 +49,7 @@ const Actions: Component<{}> = (p) => {
<ConfirmButton
color="green"
onConfirm={() => {
ws.send(DEPLOY, { deploymentID: deployment()._id });
ws.send(DEPLOY, { deploymentID: selected.id() });
pushNotification(
"ok",
`deploying ${deployment().name}...`
@@ -80,7 +72,7 @@ const Actions: Component<{}> = (p) => {
color="red"
onConfirm={() => {
ws.send(DELETE_CONTAINER, {
deploymentID: deployment()._id,
deploymentID: selected.id(),
});
pushNotification("ok", `removing container...`);
}}
@@ -214,6 +206,22 @@ const Actions: Component<{}> = (p) => {
</Flex>
</Match>
</Switch>
<Show when={deployment().repo}>
<Flex class="action shadow">
pull{" "}
<Show when={!actions.pulling}>
<ConfirmButton
color="blue"
onConfirm={() => {
ws.send(PULL_DEPLOYMENT, { deploymentID: selected.id() });
pushNotification("ok", `pulling ${deployment().name}...`);
}}
>
<Icon type="arrow-down" />
</ConfirmButton>
</Show>
</Flex>
</Show>
</Grid>
</Show>
);
frontend/src/state/actions.ts
+3 -2
View File
@@ -2,7 +2,7 @@
export const CREATE_BUILD = "CREATE_BUILD";
export const DELETE_BUILD = "DELETE_BUILD";
export const UPDATE_BUILD = "UPDATE_BUILD";
export const PULL = "PULL";
export const PULL_BUILD = "PULL_BUILD";
export const BUILD = "BUILD";
export const CLONE_BUILD_REPO = "CLONE_BUILD_REPO";
@@ -17,6 +17,7 @@ export const DELETE_CONTAINER = "DELETE_CONTAINER";
export const REFRESH_CONTAINER_STATUS = "REFRESH_CONTAINER_STATUS";
export const COPY_ENV = "COPY_ENV";
export const CLONE_DEPLOYMENT_REPO = "CLONE_DEPLOYMENT_REPO";
export const PULL_DEPLOYMENT = "PULL_DEPLOYMENT";
/* SERVER */
export const ADD_SERVER = "ADD_SERVER";
@@ -32,4 +33,4 @@ export const PRUNE_NETWORKS = "PRUNE_NETWORKS";
export const ADD_UPDATE = "ADD_UPDATE";
/* ALERT */
export const ALERT = "ALERT"
export const ALERT = "ALERT";
types/types.d.ts
Vendored
+1
View File
@@ -151,6 +151,7 @@ export type DeployActionState = {
stopping: boolean;
updating: boolean;
fullDeleting: boolean;
pulling: boolean;
};
export type ServerActionState = {
util/actions.ts
+2 -1
View File
@@ -2,9 +2,9 @@
export const CREATE_BUILD = "CREATE_BUILD";
export const DELETE_BUILD = "DELETE_BUILD";
export const UPDATE_BUILD = "UPDATE_BUILD";
export const PULL = "PULL";
export const BUILD = "BUILD";
export const CLONE_BUILD_REPO = "CLONE_BUILD_REPO";
export const PULL_BUILD = "PULL_BUILD";
/* DEPLOY */
export const CREATE_DEPLOYMENT = "CREATE_DEPLOYMENT";
@@ -17,6 +17,7 @@ export const DELETE_CONTAINER = "DELETE_CONTAINER";
export const REFRESH_CONTAINER_STATUS = "REFRESH_CONTAINER_STATUS";
export const COPY_ENV = "COPY_ENV";
export const CLONE_DEPLOYMENT_REPO = "CLONE_DEPLOYMENT_REPO";
export const PULL_DEPLOYMENT = "PULL_DEPLOYMENT";
/* SERVER */
export const ADD_SERVER = "ADD_SERVER";