chore: move foundry -> builder

Author: cilki

goldboot-image/src/lib.rs

@@ -231,6 +231,13 @@ pub struct PrimaryHeader {
     pub directory_size: u32,
 }
 
+impl PrimaryHeader {
+    pub fn name(&self) -> String {
+        let parts: Vec<String> = self.elements.iter().map(|element| element.name()).collect();
+        parts.join(" / ")
+    }
+}
+
 /// Contains metadata which may be encrypted.
 #[derive(BinRead, BinWrite, Debug, Eq, PartialEq, Clone)]
 #[brw(big)]

goldboot-registry/src/extract.rs

@@ -18,11 +18,8 @@ impl FromRequest<RegistryState> for ImageHandle {
             Ok(value) => match value.get("image_id") {
                 Some(image_id) => match ImageLibrary::find_by_id(image_id) {
                     Ok(image_handle) => {
-                        if image_handle.primary_header.is_public() {
-                            Ok(ImageHandle(image_handle))
-                        } else {
-                            todo!()
-                        }
+                        // TODO access control
+                        Ok(ImageHandle(image_handle))
                     }
                     Err(_) => Err(StatusCode::NOT_FOUND),
                 },

goldboot/src/foundry/fabricators/ansible.rs renamed to goldboot/src/builder/fabricators/ansible.rs

@@ -1,5 +1,5 @@
-use crate::foundry::Foundry;
-use crate::{cli::prompt::Prompt, foundry::ssh::SshConnection};
+use crate::builder::Foundry;
+use crate::{cli::prompt::Prompt, builder::ssh::SshConnection};
 use anyhow::Result;
 use anyhow::bail;
 use serde::{Deserialize, Serialize};

goldboot/src/foundry/fabricators/exe.rs renamed to goldboot/src/builder/fabricators/exe.rs

@@ -1,6 +1,6 @@
 use super::Fabricate;
-use crate::foundry::Foundry;
-use crate::{cli::prompt::Prompt, foundry::ssh::SshConnection};
+use crate::builder::Foundry;
+use crate::{cli::prompt::Prompt, builder::ssh::SshConnection};
 use anyhow::Result;
 use anyhow::bail;
 use serde::{Deserialize, Serialize};

goldboot/src/foundry/fabricators/mod.rs renamed to goldboot/src/builder/fabricators/mod.rs

@@ -2,7 +2,7 @@
 //! image templates. Templates may also specify their own specialized
 //! provisioners for specific tasks.
 
-use crate::foundry::ssh::SshConnection;
+use crate::builder::ssh::SshConnection;
 use ansible::Ansible;
 use anyhow::Result;
 use enum_dispatch::enum_dispatch;

goldboot/src/foundry/fabricators/shell.rs renamed to goldboot/src/builder/fabricators/shell.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use tracing::info;
 use validator::Validate;
 
-use crate::foundry::ssh::SshConnection;
+use crate::builder::ssh::SshConnection;
 
 /// Runs an inline shell command.
 #[derive(Clone, Serialize, Deserialize, Validate, Debug)]

goldboot/src/foundry/http.rs renamed to goldboot/src/builder/http.rs

@@ -1,6 +1,6 @@
 use self::qemu::{Accel, detect_accel};
 use self::{fabricators::Fabricator, os::Os, sources::ImageSource};
-use crate::foundry::os::BuildImage;
+use crate::builder::os::BuildImage;
 use crate::library::ImageLibrary;
 
 use anyhow::Result;
@@ -52,7 +52,7 @@ impl ImageElement {
 /// A `Foundry` produces a goldboot image given a raw configuration. This is the
 /// central concept in the machinery that creates images.
 #[derive(Clone, Serialize, Deserialize, Validate, Default, Debug)]
-#[validate(schema(function = "crate::foundry::custom_foundry_validator"))]
+#[validate(schema(function = "crate::builder::custom_builder_validator"))]
 pub struct Foundry {
     #[validate(length(min = 1))]
     pub alloy: Vec<ImageElement>,
@@ -106,7 +106,7 @@ pub struct Foundry {
 }
 
 /// Handles more sophisticated validation of a [`Foundry`].
-pub fn custom_foundry_validator(_f: &Foundry) -> Result<(), validator::ValidationError> {
+pub fn custom_builder_validator(_f: &Foundry) -> Result<(), validator::ValidationError> {
     // If there's more than one OS, they must all support alloy
     // if f.alloy.len() > 1 {
     //     for template in &self.config.templates {
@@ -127,13 +127,13 @@ impl Foundry {
         // Unpack included firmware if one isn't given
         let ovmf_path = if let Some(path) = self.ovmf_path.clone() {
             PathBuf::from(path)
-        } else if let Some(path) = crate::foundry::ovmf::find() {
+        } else if let Some(path) = crate::builder::ovmf::find() {
             path
         } else if cfg!(feature = "include_ovmf") {
             let path = tmp.path().join("OVMF.fd").to_string_lossy().to_string();
 
             #[cfg(feature = "include_ovmf")]
-            crate::foundry::ovmf::write(self.arch, &path).unwrap();
+            crate::builder::ovmf::write(self.arch, &path).unwrap();
             PathBuf::from(path)
         } else {
             panic!("No OVMF firmware found");

goldboot/src/foundry/mod.rs renamed to goldboot/src/builder/mod.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use crate::{cli::prompt::Prompt, foundry::Foundry};
+use crate::{cli::prompt::Prompt, builder::Foundry};
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -27,10 +27,10 @@ impl Default for Hostname {
 }
 
 impl Prompt for Hostname {
-    fn prompt(&mut self, foundry: &Foundry) -> Result<()> {
+    fn prompt(&mut self, builder: &Foundry) -> Result<()> {
         self.hostname = dialoguer::Input::with_theme(&crate::cli::cmd::init::theme())
             .with_prompt("Enter network hostname")
-            .default(foundry.name.clone())
+            .default(builder.name.clone())
             .interact()?;
 
         self.validate()?;