0.2.0 cleanup

.vscode/tasks.json

@@ -92,15 +92,6 @@
 				"cwd": "${workspaceFolder}/lib/types"
 			}
 		},
-		{
-			"type": "cargo",
-			"command": "publish",
-			"args": ["--allow-dirty"],
-			"label": "publish monitor helpers",
-			"options": {
-				"cwd": "${workspaceFolder}/lib/helpers"
-			}
-		},
 		{
 			"type": "cargo",
 			"command": "publish",
@@ -109,14 +100,6 @@
 				"cwd": "${workspaceFolder}/lib/monitor_client"
 			}
 		},
-		{
-			"type": "cargo",
-			"command": "publish",
-			"label": "publish monitor periphery",
-			"options": {
-				"cwd": "${workspaceFolder}/periphery"
-			}
-		},
 		{
 			"type": "cargo",
 			"command": "publish",

Cargo.lock

@@ -743,7 +743,7 @@ dependencies = [
 
 [[package]]
 name = "core"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -760,7 +760,7 @@ dependencies = [
  "hmac",
  "jwt",
  "monitor_helpers",
- "monitor_types 0.1.16",
+ "monitor_types 0.2.0",
  "mungos",
  "periphery_client",
  "serde",
@@ -995,10 +995,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
 [[package]]
 name = "db_client"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
- "monitor_types 0.1.16",
+ "monitor_types 0.2.0",
  "mungos",
 ]
 
@@ -1838,7 +1838,7 @@ dependencies = [
 
 [[package]]
 name = "monitor_cli"
-version = "0.1.22"
+version = "0.1.23"
 dependencies = [
  "async_timing_util",
  "clap",
@@ -1854,12 +1854,12 @@ dependencies = [
 
 [[package]]
 name = "monitor_client"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "envy",
  "futures-util",
- "monitor_types 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "monitor_types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest",
  "serde",
  "serde_derive",
@@ -1871,7 +1871,7 @@ dependencies = [
 
 [[package]]
 name = "monitor_helpers"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -1881,7 +1881,7 @@ dependencies = [
  "bollard",
  "futures",
  "futures-util",
- "monitor_types 0.1.16",
+ "monitor_types 0.2.0",
  "periphery_client",
  "rand",
  "run_command",
@@ -1894,7 +1894,7 @@ dependencies = [
 
 [[package]]
 name = "monitor_periphery"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -1906,7 +1906,7 @@ dependencies = [
  "envy",
  "futures-util",
  "monitor_helpers",
- "monitor_types 0.1.16",
+ "monitor_types 0.2.0",
  "run_command",
  "serde",
  "serde_derive",
@@ -1920,7 +1920,7 @@ dependencies = [
 
 [[package]]
 name = "monitor_types"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "bollard",
@@ -1937,9 +1937,9 @@ dependencies = [
 
 [[package]]
 name = "monitor_types"
-version = "0.1.16"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4d1444216d1585f466d0591cedbdf84d1c810a4f45586362108219e7c943267"
+checksum = "62e9379ee43474ebac60b639f9094343b92cc9cbee55d8a447a65cd46305feee"
 dependencies = [
  "anyhow",
  "bollard",
@@ -2204,11 +2204,11 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "periphery_client"
-version = "0.1.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "futures-util",
- "monitor_types 0.1.16",
+ "monitor_types 0.2.0",
  "reqwest",
  "serde",
  "serde_json",
@@ -2893,9 +2893,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
 
 [[package]]
 name = "sysinfo"
-version = "0.27.7"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e"
+checksum = "727220a596b4ca0af040a07091e49f5c105ec8f2592674339a5bf35be592f76e"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",

Dockerfile.core

@@ -3,8 +3,8 @@ WORKDIR /builder
 
 COPY ./core ./core
 
-# COPY ./lib/types ./lib/types
-# COPY ./lib/helpers ./lib/helpers
+COPY ./lib/types ./lib/types
+COPY ./lib/helpers ./lib/helpers
 
 COPY ./lib/db_client ./lib/db_client
 COPY ./lib/periphery_client ./lib/periphery_client

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monitor_cli"
-version = "0.1.22"
+version = "0.1.23"
 edition = "2021"
 authors = ["MoghTech"]
 description = "monitor cli | tools to setup monitor system"

cli/src/types.rs

@@ -89,19 +89,31 @@ fn default_core_mongo_db_name() -> String {
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct AwsBuilderConfig {
+    #[serde(skip_serializing)]
     pub access_key_id: String,
+
+    #[serde(skip_serializing)]
     pub secret_access_key: String,
+
     pub default_ami_id: String,
     pub default_subnet_id: String,
     pub default_key_pair_name: String,
+
+    #[serde(default)]
+    pub available_ami_accounts: AvailableAmiAccounts,
+
     #[serde(default = "default_aws_region")]
     pub default_region: String,
+
     #[serde(default = "default_volume_gb")]
     pub default_volume_gb: i32,
+
     #[serde(default = "default_instance_type")]
     pub default_instance_type: String,
+
     #[serde(default)]
     pub default_security_group_ids: Vec<String>,
+
     #[serde(default)]
     pub default_assign_public_ip: bool,
 }
@@ -118,6 +130,17 @@ fn default_instance_type() -> String {
     String::from("m5.2xlarge")
 }
 
+pub type AvailableAmiAccounts = HashMap<String, AmiAccounts>; // (ami_id, AmiAccounts)
+
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
+pub struct AmiAccounts {
+    pub name: String,
+    #[serde(default)]
+    pub github: Vec<String>,
+    #[serde(default)]
+    pub docker: Vec<String>,
+}
+
 pub type GithubUsername = String;
 pub type GithubToken = String;
 pub type GithubAccounts = HashMap<GithubUsername, GithubToken>;

config_example/core.config.example.toml

@@ -43,6 +43,9 @@ default_subnet_id = "your_default_subnet_id"
 default_security_group_ids = ["sg_id_1", "sg_id_2"]
 default_assign_public_ip = false
 
+[aws.available_ami_accounts]
+your_periphery_ami = { name = "default ami", github = ["github_username"], docker = ["docker_username"] }
+
 [github_oauth]
 enabled = true
 id = "your_github_client_id"

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "core"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

core/src/actions/build.rs

@@ -158,15 +158,25 @@ impl State {
         mut new_build: Build,
         user: &RequestUser,
     ) -> anyhow::Result<Build> {
+        let start_ts = monitor_timestamp();
         let current_build = self
             .get_build_check_permissions(&new_build.id, user, PermissionLevel::Update)
             .await?;
-        let start_ts = monitor_timestamp();
+
+        if let Some(new_server_id) = &new_build.server_id {
+            if current_build.server_id.is_none()
+                || new_server_id != current_build.server_id.as_ref().unwrap()
+            {
+                self.get_server_check_permissions(new_server_id, user, PermissionLevel::Update)
+                    .await
+                    .context("user does not have permission to attach build to this server")?;
+            }
+        }
 
         // none of these should be changed through this method
         new_build.name = current_build.name.clone();
         new_build.permissions = current_build.permissions.clone();
-        new_build.last_built_at = String::new();
+        new_build.last_built_at = current_build.last_built_at.clone();
         new_build.created_at = current_build.created_at.clone();
         new_build.updated_at = start_ts.clone();
 
@@ -288,8 +298,8 @@ impl State {
                 self.update_update(update).await?;
                 return Err(e);
             }
-            let (server, aws_client, log) = res.unwrap();
-            update.logs.push(log);
+            let (server, aws_client, logs) = res.unwrap();
+            update.logs.extend(logs);
             self.update_update(update.clone()).await?;
             (server, aws_client)
         } else {
@@ -395,11 +405,11 @@ impl State {
     async fn create_ec2_instance_for_build(
         &self,
         build: &Build,
-    ) -> anyhow::Result<(Ec2Instance, Option<aws::Client>, Log)> {
+    ) -> anyhow::Result<(Ec2Instance, Option<aws::Client>, Vec<Log>)> {
         if build.aws_config.is_none() {
             return Err(anyhow!("build has no aws_config attached"));
         }
-        let start_ts = monitor_timestamp();
+        let start_instance_ts = monitor_timestamp();
         let aws_config = build.aws_config.as_ref().unwrap();
         let region = aws_config
             .region
@@ -454,26 +464,37 @@ impl State {
             assign_public_ip,
         )
         .await?;
+        let instance_id = &instance.instance_id;
+        let start_log = Log {
+            stage: "start build instance".to_string(),
+            success: true,
+            stdout: format!("instance id: {instance_id}\nami id: {ami_id}\ninstance type: {instance_type}\nvolume size: {volume_size_gb} GB\nsubnet id: {subnet_id}\nsecurity groups: {readable_sec_group_ids}"),
+            start_ts: start_instance_ts,
+            end_ts: monitor_timestamp(),
+            ..Default::default()
+        };
+        let start_connect_ts = monitor_timestamp();
         let mut res = Ok(String::new());
         for _ in 0..BUILDER_POLL_MAX_TRIES {
             let status = self.periphery.health_check(&instance.server).await;
             if let Ok(_) = status {
-                let instance_id = &instance.instance_id;
-                let log = Log {
-                    stage: "start build instance".to_string(),
+                let connect_log = Log {
+                    stage: "build instance connected".to_string(),
                     success: true,
-                    stdout: format!("instance id: {instance_id}\nami id: {ami_id}\ninstance type: {instance_type}\nvolume size: {volume_size_gb} GB\nsubnet id: {subnet_id}\nsecurity groups: {readable_sec_group_ids}"),
-                    start_ts,
+                    stdout: "established contact with periphery on builder".to_string(),
+                    start_ts: start_connect_ts,
                     end_ts: monitor_timestamp(),
                     ..Default::default()
                 };
-                return Ok((instance, Some(aws_client), log));
+                return Ok((instance, Some(aws_client), vec![start_log, connect_log]));
             }
             res = status;
             tokio::time::sleep(Duration::from_secs(BUILDER_POLL_RATE_SECS)).await;
         }
         let _ = terminate_ec2_instance(&aws_client, &instance.instance_id).await;
-        Err(anyhow!("unable to reach periphery agent on build server\n{res:#?}"))
+        Err(anyhow!(
+            "unable to reach periphery agent on build server\n{res:#?}"
+        ))
     }
 
     async fn terminate_ec2_instance(

core/src/api/build.rs

@@ -7,8 +7,8 @@ use axum::{
 use helpers::handle_anyhow_error;
 use mungos::{doc, Deserialize, Document, FindOptions, Serialize};
 use types::{
-    traits::Permissioned, Build, BuildActionState, BuildVersionsReponse, Operation,
-    PermissionLevel, UpdateStatus,
+    traits::Permissioned, AwsBuilderConfig, Build, BuildActionState, BuildVersionsReponse,
+    Operation, PermissionLevel, UpdateStatus,
 };
 use typeshare::typeshare;
 
@@ -208,6 +208,16 @@ pub fn router() -> Router {
                 },
             ),
         )
+        .route(
+            "/aws_builder_defaults",
+            get(|Extension(state): StateExtension| async move {
+                Json(AwsBuilderConfig {
+                    access_key_id: String::new(),
+                    secret_access_key: String::new(),
+                    ..state.config.aws.clone()
+                })
+            }),
+        )
 }
 
 impl State {

core/src/api/deployment.rs

@@ -8,10 +8,11 @@ use axum::{
 };
 use futures_util::future::join_all;
 use helpers::handle_anyhow_error;
-use mungos::{Deserialize, Document, Serialize};
+use mungos::{doc, options::FindOneOptions, Deserialize, Document, Serialize};
 use types::{
     traits::Permissioned, Deployment, DeploymentActionState, DeploymentWithContainerState,
-    DockerContainerState, DockerContainerStats, Log, PermissionLevel, Server,
+    DockerContainerState, DockerContainerStats, Log, Operation, PermissionLevel, Server,
+    UpdateStatus,
 };
 use typeshare::typeshare;
 
@@ -297,15 +298,29 @@ pub fn router() -> Router {
             get(
                 |Extension(state): StateExtension,
                  Extension(user): RequestUserExtension,
-                 Path(deployment_id): Path<DeploymentId>| async move {
+                 Path(DeploymentId { id })| async move {
                     let stats = state
-                        .get_deployment_container_stats(&deployment_id.id, &user)
+                        .get_deployment_container_stats(&id, &user)
                         .await
                         .map_err(handle_anyhow_error)?;
                     response!(Json(stats))
                 },
             ),
         )
+        .route(
+            "/:id/deployed_version",
+            get(
+                |Extension(state): StateExtension,
+                 Extension(user): RequestUserExtension,
+                 Path(DeploymentId { id })| async move {
+                    let version = state
+                        .get_deployment_deployed_version(&id, &user)
+                        .await
+                        .map_err(handle_anyhow_error)?;
+                    response!(version)
+                },
+            ),
+        )
 }
 
 impl State {
@@ -443,4 +458,53 @@ impl State {
             .await?;
         Ok(stats)
     }
+
+    async fn get_deployment_deployed_version(
+        &self,
+        id: &str,
+        user: &RequestUser,
+    ) -> anyhow::Result<String> {
+        let deployment = self
+            .get_deployment_check_permissions(&id, &user, PermissionLevel::Read)
+            .await?;
+        if deployment.build_id.is_some() {
+            let latest_deploy_update = self
+                .db
+                .updates
+                .find_one(
+                    doc! {
+                        "target": {
+                            "type": "Deployment",
+                            "id": id
+                        },
+                        "operation": Operation::DeployContainer.to_string(),
+                        "status": UpdateStatus::Complete.to_string(),
+                        "success": true,
+                    },
+                    FindOneOptions::builder().sort(doc! { "_id": -1 }).build(),
+                )
+                .await
+                .context("failed at query to get latest deploy update from mongo")?;
+            if let Some(update) = latest_deploy_update {
+                if let Some(version) = update.version {
+                    Ok(version.to_string())
+                } else {
+                    Ok("latest".to_string())
+                }
+            } else {
+                Ok("latest".to_string())
+            }
+        } else {
+            let split = deployment
+                .docker_run_args
+                .image
+                .split(':')
+                .collect::<Vec<&str>>();
+            if let Some(version) = split.get(1) {
+                Ok(version.to_string())
+            } else {
+                Ok("latest".to_string())
+            }
+        }
+    }
 }

core/src/api/permissions.rs

@@ -33,6 +33,13 @@ struct ModifyUserCreateServerBody {
     create_server_permissions: bool,
 }
 
+#[typeshare]
+#[derive(Serialize, Deserialize)]
+struct ModifyUserCreateBuildBody {
+    user_id: String,
+    create_build_permissions: bool,
+}
+
 pub fn router() -> Router {
     Router::new()
         .route(
@@ -62,6 +69,15 @@ pub fn router() -> Router {
                 response!(Json(update))
             }),
         )
+        .route(
+            "/modify_create_build",
+            post(|state, user, body| async {
+                let update = modify_user_create_build_permissions(state, user, body)
+                    .await
+                    .map_err(handle_anyhow_error)?;
+                response!(Json(update))
+            }),
+        )
 }
 
 async fn update_permissions(
@@ -309,3 +325,58 @@ async fn modify_user_create_server_permissions(
     update.id = state.add_update(update.clone()).await?;
     Ok(update)
 }
+
+async fn modify_user_create_build_permissions(
+    Extension(state): StateExtension,
+    Extension(user): RequestUserExtension,
+    Json(ModifyUserCreateBuildBody {
+        user_id,
+        create_build_permissions,
+    }): Json<ModifyUserCreateBuildBody>,
+) -> anyhow::Result<Update> {
+    if !user.is_admin {
+        return Err(anyhow!(
+            "user does not have permissions for this action (not admin)"
+        ));
+    }
+    let user = state
+        .db
+        .users
+        .find_one_by_id(&user_id)
+        .await
+        .context("failed at mongo query to find target user")?
+        .ok_or(anyhow!("did not find any user with user_id {user_id}"))?;
+    state
+        .db
+        .users
+        .update_one::<Document>(
+            &user_id,
+            mungos::Update::Set(doc! { "create_build_permissions": create_build_permissions }),
+        )
+        .await?;
+    let update_type = if create_build_permissions {
+        "enabled"
+    } else {
+        "disabled"
+    };
+    let ts = monitor_timestamp();
+    let mut update = Update {
+        target: UpdateTarget::System,
+        operation: Operation::ModifyUserCreateBuildPermissions,
+        logs: vec![Log::simple(
+            "modify user create build permissions",
+            format!(
+                "{update_type} create build permissions for {} (id: {})",
+                user.username, user.id
+            ),
+        )],
+        start_ts: ts.clone(),
+        end_ts: Some(ts),
+        status: UpdateStatus::Complete,
+        success: true,
+        operator: user.id.clone(),
+        ..Default::default()
+    };
+    update.id = state.add_update(update.clone()).await?;
+    Ok(update)
+}

frontend/src/components/CopyMenu.tsx

@@ -1,5 +1,5 @@
 import { useNavigate } from "@solidjs/router";
-import { Component, createSignal } from "solid-js";
+import { Component, createSignal, Show } from "solid-js";
 import { client, pushNotification } from "..";
 import { useAppState } from "../state/StateProvider";
 import { Build, Deployment } from "../types";
@@ -11,6 +11,7 @@ import Input from "./shared/Input";
 import Flex from "./shared/layout/Flex";
 import Grid from "./shared/layout/Grid";
 import CenterMenu from "./shared/menu/CenterMenu";
+import HoverMenu from "./shared/menu/HoverMenu";
 import Selector from "./shared/menu/Selector";
 
 const CopyMenu: Component<{
@@ -42,12 +43,11 @@ const CopyMenu: Component<{
       if (p.type === "build") {
         promise = client.copy_build(p.id, {
           name: newName(),
-          server_id: selectedId(),
         });
       } else {
         promise = client.copy_deployment(p.id, {
           name: newName(),
-          server_id: selectedId(),
+          server_id: selectedId()!,
         });
       }
       toggleShow();
@@ -59,45 +59,53 @@ const CopyMenu: Component<{
     }
   };
   return (
-    <CenterMenu
-      show={show}
-      toggleShow={toggleShow}
-      title={`copy ${p.type} | ${name()}`}
-      target={<Icon type="duplicate" />}
-      targetClass="blue"
-      content={() => (
-        <Grid placeItems="center">
-          <Flex alignItems="center">
-            <Input
-              placeholder="copy name"
-              class="card dark"
-              style={{ padding: "0.5rem" }}
-              value={newName()}
-              onEdit={setNewName}
-            />
-            <Selector
-              label="target: "
-              selected={selectedId()}
-              items={servers.ids()!}
-              onSelect={setSelected}
-              itemMap={(id) => servers.get(id)!.server.name}
-              targetClass="blue"
-              targetStyle={{ display: "flex", gap: "0.5rem" }}
-              searchStyle={{ width: "100%" }}
-							position="bottom right"
-              useSearch
-            />
-          </Flex>
-          <ConfirmButton
-            class="green"
-            style={{ width: "100%" }}
-            onConfirm={copy}
-          >
-            copy {p.type}
-          </ConfirmButton>
-        </Grid>
-      )}
-      position="center"
+    <HoverMenu
+      target={
+        <CenterMenu
+          show={show}
+          toggleShow={toggleShow}
+          title={`copy ${p.type} | ${name()}`}
+          target={<Icon type="duplicate" />}
+          targetClass="blue"
+          content={() => (
+            <Grid placeItems="center">
+              <Flex alignItems="center">
+                <Input
+                  placeholder="copy name"
+                  class="card dark"
+                  style={{ padding: "0.5rem" }}
+                  value={newName()}
+                  onEdit={setNewName}
+                />
+                <Show when={p.type === "deployment"}>
+                  <Selector
+                    label="target: "
+                    selected={selectedId()!}
+                    items={servers.ids()!}
+                    onSelect={setSelected}
+                    itemMap={(id) => servers.get(id)!.server.name}
+                    targetClass="blue"
+                    targetStyle={{ display: "flex", gap: "0.5rem" }}
+                    searchStyle={{ width: "100%" }}
+                    position="bottom right"
+                    useSearch
+                  />
+                </Show>
+              </Flex>
+              <ConfirmButton
+                class="green"
+                style={{ width: "100%" }}
+                onConfirm={copy}
+              >
+                copy {p.type}
+              </ConfirmButton>
+            </Grid>
+          )}
+          position="center"
+        />
+      }
+      content={`copy ${p.type}`}
+      position="bottom center"
     />
   );
 };

frontend/src/components/New.tsx

@@ -47,10 +47,10 @@ export const NewDeployment: Component<{ serverID: string }> = (p) => {
   );
 };
 
-export const NewBuild: Component<{ serverID: string }> = (p) => {
+export const NewBuild: Component<{}> = (p) => {
   const [showNew, toggleShowNew] = useToggle();
   const create = (name: string) => {
-    client.create_build({ name, server_id: p.serverID });
+    client.create_build({ name });
   };
   return (
     <Show

frontend/src/components/build/ActionStateProvider.tsx

@@ -11,31 +11,29 @@ type State = {
 
 const context = createContext<State>();
 
-export const ActionStateProvider: ParentComponent<{}> = (p) => {
+export const ActionStateProvider: ParentComponent<{ build_id: string }> = (p) => {
 	const { ws } = useAppState();
-  const params = useParams();
   const [actions, setActions] = createStore<BuildActionState>({
     building: false,
-	  recloning: false,
 	  updating: false,
   });
 	createEffect(() => {
-    client.get_build_action_state(params.id).then(setActions);
+    client.get_build_action_state(p.build_id).then(setActions);
   });
   onCleanup(
     ws.subscribe([Operation.BuildBuild], (update) => {
-      if (update.target.id === params.id) {
+      if (update.target.id === p.build_id) {
         setActions("building", update.status !== UpdateStatus.Complete);
       }
     })
   );
-  onCleanup(
-    ws.subscribe([Operation.RecloneBuild], (update) => {
-      if (update.target.id === params.id) {
-        setActions("recloning", update.status !== UpdateStatus.Complete);
-      }
-    })
-  );
+  // onCleanup(
+  //   ws.subscribe([Operation.RecloneBuild], (update) => {
+  //     if (update.target.id === params.id) {
+  //       setActions("recloning", update.status !== UpdateStatus.Complete);
+  //     }
+  //   })
+  // );
 	// onCleanup(
   //   ws.subscribe([DELETE_BUILD], ({ complete, buildID }) => {
   //     if (buildID === selected.id()) {

frontend/src/components/build/Actions.tsx

@@ -10,21 +10,21 @@ import { useActionStates } from "./ActionStateProvider";
 import { client } from "../..";
 import { combineClasses, getId } from "../../util/helpers";
 import { useParams } from "@solidjs/router";
-import { PermissionLevel, ServerStatus } from "../../types";
+import { PermissionLevel, ServerStatus, ServerWithStatus } from "../../types";
 
 const Actions: Component<{}> = (p) => {
   const { user } = useUser();
   const params = useParams() as { id: string };
   const { builds, servers } = useAppState();
   const build = () => builds.get(params.id)!;
-  const server = () => build() && servers.get(build()!.server_id);
+  const server = () => (build() && build().server_id) ? servers.get(build()!.server_id!) : undefined;
   const actions = useActionStates();
   const userCanExecute = () =>
     user().admin ||
     build().permissions![getId(user())] === PermissionLevel.Execute ||
     build().permissions![getId(user())] === PermissionLevel.Update;
   return (
-    <Show when={userCanExecute() && server()?.status === ServerStatus.Ok}>
+    <Show when={userCanExecute() && (server() ? server()?.status === ServerStatus.Ok : true)}>
       <Grid class={combineClasses("card shadow")} gridTemplateRows="auto 1fr">
         <h1>actions</h1>
         <Grid style={{ height: "fit-content" }}>
@@ -48,7 +48,7 @@ const Actions: Component<{}> = (p) => {
               </ConfirmButton>
             </Show>
           </Flex>
-          <Flex class={combineClasses("action shadow")}>
+          {/* <Flex class={combineClasses("action shadow")}>
             reclone{" "}
             <Show
               when={!actions.recloning}
@@ -67,7 +67,7 @@ const Actions: Component<{}> = (p) => {
                 <Icon type="reset" />
               </ConfirmButton>
             </Show>
-          </Flex>
+          </Flex> */}
         </Grid>
       </Grid>
     </Show>

frontend/src/components/build/Build.tsx

@@ -2,9 +2,7 @@ import { useNavigate, useParams } from "@solidjs/router";
 import { Component, createEffect, onCleanup, Show } from "solid-js";
 import { useAppDimensions } from "../../state/DimensionProvider";
 import { useAppState } from "../../state/StateProvider";
-import { useUser } from "../../state/UserProvider";
-import { Operation, PermissionLevel } from "../../types";
-import { combineClasses, getId } from "../../util/helpers";
+import { Operation } from "../../types";
 import NotFound from "../NotFound";
 import Grid from "../shared/layout/Grid";
 import Actions from "./Actions";
@@ -35,7 +33,7 @@ const Build: Component<{}> = (p) => {
   onCleanup(() => unsub);
   return (
     <Show when={build()} fallback={<NotFound type="build" />}>
-      <ActionStateProvider>
+      <ActionStateProvider build_id={params.id}>
         <Grid
           style={{
             width: "100%",

frontend/src/components/build/Header.tsx

@@ -27,7 +27,8 @@ const Header: Component<{}> = (p) => {
   const userCanUpdate = () =>
     user().admin ||
     build().permissions![getId(user())] === PermissionLevel.Update;
-  const server = () => servers.get(build().server_id);
+  const server = () =>
+    build().server_id ? servers.get(build().server_id!) : undefined;
   return (
     <>
       <Grid
@@ -69,13 +70,15 @@ const Header: Component<{}> = (p) => {
         </Flex>
         <Flex alignItems="center" justifyContent="space-between">
           <Flex alignItems="center">
-            <A
-              href={`/server/${build().server_id}`}
-              class="text-hover"
-              style={{ opacity: 0.7, padding: 0 }}
-            >
-              {server()?.server.name}
-            </A>
+            <Show when={server()} fallback={<div style={{ opacity: 0.7 }}>{build().aws_config ? "aws build" : ""}</div>}>
+              <A
+                href={`/server/${build().server_id}`}
+                class="text-hover"
+                style={{ opacity: 0.7, padding: 0 }}
+              >
+                {server()?.server.name}
+              </A>
+            </Show>
             <div style={{ opacity: 0.7 }}>build</div>
           </Flex>
           <div style={{ opacity: 0.7 }}>

frontend/src/components/build/tabs/Provider.tsx

@@ -45,7 +45,7 @@ export const ConfigProvider: ParentComponent<{}> = (p) => {
     set(...args);
     set("updated", true);
   };
-  const server = () => servers.get(builds.get(params.id)!.server_id);
+  const server = () => build.server_id ? servers.get(build.server_id) : undefined;
 
   const load = () => {
     // console.log("load build");
@@ -54,11 +54,11 @@ export const ConfigProvider: ParentComponent<{}> = (p) => {
         ...build,
         repo: build.repo,
         branch: build.branch,
-        on_clone: build.on_clone,
         pre_build: build.pre_build,
         docker_build_args: build.docker_build_args,
         docker_account: build.docker_account,
         github_account: build.github_account,
+        aws_config: build.aws_config,
         loaded: true,
         updated: false,
         saving: false,

frontend/src/components/build/tabs/Tabs.tsx

@@ -2,12 +2,10 @@ import { useParams } from "@solidjs/router";
 import { Component, Show } from "solid-js";
 import { useAppState } from "../../../state/StateProvider";
 import { useUser } from "../../../state/UserProvider";
-import { PermissionLevel } from "../../../types";
-import { getId } from "../../../util/helpers";
 import SimpleTabs from "../../shared/tabs/SimpleTabs";
 import { Tab } from "../../shared/tabs/Tabs";
-import BuildConfig from "./build-config/BuildConfig";
-import GitConfig from "./git-config/GitConfig";
+import BuilderConfig from "./builder/BuilderConfig";
+import BuildConfig from "./config/BuildConfig";
 import Owners from "./Permissions";
 import { ConfigProvider } from "./Provider";
 
@@ -24,12 +22,12 @@ const BuildTabs: Component<{}> = (p) => {
           tabs={
             [
               {
-                title: "repo",
-                element: () => <GitConfig />,
+                title: "config",
+                element: () => <BuildConfig />,
               },
               {
-                title: "build",
-                element: () => <BuildConfig />,
+                title: "builder",
+                element: () => <BuilderConfig />
               },
               user().admin && {
                 title: "collaborators",

frontend/src/components/build/tabs/builder/AwsBuilderConfig.tsx

@@ -0,0 +1,116 @@
+import { Component, Show } from "solid-js";
+import { useAppState } from "../../../../state/StateProvider";
+import Input from "../../../shared/Input";
+import Flex from "../../../shared/layout/Flex";
+import Selector from "../../../shared/menu/Selector";
+import { useConfig } from "../Provider";
+
+const AwsBuilderConfig: Component<{}> = (p) => {
+  const { build } = useConfig();
+  return (
+    <>
+      <Ami />
+      <InstanceType />
+      <VolumeSize />
+      <Show when={!build.updated}>
+        <div style={{ height: "4rem" }} />
+      </Show>
+    </>
+  );
+};
+
+const Ami: Component = () => {
+  const { aws_builder_config } = useAppState();
+  const { build, setBuild, userCanUpdate } = useConfig();
+  const get_ami_id = () => {
+    if (build.aws_config?.ami_id) {
+      return build.aws_config.ami_id;
+    } else {
+      return aws_builder_config()?.default_ami_id || "unknown";
+    }
+  };
+  const get_ami_name = (ami_id: string) => {
+    if (aws_builder_config() === undefined || ami_id === "unknown")
+      return "unknown";
+    return (
+      aws_builder_config()!.available_ami_accounts![ami_id]?.name || "unknown"
+    );
+  };
+  const ami_ids = () => {
+    if (aws_builder_config() === undefined) return [];
+    return Object.keys(aws_builder_config()!.available_ami_accounts!);
+  };
+  return (
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>ami</h1>
+      <Selector
+        targetClass="blue"
+        selected={get_ami_id()}
+        items={ami_ids()}
+        onSelect={(ami_id) => setBuild("aws_config", "ami_id", ami_id)}
+        itemMap={get_ami_name}
+        position="bottom right"
+        disabled={!userCanUpdate()}
+        useSearch
+      />
+    </Flex>
+  );
+};
+
+const InstanceType: Component = () => {
+  const { aws_builder_config } = useAppState();
+  const { build, setBuild, userCanUpdate } = useConfig();
+  return (
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>instance type</h1>
+      <Input
+        placeholder={aws_builder_config()?.default_instance_type}
+        value={build.aws_config?.instance_type}
+        onEdit={(instance_type) =>
+          setBuild("aws_config", "instance_type", instance_type)
+        }
+        disabled={!userCanUpdate()}
+      />
+    </Flex>
+  );
+};
+
+const VolumeSize: Component = () => {
+  const { aws_builder_config } = useAppState();
+  const { build, setBuild, userCanUpdate } = useConfig();
+  return (
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>volume size</h1>
+      <Flex gap="0.25rem" alignItems="center">
+        <Input
+          style={{ width: "4rem" }}
+          placeholder={aws_builder_config()?.default_volume_gb?.toString()}
+          value={
+            build.aws_config?.volume_gb
+              ? build.aws_config.volume_gb.toString()
+              : ""
+          }
+          onEdit={(volume_size) =>
+            setBuild("aws_config", "volume_gb", Number(volume_size))
+          }
+          disabled={!userCanUpdate()}
+        />
+        GB
+      </Flex>
+    </Flex>
+  );
+};
+
+export default AwsBuilderConfig;

frontend/src/components/build/tabs/builder/BuilderConfig.tsx

@@ -1,43 +1,27 @@
 import { Component, Show } from "solid-js";
-import { pushNotification, URL } from "../../../..";
-import { combineClasses, copyToClipboard, getId } from "../../../../util/helpers";
 import ConfirmButton from "../../../shared/ConfirmButton";
 import Icon from "../../../shared/Icon";
 import Flex from "../../../shared/layout/Flex";
 import Grid from "../../../shared/layout/Grid";
-import Loading from "../../../shared/loading/Loading";
 import { useConfig } from "../Provider";
-import Git from "./Git";
-import OnClone from "./OnClone";
+import Loading from "../../../shared/loading/Loading";
+import BuilderType from "./BuilderType";
+import BuilderServer from "./BuilderServer";
+import AwsBuilderConfig from "./AwsBuilderConfig";
 
-const GitConfig: Component<{}> = (p) => {
+const BuilderConfig: Component<{}> = (p) => {
   const { build, reset, save, userCanUpdate } = useConfig();
-  const listenerUrl = () => `${URL}/api/listener/build/${getId(build)}`;
   return (
     <Show when={build.loaded}>
       <Grid class="config">
         <Grid class="config-items scroller">
-          <Git />
-          <OnClone />
-          <Show when={userCanUpdate()}>
-            <Grid class={combineClasses("config-item shadow")}>
-              <h1>webhook url</h1>
-              <Flex justifyContent="space-between" alignItems="center">
-                <div class="ellipsis" style={{ width: "250px" }}>
-                  {listenerUrl()}
-                </div>
-                <ConfirmButton
-                  class="blue"
-                  onFirstClick={() => {
-                    copyToClipboard(listenerUrl());
-                    pushNotification("good", "copied url to clipboard");
-                  }}
-                  confirm={<Icon type="check" />}
-                >
-                  <Icon type="clipboard" />
-                </ConfirmButton>
-              </Flex>
-            </Grid>
+          <BuilderType />
+          <Show when={build.server_id}>
+            <BuilderServer />
+            <div style={{ height: "12rem" }} />
+          </Show>
+          <Show when={build.aws_config}>
+            <AwsBuilderConfig />
           </Show>
         </Grid>
         <Show when={userCanUpdate() && build.updated}>
@@ -66,4 +50,4 @@ const GitConfig: Component<{}> = (p) => {
   );
 };
 
-export default GitConfig;
+export default BuilderConfig;

frontend/src/components/build/tabs/builder/BuilderServer.tsx

@@ -0,0 +1,46 @@
+import { Component } from "solid-js";
+import { useAppState } from "../../../../state/StateProvider";
+import { PermissionLevel } from "../../../../types";
+import { getId } from "../../../../util/helpers";
+import Flex from "../../../shared/layout/Flex";
+import Grid from "../../../shared/layout/Grid";
+import Selector from "../../../shared/menu/Selector";
+import { useConfig } from "../Provider";
+
+const BuilderServer: Component<{}> = (p) => {
+  const { servers, getPermissionOnServer } = useAppState();
+	const { setBuild, server, userCanUpdate } = useConfig();
+  const availableServers = () => {
+    if (!servers.loaded()) return [];
+    return servers
+      .ids()!
+      .filter((id) => {
+        return getPermissionOnServer(id) === PermissionLevel.Update;
+      });
+  };
+  return (
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>builder server</h1>
+      <Selector
+        targetClass="blue"
+        selected={server()?.server ? getId(server()!.server) : "select server"}
+        items={availableServers()}
+        onSelect={(server_id) => setBuild("server_id", server_id)}
+        itemMap={(server_id) =>
+          server_id === "select server"
+            ? "select server"
+            : servers.get(server_id)!.server.name
+        }
+        disabled={!userCanUpdate()}
+        position="bottom right"
+        useSearch
+      />
+    </Flex>
+  );
+};
+
+export default BuilderServer;

frontend/src/components/build/tabs/builder/BuilderType.tsx

@@ -0,0 +1,52 @@
+import { Component, Show } from "solid-js";
+import { useAppState } from "../../../../state/StateProvider";
+import Flex from "../../../shared/layout/Flex";
+import Grid from "../../../shared/layout/Grid";
+import Selector from "../../../shared/menu/Selector";
+import { useConfig } from "../Provider";
+
+const BuilderType: Component<{}> = (p) => {
+	const { servers } = useAppState();
+  const { build, setBuild, userCanUpdate } = useConfig();
+  const builderType = () => {
+    if (build.server_id) {
+      return "server";
+    } else if (build.aws_config) {
+      return "aws";
+    } else {
+      return undefined;
+    }
+  };
+  return (
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>builder type</h1>
+      <Show when={userCanUpdate()} fallback={<h2>{builderType()}</h2>}>
+        <Selector 
+          targetClass="blue"
+          selected={builderType() || "select type"}
+          items={["aws", "server"]}
+          position="bottom right"
+          onSelect={(type) => {
+            if (type !== builderType()) {
+              if (type === "server") {
+                const server_id =
+                  servers.ids()?.length || 0 > 0
+                    ? servers.ids()![0]
+                    : undefined;
+                setBuild({ server_id, aws_config: undefined });
+              } else if (type === "aws") {
+                setBuild({ server_id: undefined, aws_config: {} });
+              }
+            }
+          }}
+        />
+      </Show>
+    </Flex>
+  );
+};
+
+export default BuilderType;

frontend/src/components/build/tabs/config/BuildArgs.tsx

@@ -1,12 +1,10 @@
 import { Component, createEffect, createSignal, Show } from "solid-js";
 import {
-  combineClasses,
   parseDotEnvToEnvVars,
   parseEnvVarseToDotEnv,
 } from "../../../../util/helpers";
 import { useToggle } from "../../../../util/hooks";
 import Flex from "../../../shared/layout/Flex";
-import Grid from "../../../shared/layout/Grid";
 import CenterMenu from "../../../shared/menu/CenterMenu";
 import TextArea from "../../../shared/TextArea";
 import { useConfig } from "../Provider";
@@ -14,24 +12,26 @@ import { useConfig } from "../Provider";
 const BuildArgs: Component<{}> = (p) => {
   const { build, userCanUpdate } = useConfig();
   return (
-    <Grid class={combineClasses("config-item shadow")}>
-      <Flex alignItems="center" justifyContent="space-between">
-        <h1>build args</h1>
-        <Flex alignItems="center" gap="0.2rem">
-          <Show
-            when={
-              !build.docker_build_args?.build_args ||
-              build.docker_build_args.build_args.length === 0
-            }
-          >
-            <div>none</div>
-          </Show>
-          <Show when={userCanUpdate()}>
-            <EditBuildArgs />
-          </Show>
-        </Flex>
+    <Flex
+      class="config-item shadow"
+      alignItems="center"
+      justifyContent="space-between"
+    >
+      <h1>build args</h1>
+      <Flex alignItems="center" gap="0.2rem">
+        <Show
+          when={
+            !build.docker_build_args?.build_args ||
+            build.docker_build_args.build_args.length === 0
+          }
+        >
+          <div>none</div>
+        </Show>
+        <Show when={userCanUpdate()}>
+          <EditBuildArgs />
+        </Show>
       </Flex>
-    </Grid>
+    </Flex>
   );
 };
 

frontend/src/components/build/tabs/config/BuildConfig.tsx

@@ -9,6 +9,8 @@ import { useConfig } from "../Provider";
 import Loading from "../../../shared/loading/Loading";
 import BuildArgs from "./BuildArgs";
 import Version from "./Version";
+import Repo from "./Repo";
+import ListenerUrl from "./ListenerUrl";
 
 const BuildConfig: Component<{}> = (p) => {
   const { build, reset, save, userCanUpdate } = useConfig();
@@ -17,9 +19,11 @@ const BuildConfig: Component<{}> = (p) => {
       <Grid class="config">
         <Grid class="config-items scroller">
           <Version />
+          <Repo />
           <Docker />
           <BuildArgs />
           <CliBuild />
+          <ListenerUrl />
         </Grid>
         <Show when={userCanUpdate() && build.updated}>
           <Show

frontend/src/components/build/tabs/config/Docker.tsx

@@ -10,15 +10,28 @@ import Selector from "../../../shared/menu/Selector";
 import { useConfig } from "../Provider";
 
 const Docker: Component<{}> = (p) => {
+  const { aws_builder_config } = useAppState();
   const { build, setBuild, server, userCanUpdate } = useConfig();
-  const [dockerAccounts, setDockerAccounts] = createSignal<string[]>();
+  const [peripheryDockerAccounts, setPeripheryDockerAccounts] =
+    createSignal<string[]>();
   createEffect(() => {
     if (server()?.status === ServerStatus.Ok) {
       client
-        .get_server_docker_accounts(build.server_id)
-        .then(setDockerAccounts);
+        .get_server_docker_accounts(build.server_id!)
+        .then(setPeripheryDockerAccounts);
     }
   });
+  const dockerAccounts = () => {
+    if (build.server_id) {
+      return peripheryDockerAccounts() || [];
+    } else if (build.aws_config) {
+      const ami_id =
+        build.aws_config?.ami_id || aws_builder_config()?.default_ami_id;
+      return ami_id
+        ? aws_builder_config()?.available_ami_accounts![ami_id].docker || []
+        : [];
+    } else return [];
+  };
   return (
     <Grid class={combineClasses("config-item shadow")}>
       <h1>docker build</h1> {/* checkbox here? */}
@@ -62,7 +75,7 @@ const Docker: Component<{}> = (p) => {
         <Selector
           targetClass="blue"
           selected={build.docker_account || "none"}
-          items={["none", ...dockerAccounts()!]}
+          items={["none", ...dockerAccounts()]}
           onSelect={(account) => {
             setBuild(
               "docker_account",

frontend/src/components/build/tabs/config/ListenerUrl.tsx

@@ -0,0 +1,37 @@
+import { Component, Show } from "solid-js";
+import { pushNotification, URL } from "../../../..";
+import { copyToClipboard, getId } from "../../../../util/helpers";
+import ConfirmButton from "../../../shared/ConfirmButton";
+import Icon from "../../../shared/Icon";
+import Flex from "../../../shared/layout/Flex";
+import Grid from "../../../shared/layout/Grid";
+import { useConfig } from "../Provider";
+
+const ListenerUrl: Component<{}> = (p) => {
+	const { build, userCanUpdate } = useConfig();
+  const listenerUrl = () => `${URL}/api/listener/build/${getId(build)}`;
+	return (
+    <Show when={userCanUpdate()}>
+      <Grid class="config-item shadow">
+        <h1>webhook url</h1>
+        <Flex justifyContent="space-between" alignItems="center">
+          <div class="ellipsis" style={{ width: "250px" }}>
+            {listenerUrl()}
+          </div>
+          <ConfirmButton
+            class="blue"
+            onFirstClick={() => {
+              copyToClipboard(listenerUrl());
+              pushNotification("good", "copied url to clipboard");
+            }}
+            confirm={<Icon type="check" />}
+          >
+            <Icon type="clipboard" />
+          </ConfirmButton>
+        </Flex>
+      </Grid>
+    </Show>
+  );
+}
+
+export default ListenerUrl;

frontend/src/components/build/tabs/config/Repo.tsx

@@ -0,0 +1,90 @@
+import { Component, createEffect, createSignal, Show } from "solid-js";
+import Grid from "../../../shared/layout/Grid";
+import { useConfig } from "../Provider";
+import Flex from "../../../shared/layout/Flex";
+import Input from "../../../shared/Input";
+import { combineClasses } from "../../../../util/helpers";
+import { useAppState } from "../../../../state/StateProvider";
+import { client } from "../../../..";
+import { ServerStatus } from "../../../../types";
+import Selector from "../../../shared/menu/Selector";
+
+const Repo: Component<{}> = (p) => {
+  const { aws_builder_config } = useAppState();
+  const { build, setBuild, server, userCanUpdate } = useConfig();
+  const [peripheryGithubAccounts, setPeripheryGithubAccounts] =
+    createSignal<string[]>();
+  createEffect(() => {
+    if (server()?.status === ServerStatus.Ok) {
+      client
+        .get_server_github_accounts(build.server_id!)
+        .then(setPeripheryGithubAccounts);
+    }
+  });
+  const githubAccounts = () => {
+    if (build.server_id) {
+      return peripheryGithubAccounts() || [];
+    } else if (build.aws_config) {
+      const ami_id =
+        build.aws_config?.ami_id || aws_builder_config()?.default_ami_id;
+      return ami_id
+        ? aws_builder_config()?.available_ami_accounts![ami_id].github || []
+        : [];
+    } else return [];
+  };
+  return (
+    <Grid class={combineClasses("config-item shadow")}>
+      <h1>repo config</h1>
+      <Flex
+        justifyContent={userCanUpdate() ? "space-between" : undefined}
+        alignItems="center"
+        style={{ "flex-wrap": "wrap" }}
+      >
+        <h2>repo: </h2>
+        <Input
+          placeholder="ie. solidjs/solid"
+          value={build.repo || ""}
+          onEdit={(value) => setBuild("repo", value)}
+          disabled={!userCanUpdate()}
+        />
+      </Flex>
+      <Flex
+        justifyContent={userCanUpdate() ? "space-between" : undefined}
+        alignItems="center"
+        style={{ "flex-wrap": "wrap" }}
+      >
+        <h2>branch: </h2>
+        <Input
+          placeholder="defaults to main"
+          value={build.branch || (userCanUpdate() ? "" : "main")}
+          onEdit={(value) => setBuild("branch", value)}
+          disabled={!userCanUpdate()}
+        />
+      </Flex>
+      <Show when={githubAccounts()}>
+        <Flex
+          justifyContent={userCanUpdate() ? "space-between" : undefined}
+          alignItems="center"
+          style={{ "flex-wrap": "wrap" }}
+        >
+          <h2>github account: </h2>
+          <Selector
+            targetClass="blue"
+            selected={build.github_account || "none"}
+            items={["none", ...githubAccounts()]}
+            onSelect={(account) => {
+              setBuild(
+                "github_account",
+                account === "none" ? undefined : account
+              );
+            }}
+            position="bottom right"
+            disabled={!userCanUpdate()}
+          />
+        </Flex>
+      </Show>
+    </Grid>
+  );
+};
+
+export default Repo;

frontend/src/components/build/tabs/git-config/Git.tsx

@@ -1,72 +0,0 @@
-import { Component, createEffect, createSignal } from "solid-js";
-import Grid from "../../../shared/layout/Grid";
-import { useConfig } from "../Provider";
-import Flex from "../../../shared/layout/Flex";
-import Input from "../../../shared/Input";
-import Selector from "../../../shared/menu/Selector";
-import { combineClasses } from "../../../../util/helpers";
-import { client } from "../../../..";
-import { ServerStatus } from "../../../../types";
-
-const Git: Component<{}> = (p) => {
-  const { build, setBuild, server, userCanUpdate } = useConfig();
-  const [githubAccounts, setGithubAccounts] = createSignal<string[]>();
-  createEffect(() => {
-    if (server()?.status === ServerStatus.Ok) {
-      client.get_server_github_accounts(build.server_id).then(setGithubAccounts);
-    }
-  });
-  return (
-    <Grid class={combineClasses("config-item shadow")}>
-      <h1>github config</h1>
-      <Flex
-        justifyContent={userCanUpdate() ? "space-between" : undefined}
-        alignItems="center"
-        style={{ "flex-wrap": "wrap" }}
-      >
-        <h2>repo: </h2>
-        <Input
-          placeholder="ie. solidjs/solid"
-          value={build.repo || ""}
-          onEdit={(value) => setBuild("repo", value)}
-          disabled={!userCanUpdate()}
-        />
-      </Flex>
-      <Flex
-        justifyContent={userCanUpdate() ? "space-between" : undefined}
-        alignItems="center"
-        style={{ "flex-wrap": "wrap" }}
-      >
-        <h2>branch: </h2>
-        <Input
-          placeholder="defaults to main"
-          value={build.branch || (userCanUpdate() ? "" : "main")}
-          onEdit={(value) => setBuild("branch", value)}
-          disabled={!userCanUpdate()}
-        />
-      </Flex>
-      <Flex
-        justifyContent={userCanUpdate() ? "space-between" : undefined}
-        alignItems="center"
-        style={{ "flex-wrap": "wrap" }}
-      >
-        <h2>github account: </h2>
-        <Selector
-          targetClass="blue"
-          selected={build.github_account || "none"}
-          items={["none", ...githubAccounts()!]}
-          onSelect={(account) => {
-            setBuild(
-              "github_account",
-              account === "none" ? undefined : account
-            );
-          }}
-          position="bottom right"
-          disabled={!userCanUpdate()}
-        />
-      </Flex>
-    </Grid>
-  );
-};
-
-export default Git;

frontend/src/components/build/tabs/git-config/OnClone.tsx

@@ -1,63 +0,0 @@
-import { Component } from "solid-js";
-import { combineClasses } from "../../../../util/helpers";
-import Input from "../../../shared/Input";
-import Grid from "../../../shared/layout/Grid";
-import { useConfig } from "../Provider";
-import Flex from "../../../shared/layout/Flex";
-
-const OnClone: Component = () => {
-  const { build, setBuild, userCanUpdate } = useConfig();
-  return (
-    <Grid class={combineClasses("config-item shadow")}>
-      <h1>on clone</h1>
-      <Flex
-        alignItems="center"
-        justifyContent={userCanUpdate() ? "space-between" : undefined}
-        style={{ "flex-wrap": "wrap" }}
-      >
-        <h2>path:</h2>
-        <Input
-          placeholder="relative to repo"
-          value={build.on_clone?.path || ""}
-          onEdit={(path) => {
-            if (
-              path.length === 0 &&
-              (!build.on_clone ||
-                !build.on_clone.command ||
-                build.on_clone.command.length === 0)
-            ) {
-              setBuild("on_clone", undefined);
-            }
-            setBuild("on_clone", { path });
-          }}
-          disabled={!userCanUpdate()}
-        />
-      </Flex>
-      <Flex
-        alignItems="center"
-        justifyContent={userCanUpdate() ? "space-between" : undefined}
-        style={{ "flex-wrap": "wrap" }}
-      >
-        <h2>command:</h2>
-        <Input
-          placeholder="command"
-          value={build.on_clone?.command || ""}
-          onEdit={(command) => {
-            if (
-              command.length === 0 &&
-              (!build.on_clone ||
-                !build.on_clone.path ||
-                build.on_clone.path.length === 0)
-            ) {
-              setBuild("on_clone", undefined);
-            }
-            setBuild("on_clone", { command });
-          }}
-          disabled={!userCanUpdate()}
-        />
-      </Flex>
-    </Grid>
-  );
-};
-
-export default OnClone;

frontend/src/components/deployment/Header.tsx

@@ -1,10 +1,11 @@
-import { Component, Show } from "solid-js";
+import { Component, createResource, Show } from "solid-js";
 import { useAppState } from "../../state/StateProvider";
 import { useUser } from "../../state/UserProvider";
 import {
   combineClasses,
   deploymentHeaderStateClass,
   getId,
+  readableVersion,
 } from "../../util/helpers";
 import Icon from "../shared/Icon";
 import Flex from "../shared/layout/Flex";
@@ -20,7 +21,7 @@ import CopyMenu from "../CopyMenu";
 import ConfirmMenuButton from "../shared/ConfirmMenuButton";
 
 const Header: Component<{}> = (p) => {
-  const { deployments, servers } = useAppState();
+  const { deployments, servers, builds } = useAppState();
   const params = useParams();
   const deployment = () => deployments.get(params.id)!;
   const { user } = useUser();
@@ -37,6 +38,27 @@ const Header: Component<{}> = (p) => {
     deployment().deployment.permissions![getId(user())] ===
       PermissionLevel.Update;
   const server = () => servers.get(deployment().deployment.server_id);
+  const [deployed_version] = createResource(() =>
+    client.get_deployment_deployed_version(params.id)
+  );
+  const image = () => {
+    if (deployment().deployment.build_id) {
+      const build = builds.get(deployment().deployment.build_id!)!;
+      if (deployment().state === DockerContainerState.NotDeployed) {
+        const version = deployment().deployment.build_version
+          ? readableVersion(deployment().deployment.build_version!).replaceAll(
+              "v",
+              ""
+            )
+          : "latest";
+        return `${build.name}:${version}`;
+      } else {
+        return deployed_version() && `${build.name}:${deployed_version()}`;
+      }
+    } else {
+      return deployment().deployment.docker_run_args.image || "unknown";
+    }
+  };
   return (
     <>
       <Grid
@@ -52,7 +74,10 @@ const Header: Component<{}> = (p) => {
         }}
       >
         <Flex alignItems="center" justifyContent="space-between">
-          <h1>{deployment()!.deployment.name}</h1>
+          <Flex alignItems="center">
+            <h1>{deployment()!.deployment.name}</h1>
+            <div style={{ opacity: 0.7 }}>{image()}</div>
+          </Flex>
           <Show when={userCanUpdate()}>
             <Flex alignItems="center">
               <CopyMenu type="deployment" id={params.id} />

frontend/src/components/deployment/tabs/config/Config.tsx

@@ -49,9 +49,9 @@ const Config: Component<{}> = () => {
                     </Show>
                     <Network />
                     <Restart />
+                    <Env />
                     <Ports />
                     <Mounts />
-                    <Env />
                     <ExtraArgs />
                     <PostImage />
                     <Show when={isMobile()}>

frontend/src/components/deployment/tabs/config/container/Env.tsx

@@ -17,7 +17,7 @@ const Env: Component<{}> = (p) => {
     <Grid class={combineClasses("config-item shadow")}>
       <Flex alignItems="center" justifyContent="space-between">
         <h1>environment</h1>
-        <Flex alignItems="center" gap="0.2rem">
+        <Flex alignItems="center">
           <Show
             when={
               !deployment.docker_run_args.environment ||

frontend/src/components/deployment/tabs/config/container/ExtraArgs.tsx

@@ -22,21 +22,11 @@ const ExtraArgs: Component<{}> = (p) => {
     <Grid class="config-item shadow">
       <Flex justifyContent="space-between" alignItems="center">
         <h1>extra args</h1>
-        <Flex alignItems="center">
-          <Show
-            when={
-              !deployment.docker_run_args.extra_args ||
-              deployment.docker_run_args.extra_args.length === 0
-            }
-          >
-            <div>none</div>
-          </Show>
-          <Show when={userCanUpdate()}>
-            <button class="green" onClick={onAdd}>
-              <Icon type="plus" />
-            </button>
-          </Show>
-        </Flex>
+        <Show when={userCanUpdate()}>
+          <button class="green" onClick={onAdd}>
+            <Icon type="plus" />
+          </button>
+        </Show>
       </Flex>
       <For each={[...deployment.docker_run_args.extra_args!.keys()]}>
         {(_, index) => (

frontend/src/components/deployment/tabs/config/container/Network.tsx

@@ -20,6 +20,7 @@ const Network: Component<{}> = (p) => {
         onSelect={(network) => setDeployment("docker_run_args", { network })}
         position="bottom right"
         disabled={!userCanUpdate()}
+        searchStyle={{ width: "100%", "min-width": "12rem" }}
         useSearch
       />
     </Flex>

frontend/src/components/deployment/tabs/config/container/Volumes.tsx

@@ -23,21 +23,11 @@ const Volumes: Component<{}> = (p) => {
     <Grid class={combineClasses("config-item shadow")}>
       <Flex justifyContent="space-between" alignItems="center">
         <h1>volumes</h1>
-        <Flex alignItems="center">
-          <Show
-            when={
-              !deployment.docker_run_args.volumes ||
-              deployment.docker_run_args.volumes.length === 0
-            }
-          >
-            <div>none</div>
-          </Show>
-          <Show when={userCanUpdate()}>
-            <button class="green" onClick={onAdd}>
-              <Icon type="plus" />
-            </button>
-          </Show>
-        </Flex>
+        <Show when={userCanUpdate()}>
+          <button class="green" onClick={onAdd}>
+            <Icon type="plus" />
+          </button>
+        </Show>
       </Flex>
       <For each={deployment.docker_run_args.volumes}>
         {({ local, container }, index) => (

frontend/src/components/deployment/tabs/log/Log.tsx

@@ -70,7 +70,7 @@ const Log: Component<{
   const buffer = useBuffer(scrolled, 250);
   const [poll, togglePoll] = useLocalStorageToggle(
     "deployment-log-polling",
-    true
+    false
   );
   clearInterval(interval);
   interval = setInterval(() => {

frontend/src/components/home/Home.tsx

@@ -6,6 +6,7 @@ import { useAppState } from "../../state/StateProvider";
 import Grid from "../shared/layout/Grid";
 import SimpleTabs from "../shared/tabs/SimpleTabs";
 import Summary from "./Summary";
+import Builds from "./Tree/Builds";
 import Groups from "./Tree/Groups";
 import { TreeProvider } from "./Tree/Provider";
 import Servers from "./Tree/Servers";
@@ -36,6 +37,10 @@ const Home: Component<{}> = (p) => {
               title: "servers",
               element: () => <Servers serverIDs={servers.ids()!} showAdd />,
             },
+            {
+              title: "builds",
+              element: () => <Builds />
+            }
           ]}
         />
       </TreeProvider>

frontend/src/components/home/Tree/Builds.tsx

@@ -0,0 +1,171 @@
+import { A } from "@solidjs/router";
+import { Component, createMemo, createSignal, For, Show } from "solid-js";
+import { client } from "../../..";
+import { useAppDimensions } from "../../../state/DimensionProvider";
+import { useAppState } from "../../../state/StateProvider";
+import { useUser } from "../../../state/UserProvider";
+import { PermissionLevel } from "../../../types";
+import { getId, readableMonitorTimestamp } from "../../../util/helpers";
+import {
+  ActionStateProvider,
+  useActionStates,
+} from "../../build/ActionStateProvider";
+import { NewBuild } from "../../New";
+import ConfirmButton from "../../shared/ConfirmButton";
+import Icon from "../../shared/Icon";
+import Input from "../../shared/Input";
+import Flex from "../../shared/layout/Flex";
+import Grid from "../../shared/layout/Grid";
+import Loading from "../../shared/loading/Loading";
+import Selector from "../../shared/menu/Selector";
+import { TreeSortType, TREE_SORTS, useTreeState } from "./Provider";
+
+const Builds: Component<{}> = (p) => {
+  const { user } = useUser();
+  const { builds } = useAppState();
+  const { sort, setSort, build_sorter } = useTreeState();
+  const [buildFilter, setBuildFilter] = createSignal("");
+  const buildIDs = createMemo(() => {
+    if (builds.loaded()) {
+      const filters = buildFilter()
+        .split(" ")
+        .filter((term) => term.length > 0)
+        .map((term) => term.toLowerCase());
+      return builds
+        .ids()!
+        .filter((id) => {
+          const name = builds.get(id)!.name;
+          for (const term of filters) {
+            if (!name.includes(term)) {
+              return false;
+            }
+          }
+          return true;
+        })
+        .sort(build_sorter());
+    } else {
+      return undefined;
+    }
+  });
+  return (
+    <Grid>
+      <Grid gridTemplateColumns="1fr auto auto">
+        <Input
+          placeholder="filter builds"
+          value={buildFilter()}
+          onEdit={setBuildFilter}
+          style={{ width: "100%", padding: "0.5rem" }}
+        />
+        <Selector
+          selected={sort()}
+          items={TREE_SORTS as any as string[]}
+          onSelect={(mode) => setSort(mode as TreeSortType)}
+          position="bottom right"
+          targetClass="blue"
+          targetStyle={{ height: "100%" }}
+          containerStyle={{ height: "100%" }}
+        />
+        <Show when={user().admin || user().create_build_permissions}>
+          <NewBuild />
+        </Show>
+      </Grid>
+      <For each={buildIDs()}>
+        {(id) => (
+          <ActionStateProvider build_id={id}>
+            <Build id={id} />
+          </ActionStateProvider>
+        )}
+      </For>
+    </Grid>
+  );
+};
+
+const Build: Component<{ id: string }> = (p) => {
+  const { isMobile } = useAppDimensions();
+  const { user } = useUser();
+  const { builds, servers } = useAppState();
+  const build = () => builds.get(p.id)!;
+  const server = () =>
+    build().server_id ? servers.get(build().server_id!) : undefined;
+  const version = () => {
+    return `v${build().version.major}.${build().version.minor}.${
+      build().version.patch
+    }`;
+  };
+  const lastBuiltAt = () => {
+    if (
+      build().last_built_at === undefined ||
+      build().last_built_at?.length === 0 ||
+      build().last_built_at === "never"
+    ) {
+      return "not built";
+    } else {
+      return readableMonitorTimestamp(build().last_built_at!);
+    }
+  };
+  const actions = useActionStates();
+  const userCanExecute = () =>
+    user().admin ||
+    build().permissions![getId(user())] === PermissionLevel.Execute ||
+    build().permissions![getId(user())] === PermissionLevel.Update;
+  const isAwsBuild = () => build().aws_config ? true : false;
+  return (
+    <A
+      href={`/build/${p.id}`}
+      class="card light shadow"
+      style={{
+        width: "100%",
+        height: "fit-content",
+        "box-sizing": "border-box",
+        "justify-content": "space-between",
+        padding: "0.5rem",
+      }}
+    >
+      <h1 style={{ "font-size": "1.25rem" }}>{build().name}</h1>
+      <Flex alignItems="center">
+        <Show when={server()}>
+          <A
+            href={`/server/${build().server_id!}`}
+            style={{ padding: 0, opacity: 0.7 }}
+          >
+            <div class="text-hover">{server()?.server.name}</div>
+          </A>
+        </Show>
+        <Show when={isAwsBuild()}>
+          <div style={{ opacity: 0.7 }}>aws build</div>
+        </Show>
+        <h2>{version()}</h2>
+        <Show when={!isMobile()}>
+          <div style={{ opacity: 0.7 }}>{lastBuiltAt()}</div>
+        </Show>
+        <Show when={userCanExecute()}>
+          <Show
+            when={!actions.building}
+            fallback={
+              <button
+                class="green"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  e.preventDefault();
+                }}
+              >
+                <Loading type="spinner" />
+              </button>
+            }
+          >
+            <ConfirmButton
+              class="green"
+              onConfirm={() => {
+                client.build(p.id);
+              }}
+            >
+              <Icon type="build" width="0.9rem" />
+            </ConfirmButton>
+          </Show>
+        </Show>
+      </Flex>
+    </A>
+  );
+};
+
+export default Builds;

frontend/src/components/home/Tree/Provider.tsx

@@ -6,7 +6,7 @@ export const TREE_SORTS = ["name", "created"] as const;
 export type TreeSortType = typeof TREE_SORTS[number];
 
 const value = () => {
-	const { servers, groups } = useAppState();
+	const { servers, groups, builds } = useAppState();
 	const [sort, setSort] = useLocalStorage<TreeSortType>(
     TREE_SORTS[0],
     "home-sort-v1"
@@ -29,7 +29,7 @@ const value = () => {
     }
   };
 	const group_sorter = () => {
-    if (!groups.loaded) return () => 0;
+    if (!groups.loaded()) return () => 0;
     if (sort() === "name") {
       return (a: string, b: string) => {
         const ga = groups.get(a)!;
@@ -44,12 +44,30 @@ const value = () => {
     } else {
       return () => 0;
     }
+  };
+  const build_sorter = () => {
+    if (!builds.loaded()) return () => 0;
+    if (sort() === "name") {
+      return (a: string, b: string) => {
+        const ba = builds.get(a)!;
+        const bb = builds.get(b)!;
+        if (ba.name < bb.name) {
+          return -1;
+        } else if (ba.name > bb.name) {
+          return 1;
+        }
+        return 0;
+      };
+    } else {
+      return () => 0;
+    }
   };
 	return {
     sort,
 		setSort,
 		server_sorter,
 		group_sorter,
+    build_sorter
 	};
 }
 

frontend/src/components/server_children/Deployment.tsx

@@ -1,23 +1,50 @@
 import { A } from "@solidjs/router";
-import { Component, Show } from "solid-js";
+import { Component, createResource, Show } from "solid-js";
+import { client } from "../..";
 import { useAppState } from "../../state/StateProvider";
-import { combineClasses, deploymentStateClass, getId } from "../../util/helpers";
+import { DockerContainerState } from "../../types";
+import {
+  combineClasses,
+  deploymentStateClass,
+  getId,
+  readableVersion,
+} from "../../util/helpers";
 import Circle from "../shared/Circle";
 import Flex from "../shared/layout/Flex";
+import Grid from "../shared/layout/Grid";
 import s from "./serverchildren.module.scss";
 
 const Deployment: Component<{ id: string }> = (p) => {
-  const { deployments } = useAppState();
+  const { deployments, builds } = useAppState();
   const deployment = () => deployments.get(p.id)!;
+  const [deployed_version] = createResource(() =>
+    client.get_deployment_deployed_version(p.id)
+  );
+  const image = () => {
+    if (deployment().deployment.build_id) {
+      const build = builds.get(deployment().deployment.build_id!)!;
+      if (deployment().state === DockerContainerState.NotDeployed) {
+        const version = deployment().deployment.build_version
+          ? readableVersion(deployment().deployment.build_version!).replaceAll(
+              "v",
+              ""
+            )
+          : "latest";
+        return `${build.name}:${version}`;
+      } else {
+        return deployed_version() && `${build.name}:${deployed_version()}`;
+      }
+    } else {
+      return deployment().deployment.docker_run_args.image || "unknown";
+    }
+  };
   return (
     <Show when={deployment()}>
-      <A
-        href={`/deployment/${p.id}`}
-        class={combineClasses(
-          s.DropdownItem,
-        )}
-      >
-        <h2>{deployment().deployment.name}</h2>
+      <A href={`/deployment/${p.id}`} class={combineClasses(s.DropdownItem)}>
+        <Grid gap="0">
+          <h2>{deployment().deployment.name}</h2>
+          <div style={{ opacity: 0.7 }}>{image()}</div>
+        </Grid>
         <Flex alignItems="center">
           <div style={{ opacity: 0.7 }}>{deployments.status(p.id)}</div>
           <Circle

frontend/src/components/server_children/ServerChildren.tsx

@@ -6,15 +6,14 @@ import SimpleTabs from "../shared/tabs/SimpleTabs";
 import s from "./serverchildren.module.scss";
 import { useUser } from "../../state/UserProvider";
 import { PermissionLevel } from "../../types";
-import { NewBuild, NewDeployment } from "../New";
+import { NewDeployment } from "../New";
 import Deployment from "./Deployment";
-import Build from "./Build";
 import { useAppState } from "../../state/StateProvider";
 
 const ServerChildren: Component<{ id: string }> = (p) => {
   const { user } = useUser();
   const { isSemiMobile } = useAppDimensions();
-  const { servers, deployments, builds } = useAppState();
+  const { servers, deployments } = useAppState();
   const server = () => servers.get(p.id);
   const deploymentIDs = createMemo(() => {
     return (deployments.loaded() &&
@@ -24,61 +23,79 @@ const ServerChildren: Component<{ id: string }> = (p) => {
           (id) => deployments.get(id)?.deployment.server_id === p.id
         )) as string[];
   });
-  const buildIDs = createMemo(() => {
-    return (builds.loaded() &&
-      builds
-        .ids()!
-        .filter((id) => builds.get(id)?.server_id === p.id)) as string[];
-  });
+  // const buildIDs = createMemo(() => {
+  //   return (builds.loaded() &&
+  //     builds
+  //       .ids()!
+  //       .filter((id) => builds.get(id)?.server_id === p.id)) as string[];
+  // });
   return (
-    <SimpleTabs
-      containerClass="card shadow"
-      localStorageKey={`${p.id}-home-tab`}
-      tabs={[
-        {
-          title: "deployments",
-          element: () => (
-            <Grid
-              gap=".5rem"
-              class={combineClasses(s.Deployments)}
-              gridTemplateColumns={isSemiMobile() ? "1fr" : "1fr 1fr"}
-            >
-              <For each={deploymentIDs()}>{(id) => <Deployment id={id} />}</For>
-              <Show
-                when={
-                  user().admin ||
-                  server()?.server.permissions![getId(user())] ===
-                    PermissionLevel.Update
-                }
-              >
-                <NewDeployment serverID={p.id} />
-              </Show>
-            </Grid>
-          ),
-        },
-        {
-          title: "builds",
-          element: () => (
-            <Grid
-              gap=".5rem"
-              class={combineClasses(s.Deployments)}
-              gridTemplateColumns={isSemiMobile() ? "1fr" : "1fr 1fr"}
-            >
-              <For each={buildIDs()}>{(id) => <Build id={id} />}</For>
-              <Show
-                when={
-                  user().admin ||
-                  server()?.server.permissions![getId(user())] ===
-                    PermissionLevel.Update
-                }
-              >
-                <NewBuild serverID={p.id} />
-              </Show>
-            </Grid>
-          ),
-        },
-      ]}
-    />
+    <div class="card shadow">
+      <Grid
+        gap=".5rem"
+        class={combineClasses(s.Deployments)}
+        gridTemplateColumns={isSemiMobile() ? "1fr" : "1fr 1fr"}
+      >
+        <For each={deploymentIDs()}>{(id) => <Deployment id={id} />}</For>
+        <Show
+          when={
+            user().admin ||
+            server()?.server.permissions![getId(user())] ===
+              PermissionLevel.Update
+          }
+        >
+          <NewDeployment serverID={p.id} />
+        </Show>
+      </Grid>
+    </div>
+    // <SimpleTabs
+    //   containerClass="card shadow"
+    //   localStorageKey={`${p.id}-home-tab`}
+    //   tabs={[
+    //     {
+    //       title: "deployments",
+    //       element: () => (
+    //         <Grid
+    //           gap=".5rem"
+    //           class={combineClasses(s.Deployments)}
+    //           gridTemplateColumns={isSemiMobile() ? "1fr" : "1fr 1fr"}
+    //         >
+    //           <For each={deploymentIDs()}>{(id) => <Deployment id={id} />}</For>
+    //           <Show
+    //             when={
+    //               user().admin ||
+    //               server()?.server.permissions![getId(user())] ===
+    //                 PermissionLevel.Update
+    //             }
+    //           >
+    //             <NewDeployment serverID={p.id} />
+    //           </Show>
+    //         </Grid>
+    //       ),
+    //     },
+    //     // {
+    //     //   title: "builds",
+    //     //   element: () => (
+    //     //     <Grid
+    //     //       gap=".5rem"
+    //     //       class={combineClasses(s.Deployments)}
+    //     //       gridTemplateColumns={isSemiMobile() ? "1fr" : "1fr 1fr"}
+    //     //     >
+    //     //       <For each={buildIDs()}>{(id) => <Build id={id} />}</For>
+    //     //       <Show
+    //     //         when={
+    //     //           user().admin ||
+    //     //           server()?.server.permissions![getId(user())] ===
+    //     //             PermissionLevel.Update
+    //     //         }
+    //     //       >
+    //     //         <NewBuild serverID={p.id} />
+    //     //       </Show>
+    //     //     </Grid>
+    //     //   ),
+    //     // },
+    //   ]}
+    // />
   );
 };
 

frontend/src/components/shared/ConfirmButton.tsx

@@ -17,6 +17,7 @@ const ConfirmButton: Component<{
       onBlur={() => set(false)}
       onClick={(e) => {
         e.stopPropagation();
+        e.preventDefault();
         if (confirm()) {
           p.onConfirm && p.onConfirm();
         } else {

frontend/src/components/shared/menu/CenterMenu.tsx

@@ -1,8 +1,6 @@
 import {
   Accessor,
   Component,
-  createEffect,
-  createSignal,
   JSX,
   JSXElement,
   Show,
@@ -27,16 +25,16 @@ const CenterMenu: Component<{
   style?: JSX.CSSProperties;
   position?: "top" | "center";
 }> = (p) => {
-  const [buffer, set] = createSignal(p.show());
-  createEffect(() => {
-    if (p.show()) {
-      set(true);
-    } else {
-      setTimeout(() => {
-        set(false);
-      }, 350);
-    }
-  });
+  // const [buffer, set] = createSignal(p.show());
+  // createEffect(() => {
+  //   if (p.show()) {
+  //     set(true);
+  //   } else {
+  //     setTimeout(() => {
+  //       set(false);
+  //     }, 350);
+  //   }
+  // });
   return (
     <>
       <button
@@ -49,7 +47,7 @@ const CenterMenu: Component<{
       >
         {p.target}
       </button>
-      <Show when={buffer()}>
+      <Show when={p.show()}>
         <Child {...p} show={p.show} toggleShow={p.toggleShow} />
       </Show>
     </>
@@ -69,7 +67,7 @@ const Child: Component<{
   useKeyDown("Escape", p.toggleShow);
   return (
     <Grid
-      class={combineClasses(s.CenterMenuContainer, p.show() ? s.Enter : s.Exit)}
+      class={combineClasses(s.CenterMenuContainer)}
       onClick={(e) => {
         e.stopPropagation();
         p.toggleShow();

frontend/src/components/shared/menu/HoverMenu.tsx

@@ -22,18 +22,18 @@ const HoverMenu: Component<{
   containerStyle?: JSX.CSSProperties;
 }> = (p) => {
   const [show, set] = createSignal(false);
-  const [buffer, setBuffer] = createSignal(false);
-  let timeout: number;
-  createEffect(() => {
-    clearTimeout(timeout);
-    if (show()) {
-      setBuffer(true);
-    } else {
-      timeout = setTimeout(() => {
-        setBuffer(false);
-      }, 350);
-    }
-  });
+  // const [buffer, setBuffer] = createSignal(false);
+  // let timeout: number;
+  // createEffect(() => {
+  //   clearTimeout(timeout);
+  //   if (show()) {
+  //     setBuffer(true);
+  //   } else {
+  //     timeout = setTimeout(() => {
+  //       setBuffer(false);
+  //     }, 350);
+  //   }
+  // });
   return (
     <Flex
       class={s.HoverMenuTarget}
@@ -44,13 +44,13 @@ const HoverMenu: Component<{
       alignItems="center"
     >
       {p.target}
-      <Show when={buffer()}>
+      <Show when={show()}>
         <div
           class={combineClasses(
             p.contentClass,
             getPositionClass(p.position),
             s.HoverMenu,
-            show() ? s.Enter : s.Exit,
+            // show() ? s.Enter : s.Exit,
           )}
           onMouseOut={() => {
             set(false);
@@ -59,7 +59,7 @@ const HoverMenu: Component<{
             set(false)
             e.stopPropagation();
           }}
-          style={{ ...p.contentStyle, padding: p.padding }}
+          style={{ ...p.contentStyle, padding: p.padding || "0.5rem" }}
         >
           {p.content}
         </div>

frontend/src/components/shared/menu/Menu.tsx

@@ -1,7 +1,5 @@
 import {
   Component,
-  createEffect,
-  createSignal,
   JSX,
   JSXElement,
   Show,
@@ -22,20 +20,20 @@ const Menu: Component<{
   containerStyle?: JSX.CSSProperties;
   backgroundColor?: string;
 }> = (p) => {
-  const [buffer, set] = createSignal(p.show);
-  createEffect(() => {
-    if (p.show) {
-      set(true);
-    } else {
-      setTimeout(() => {
-        set(false);
-      }, 350);
-    }
-  });
+  // const [buffer, set] = createSignal(p.show);
+  // createEffect(() => {
+  //   if (p.show) {
+  //     set(true);
+  //   } else {
+  //     setTimeout(() => {
+  //       set(false);
+  //     }, 350);
+  //   }
+  // });
   return (
     <div class={s.MenuContainer} style={p.containerStyle}>
       {p.target}
-      <Show when={buffer()}>
+      <Show when={p.show}>
         <div
           class={s.MenuBackground}
           style={{ "background-color": p.backgroundColor }}
@@ -47,7 +45,7 @@ const Menu: Component<{
             s.Menu,
             "shadow",
             getPositionClass(p.position),
-            p.show ? s.Enter : s.Exit
+            // p.show ? s.Enter : s.Exit
           )}
           style={{ padding: p.padding as any, ...p.menuStyle }}
           onClick={(e) => e.stopPropagation()}

frontend/src/components/topbar/Account.tsx

@@ -16,7 +16,6 @@ const Account: Component<{ close: () => void }> = (p) => {
       <Show when={isMobile()}>
         <Flex justifyContent="center">{user().username}</Flex>
       </Show>
-      <Flex justifyContent="center">admin: {user().admin.toString()}</Flex>
       <Show when={user().admin}>
         <A
           href="/users"
@@ -27,12 +26,12 @@ const Account: Component<{ close: () => void }> = (p) => {
           manage users
         </A>
       </Show>
-      <Show when={!user().admin}>
+      {/* <Show when={!user().admin}>
         <Flex justifyContent="center">
           create server permissions:{" "}
-          {user().create_server_permissions.toString()}
+          {user().create_server_permissions?.toString()}
         </Flex>
-      </Show>
+      </Show> */}
       <A
         href="/account"
         class="grey"

frontend/src/components/topbar/Search/Search.tsx

@@ -17,7 +17,7 @@ import { ControlledTabs } from "../../shared/tabs/Tabs";
 import { useAppDimensions } from "../../../state/DimensionProvider";
 import Grid from "../../shared/layout/Grid";
 import { A, useNavigate } from "@solidjs/router";
-import { ServerStatus } from "../../../types";
+import { Build, ServerStatus } from "../../../types";
 
 const mobileStyle: JSX.CSSProperties = {
   // position: "fixed",
@@ -191,8 +191,10 @@ const Builds: Component<{ close: () => void }> = (p) => {
                 gap="0.2rem"
                 style={{ opacity: 0.6, "font-size": "0.9rem" }}
               >
-                {servers.get(build.server_id)?.server.name}
-                <Icon type="caret-right" width="0.7rem" />
+                <Show when={build.server_id}>
+                  {build.server_id && servers.get(build.server_id)?.server.name}
+                  <Icon type="caret-right" width="0.7rem" />
+                </Show>
                 build
               </Flex>
             </Grid>

frontend/src/components/users/Users.tsx

@@ -8,6 +8,7 @@ import {
   Show,
 } from "solid-js";
 import { client } from "../..";
+import { useAppDimensions } from "../../state/DimensionProvider";
 import { useAppState } from "../../state/StateProvider";
 import { Operation } from "../../types";
 import { combineClasses, getId } from "../../util/helpers";
@@ -18,9 +19,19 @@ import Loading from "../shared/loading/Loading";
 import s from "./users.module.scss";
 
 const Users: Component<{}> = (p) => {
+  const { isMobile } = useAppDimensions();
   const { ws } = useAppState();
   const [users, { refetch }] = createResource(() => client.list_users());
-  onCleanup(ws.subscribe([Operation.ModifyUserEnabled], refetch));
+  onCleanup(
+    ws.subscribe(
+      [
+        Operation.ModifyUserEnabled,
+        Operation.ModifyUserCreateServerPermissions,
+        Operation.ModifyUserCreateBuildPermissions,
+      ],
+      refetch
+    )
+  );
   const [search, setSearch] = createSignal("");
   const filteredUsers = createMemo(() =>
     users()?.filter((user) => user.username.includes(search()))
@@ -34,55 +45,78 @@ const Users: Component<{}> = (p) => {
         </Grid>
       }
     >
-      <Grid class={s.UsersContent}>
-        <Grid class={combineClasses(s.Users, "card shadow")}>
-          <Flex justifyContent="space-between">
-            <h1>users</h1>
-            <Input
-              class="lightgrey"
-              placeholder="search"
-              value={search()}
-              onEdit={setSearch}
-            />
-          </Flex>
-          <For each={filteredUsers()}>
-            {(user) => (
-              <Flex class={combineClasses(s.User, "shadow")}>
-                <div class={s.Username}>{user.username}</div>
-                <Flex alignItems="center">
-                  <button
-                    class={user.enabled ? "green" : "red"}
-                    onClick={() => {
-                      client.modify_user_enabled({
-                        user_id: getId(user),
-                        enabled: !user.enabled,
-                      });
-                    }}
-                  >
-                    {user.enabled ? "enabled" : "disabled"}
-                  </button>
-                  <button
-                    class={user.create_server_permissions ? "green" : "red"}
-                    onClick={() => {
-                      client.modify_user_create_server_permissions({
-                        user_id: getId(user),
-                        create_server_permissions: !user.create_server_permissions,
-                      });
-                    }}
-                  >
-                    {user.create_server_permissions ? "can create servers" : "cannot create servers"}
-                  </button>
-                  {/* <ConfirmButton
+      <Grid
+        class="card shadow"
+        style={{ width: "100%", "box-sizing": "border-box" }}
+      >
+        <Flex justifyContent="space-between">
+          <h1>users</h1>
+          <Input
+            class="lightgrey"
+            placeholder="search"
+            value={search()}
+            onEdit={setSearch}
+          />
+        </Flex>
+        <For each={filteredUsers()}>
+          {(user) => (
+            <Flex class={combineClasses(s.User, "shadow")}>
+              <div class={s.Username}>{user.username}</div>
+              <Grid
+                placeItems="center end"
+                gridTemplateColumns={!isMobile() ? "1fr 1fr 1fr" : undefined}
+              >
+                <button
+                  class={user.enabled ? "green" : "red"}
+                  style={{ width: isMobile() ? "11rem" : "6rem" }}
+                  onClick={() => {
+                    client.modify_user_enabled({
+                      user_id: getId(user),
+                      enabled: !user.enabled,
+                    });
+                  }}
+                >
+                  {user.enabled ? "enabled" : "disabled"}
+                </button>
+                <button
+                  class={user.create_server_permissions ? "green" : "red"}
+                  style={{ width: "11rem" }}
+                  onClick={() => {
+                    client.modify_user_create_server_permissions({
+                      user_id: getId(user),
+                      create_server_permissions:
+                        !user.create_server_permissions,
+                    });
+                  }}
+                >
+                  {user.create_server_permissions
+                    ? "can create servers"
+                    : "cannot create servers"}
+                </button>
+                <button
+                  class={user.create_build_permissions ? "green" : "red"}
+                  style={{ width: "11rem" }}
+                  onClick={() => {
+                    client.modify_user_create_build_permissions({
+                      user_id: getId(user),
+                      create_build_permissions: !user.create_build_permissions,
+                    });
+                  }}
+                >
+                  {user.create_build_permissions
+                    ? "can create builds"
+                    : "cannot create builds"}
+                </button>
+                {/* <ConfirmButton
                     class="red"
                     onConfirm={() => deleteUser(user._id!)}
                   >
                     <Icon type="trash" />
                   </ConfirmButton> */}
-                </Flex>
-              </Flex>
-            )}
-          </For>
-        </Grid>
+              </Grid>
+            </Flex>
+          )}
+        </For>
       </Grid>
     </Show>
   );

frontend/src/state/StateProvider.tsx

@@ -1,5 +1,5 @@
 import { useNavigate } from "@solidjs/router";
-import { createContext, ParentComponent, useContext } from "solid-js";
+import { createContext, createResource, ParentComponent, Resource, useContext } from "solid-js";
 import { useWindowKeyDown } from "../util/hooks";
 import {
   useBuilds,
@@ -14,7 +14,8 @@ import {
 } from "./hooks";
 import connectToWs from "./ws";
 import { useUser } from "./UserProvider";
-import { PermissionLevel } from "../types";
+import { AwsBuilderConfig, PermissionLevel } from "../types";
+import { client } from "..";
 
 export type State = {
   usernames: ReturnType<typeof useUsernames>;
@@ -32,6 +33,7 @@ export type State = {
   procedures: ReturnType<typeof useProcedures>;
   getPermissionOnProcedure: (id: string) => PermissionLevel;
   updates: ReturnType<typeof useUpdates>;
+  aws_builder_config: Resource<AwsBuilderConfig>;
 };
 
 const context = createContext<
@@ -51,6 +53,7 @@ export const AppStateProvider: ParentComponent = (p) => {
   const procedures = useProcedures();
   const deployments = useDeployments();
   const usernames = useUsernames();
+  const [aws_builder_config] = createResource(() => client.get_aws_builder_defaults());
   const state: State = {
     usernames,
     servers,
@@ -129,6 +132,7 @@ export const AppStateProvider: ParentComponent = (p) => {
       }
     },
     updates: useUpdates(),
+    aws_builder_config,
   };
 
   // createEffect(() => {

frontend/src/types.ts

@@ -2,6 +2,8 @@
  Generated by typeshare 1.0.0
 */
 
+export type AvailableAmiAccounts = Record<string, AmiAccounts>;
+
 export type PermissionsMap = Record<string, PermissionLevel>;
 
 export interface Action {
@@ -21,12 +23,12 @@ export interface Build {
 	_id?: string;
 	name: string;
 	permissions?: PermissionsMap;
-	server_id: string;
+	server_id?: string;
+	aws_config?: AwsBuilderBuildConfig;
 	version: Version;
 	repo?: string;
 	branch?: string;
 	github_account?: string;
-	on_clone?: Command;
 	pre_build?: Command;
 	docker_build_args?: DockerBuildArgs;
 	docker_account?: string;
@@ -37,7 +39,6 @@ export interface Build {
 
 export interface BuildActionState {
 	building: boolean;
-	recloning: boolean;
 	updating: boolean;
 }
 
@@ -58,6 +59,37 @@ export interface BuildVersionsReponse {
 	ts: string;
 }
 
+export interface AwsBuilderBuildConfig {
+	region?: string;
+	instance_type?: string;
+	ami_id?: string;
+	volume_gb?: number;
+	subnet_id?: string;
+	security_group_ids?: string[];
+	key_pair_name?: string;
+	assign_public_ip?: boolean;
+}
+
+export interface AwsBuilderConfig {
+	access_key_id: string;
+	secret_access_key: string;
+	default_ami_id: string;
+	default_subnet_id: string;
+	default_key_pair_name: string;
+	available_ami_accounts?: AvailableAmiAccounts;
+	default_region?: string;
+	default_volume_gb?: number;
+	default_instance_type?: string;
+	default_security_group_ids?: string[];
+	default_assign_public_ip?: boolean;
+}
+
+export interface AmiAccounts {
+	name: string;
+	github?: string[];
+	docker?: string[];
+}
+
 export interface Deployment {
 	_id?: string;
 	name: string;
@@ -327,9 +359,10 @@ export interface Log {
 export interface User {
 	_id?: string;
 	username: string;
-	enabled: boolean;
-	admin: boolean;
-	create_server_permissions: boolean;
+	enabled?: boolean;
+	admin?: boolean;
+	create_server_permissions?: boolean;
+	create_build_permissions?: boolean;
 	avatar?: string;
 	secrets?: ApiSecret[];
 	password?: string;
@@ -382,7 +415,6 @@ export enum Operation {
 	UpdateBuild = "update_build",
 	DeleteBuild = "delete_build",
 	BuildBuild = "build_build",
-	RecloneBuild = "reclone_build",
 	CreateDeployment = "create_deployment",
 	UpdateDeployment = "update_deployment",
 	DeleteDeployment = "delete_deployment",
@@ -400,6 +432,7 @@ export enum Operation {
 	DeleteGroup = "delete_group",
 	ModifyUserEnabled = "modify_user_enabled",
 	ModifyUserCreateServerPermissions = "modify_user_create_server_permissions",
+	ModifyUserCreateBuildPermissions = "modify_user_create_build_permissions",
 	ModifyUserPermissions = "modify_user_permissions",
 	AutoBuild = "auto_build",
 	AutoPull = "auto_pull",
@@ -449,7 +482,6 @@ export enum ProcedureOperation {
 	PruneContainersServer = "prune_containers_server",
 	PruneNetworksServer = "prune_networks_server",
 	BuildBuild = "build_build",
-	RecloneBuild = "reclone_build",
 	DeployContainer = "deploy_container",
 	StopContainer = "stop_container",
 	StartContainer = "start_container",

frontend/src/util/client.ts

@@ -2,6 +2,7 @@ import axios from "axios";
 import fileDownload from "js-file-download";
 import { URL } from "..";
 import {
+  AwsBuilderConfig,
   BasicContainerInfo,
   Build,
   BuildActionState,
@@ -38,6 +39,7 @@ import {
   CreateSecretBody,
   CreateServerBody,
   LoginOptions,
+  ModifyUserCreateBuildBody,
   ModifyUserCreateServerBody,
   ModifyUserEnabledBody,
   PermissionsUpdateBody,
@@ -145,6 +147,10 @@ export class Client {
     return this.get(`/api/deployment/${id}/stats`);
   }
 
+  get_deployment_deployed_version(id: string): Promise<string> {
+    return this.get(`/api/deployment/${id}/deployed_version`);
+  }
+
   create_deployment(body: CreateDeploymentBody): Promise<Deployment> {
     return this.post("/api/deployment/create", body);
   }
@@ -351,6 +357,10 @@ export class Client {
     return this.post(`/api/build/${id}/reclone`);
   }
 
+  get_aws_builder_defaults(): Promise<AwsBuilderConfig> {
+    return this.get("/api/build/aws_builder_defaults");
+  }
+
   // procedure
 
   list_procedures(query?: QueryObject): Promise<Procedure[]> {
@@ -454,6 +464,12 @@ export class Client {
     return this.post("/api/permissions/modify_create_server", body);
   }
 
+  modify_user_create_build_permissions(
+    body: ModifyUserCreateBuildBody
+  ): Promise<Update> {
+    return this.post("/api/permissions/modify_create_build", body);
+  }
+
   async get<R = any>(url: string): Promise<R> {
     return await axios({
       method: "get",

frontend/src/util/client_types.ts

@@ -6,12 +6,10 @@ import { PermissionLevel, PermissionsTarget } from "../types";
 
 export interface CreateBuildBody {
 	name: string;
-	server_id: string;
 }
 
 export interface CopyBuildBody {
 	name: string;
-	server_id: string;
 }
 
 export interface BuildVersionsQuery {
@@ -56,6 +54,11 @@ export interface ModifyUserCreateServerBody {
 	create_server_permissions: boolean;
 }
 
+export interface ModifyUserCreateBuildBody {
+	user_id: string;
+	create_build_permissions: boolean;
+}
+
 export interface CreateProcedureBody {
 	name: string;
 }

lib/db_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "db_client"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

lib/helpers/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monitor_helpers"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 authors = ["MoghTech"]
 description = "helpers used as dependency for mogh tech monitor"

lib/helpers/src/git.rs

@@ -83,7 +83,7 @@ async fn clone(
     access_token: Option<GithubToken>,
 ) -> Log {
     let _ = std::fs::remove_dir_all(destination);
-    let access_token = match access_token {
+    let access_token_at = match &access_token {
         Some(token) => format!("{token}@"),
         None => String::new(),
     };
@@ -91,12 +91,12 @@ async fn clone(
         Some(branch) => format!(" -b {branch}"),
         None => String::new(),
     };
-    let repo_url = format!("https://{access_token}github.com/{repo}.git");
+    let repo_url = format!("https://{access_token_at}github.com/{repo}.git");
     let command = format!("git clone {repo_url} {destination}{branch}");
     let start_ts = monitor_timestamp();
     let output = async_run_command(&command).await;
-    let command = if access_token.len() > 0 {
-        command.replace(&access_token, "<TOKEN>")
+    let command = if access_token_at.len() > 0 {
+        command.replace(&access_token.unwrap(), "<TOKEN>")
     } else {
         command
     };

lib/monitor_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monitor_client"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 authors = ["MoghTech"]
 description = "a client to interact with the monitor system"
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-monitor_types = "0.1.16"
+monitor_types = "0.2.0"
 # monitor_types = { path = "../types" }
 reqwest = { version = "0.11", features = ["json"] }
 tokio-tungstenite = { version = "0.18", features=["native-tls"] }

lib/monitor_client/src/build.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use monitor_types::{Build, BuildActionState, BuildVersionsReponse, Update};
+use monitor_types::{AwsBuilderConfig, Build, BuildActionState, BuildVersionsReponse, Update};
 use serde_json::{json, Value};
 
 use crate::MonitorClient;
@@ -14,6 +14,7 @@ impl MonitorClient {
     pub async fn get_build(&self, build_id: &str) -> anyhow::Result<Build> {
         self.get(&format!("/api/build/{build_id}"), Option::<()>::None)
             .await
+            .context(format!("failed at getting build {build_id}"))
     }
 
     pub async fn get_build_action_state(&self, build_id: &str) -> anyhow::Result<BuildActionState> {
@@ -22,6 +23,9 @@ impl MonitorClient {
             Option::<()>::None,
         )
         .await
+        .context(format!(
+            "failed at getting action state for build {build_id}"
+        ))
     }
 
     pub async fn get_build_versions(
@@ -37,6 +41,7 @@ impl MonitorClient {
             json!({ "page": page, "major": major.into(), "minor": minor.into(), "patch": patch.into() }),
         )
         .await
+        .context("failed at getting build versions")
     }
 
     pub async fn create_build(&self, name: &str, server_id: &str) -> anyhow::Result<Build> {
@@ -53,18 +58,16 @@ impl MonitorClient {
     pub async fn create_full_build(&self, build: &Build) -> anyhow::Result<Build> {
         self.post::<&Build, _>("/api/build/create_full", build)
             .await
-            .context(format!("failed at creating full build"))
+            .context(format!(
+                "failed at creating full build with name {}",
+                build.name
+            ))
     }
 
-    pub async fn copy_build(
-        &self,
-        id: &str,
-        new_name: &str,
-        new_server_id: &str,
-    ) -> anyhow::Result<Build> {
+    pub async fn copy_build(&self, id: &str, new_name: &str) -> anyhow::Result<Build> {
         self.post(
             &format!("/api/build/{id}/copy"),
-            json!({ "name": new_name, "server_id": new_server_id }),
+            json!({ "name": new_name }),
         )
         .await
         .context(format!("failed at copying build {id}"))
@@ -88,6 +91,12 @@ impl MonitorClient {
             .context(format!("failed at building build {build_id}"))
     }
 
+    pub async fn get_aws_builder_defaults(&self) -> anyhow::Result<AwsBuilderConfig> {
+        self.get("/api/build/aws_builder_defaults", Option::<()>::None)
+            .await
+            .context("failed at getting aws builder defaults")
+    }
+
     // pub async fn reclone_build(&self, id: &str) -> anyhow::Result<Update> {
     //     self.post::<(), _>(&format!("/api/build/{id}/reclone"), None)
     //         .await

lib/monitor_client/src/deployment.rs

@@ -35,6 +35,7 @@ impl MonitorClient {
             Option::<()>::None,
         )
         .await
+        .context("failed at get_deployment_action_state")
     }
 
     pub async fn get_deployment_container_log(
@@ -56,7 +57,21 @@ impl MonitorClient {
             Option::<()>::None,
         )
         .await
-        .context("failed at get_deployment_container_log")
+        .context("failed at get_deployment_container_stats")
+    }
+
+    pub async fn get_deployment_deployed_version(
+        &self,
+        deployment_id: &str,
+    ) -> anyhow::Result<String> {
+        self.get(
+            &format!("/api/deployment/{deployment_id}/deployed_version"),
+            Option::<()>::None,
+        )
+        .await
+        .context(format!(
+            "failed at get_deployment_deployed_version for id {deployment_id}"
+        ))
     }
 
     pub async fn create_deployment(

lib/periphery_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "periphery_client"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

lib/types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monitor_types"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 authors = ["MoghTech"]
 description = "types for the mogh tech monitor"

lib/types/src/build.rs

@@ -38,7 +38,7 @@ pub struct Build {
 
     #[builder(default)]
     #[diff(attr(#[serde(skip_serializing_if = "option_diff_no_change")]))]
-    pub aws_config: Option<AwsBuilderConfig>,
+    pub aws_config: Option<AwsBuilderBuildConfig>,
 
     #[builder(default)]
     pub version: Version,
@@ -69,7 +69,7 @@ pub struct Build {
     #[diff(attr(#[serde(skip_serializing_if = "option_diff_no_change")]))]
     pub docker_account: Option<String>,
 
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "String::is_empty")]
     #[diff(attr(#[serde(skip)]))]
     #[builder(setter(skip))]
     pub last_built_at: String,
@@ -88,7 +88,6 @@ pub struct Build {
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct BuildActionState {
     pub building: bool,
-    pub recloning: bool,
     pub updating: bool,
 }
 
@@ -154,7 +153,7 @@ pub struct BuildVersionsReponse {
 #[typeshare]
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Diff, Builder)]
 #[diff(attr(#[derive(Debug, Serialize, PartialEq)]))]
-pub struct AwsBuilderConfig {
+pub struct AwsBuilderBuildConfig {
     #[builder(default)]
     #[diff(attr(#[serde(skip_serializing_if = "option_diff_no_change")]))]
     pub region: Option<String>,

lib/types/src/config.rs

@@ -1,6 +1,7 @@
 use std::{collections::HashMap, net::IpAddr, path::PathBuf};
 
 use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
 
 use crate::Timelength;
 
@@ -98,21 +99,34 @@ fn default_core_mongo_db_name() -> String {
     "monitor".to_string()
 }
 
+#[typeshare]
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct AwsBuilderConfig {
+    #[serde(skip_serializing)]
     pub access_key_id: String,
+
+    #[serde(skip_serializing)]
     pub secret_access_key: String,
+
     pub default_ami_id: String,
     pub default_subnet_id: String,
     pub default_key_pair_name: String,
+
+    #[serde(default)]
+    pub available_ami_accounts: AvailableAmiAccounts,
+
     #[serde(default = "default_aws_region")]
     pub default_region: String,
+
     #[serde(default = "default_volume_gb")]
     pub default_volume_gb: i32,
+
     #[serde(default = "default_instance_type")]
     pub default_instance_type: String,
+
     #[serde(default)]
     pub default_security_group_ids: Vec<String>,
+
     #[serde(default)]
     pub default_assign_public_ip: bool,
 }
@@ -129,6 +143,19 @@ fn default_instance_type() -> String {
     String::from("m5.2xlarge")
 }
 
+#[typeshare]
+pub type AvailableAmiAccounts = HashMap<String, AmiAccounts>; // (ami_id, AmiAccounts)
+
+#[typeshare]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
+pub struct AmiAccounts {
+    pub name: String,
+    #[serde(default)]
+    pub github: Vec<String>,
+    #[serde(default)]
+    pub docker: Vec<String>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PeripheryConfig {
     #[serde(default = "default_periphery_port")]

lib/types/src/lib.rs

@@ -131,6 +131,7 @@ pub enum Operation {
     // user
     ModifyUserEnabled,
     ModifyUserCreateServerPermissions,
+    ModifyUserCreateBuildPermissions,
     ModifyUserPermissions,
 
     // github webhook automation
@@ -281,24 +282,3 @@ pub fn unix_from_monitor_ts(ts: &str) -> anyhow::Result<i64> {
         .context("failed to parse rfc3339 timestamp")?
         .timestamp_millis())
 }
-
-// pub mod i64_to_str {
-//     use serde::{Deserializer, Serializer};
-//     pub fn serialize<S>(t: &i64, s: S) -> Result<S::Ok, S::Error> where S: Serializer {
-//         s.serialize_str(&t.to_string())
-//     }
-//     pub fn deserialize<'de, D>(d: D) -> Result<i64, D::Error> where D: Deserializer<'de> {
-//         let str = d.deserialize_str(StrVisitor)
-//     }
-// }
-
-// struct StrVisitor;
-
-// impl<'de> Visitor<'de> for StrVisitor {
-//     type Value = &'de str;
-
-//     fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-//         formatter.write_str("a json string value")
-//     }
-
-// }

lib/types/src/traits.rs

@@ -65,7 +65,7 @@ impl Busy for DeploymentActionState {
 
 impl Busy for BuildActionState {
     fn busy(&self) -> bool {
-        self.building || self.recloning || self.updating
+        self.building || self.updating
     }
 }
 

periphery/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monitor_periphery"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2021"
 authors = ["MoghTech"]
 description = "monitor periphery binary | run monitor periphery as system daemon"
@@ -27,7 +27,7 @@ serde_json = "1.0"
 bollard = "0.13"
 anyhow = "1.0"
 envy = "0.4"
-sysinfo = "0.27.7"
+sysinfo = "0.28"
 toml = "0.7"
 daemonize = "0.4"
 clap = { version = "4.0", features = ["derive"] }

tests/src/tests.rs

@@ -3,9 +3,9 @@ use monitor_client::{
     futures_util::StreamExt,
     tokio_tungstenite::tungstenite::Message,
     types::{
-        AwsBuilderConfigBuilder, Build, BuildBuilder, Command, Conversion, Deployment,
-        DeploymentWithContainerState, DockerBuildArgs, DockerBuildArgsBuilder, Server, SystemStats,
-        Update,
+        AwsBuilderBuildConfig, AwsBuilderConfig, Build, BuildBuilder, Command, Conversion,
+        Deployment, DeploymentWithContainerState, DockerBuildArgs, DockerBuildArgsBuilder, Server,
+        SystemStats, Update,
     },
     MonitorClient,
 };
@@ -129,23 +129,19 @@ pub async fn test_updates(monitor: &MonitorClient) -> anyhow::Result<()> {
 
 pub async fn test_aws_build(monitor: &MonitorClient) -> anyhow::Result<()> {
     let build = BuildBuilder::default()
-        .name("test_tram".to_string())
-        .repo(Some(String::from("SocialSocialTrading/master")))
-        .branch(Some(String::from("master")))
+        .name("test_monitor".to_string())
+        .repo(Some(String::from("mbecker20/monitor")))
+        .branch(Some(String::from("main")))
+        .docker_account(Some(String::from("mbecker2020")))
         .docker_build_args(
             DockerBuildArgsBuilder::default()
-                .build_path("backend".to_string())
-                .dockerfile_path("Dockerfile".to_string().into())
+                .build_path(".".to_string())
+                .dockerfile_path("Dockerfile.core".to_string().into())
                 .build()
                 .context("failed to construct DockerBuildArgs struct")?
                 .into(),
         )
-        .aws_config(
-            AwsBuilderConfigBuilder::default()
-                .build()
-                .context("failed to construct AwsBuilderConfig struct")?
-                .into(),
-        )
+        .aws_config(AwsBuilderBuildConfig::default().into())
         .build()
         .context("failed to construct Build struct")?;
     let build = monitor.create_full_build(&build).await?;