Merge pull request #9 from brainhivenl/refactor/prepare-config

Prepare configuration for deployment

Author: dmeijboom

README.md

@@ -125,33 +125,28 @@ cargo build --release
 Create a `steiger.yml` file:
 
 ```yaml
-services:
+build:
   frontend:
-    build:
-      type: docker
-      context: ./frontend
-      dockerfile: Dockerfile.prod # optional, defaults to Dockerfile
-      buildArgs:
-        ENV: ${env} # variable substitution is supported
+    type: docker
+    context: ./frontend
+    dockerfile: Dockerfile.prod # optional, defaults to Dockerfile
+    buildArgs:
+      ENV: ${env} # variable substitution is supported
 
   backend:
-    build:
-      type: bazel
-      targets:
-        app: //cmd/server:image
-        migrations: //cmd/migrations:image
+    type: bazel
+    targets:
+      app: //cmd/server:image
+      migrations: //cmd/migrations:image
 
   go-service:
-    build:
-      type: ko
-      importPath: ./cmd/service
+    type: ko
+    importPath: ./cmd/service
 
   flake:
-    build:
-      type: nix
-      systems: ["x86_64-linux"]
-      packages:
-        api: default # attribute path to package e.g. `outputs.packages.<system>.default`
+    type: nix
+    packages:
+      api: default # attribute path to package e.g. `outputs.packages.<system>.default`
 
 profiles:
   prod:
@@ -177,15 +172,14 @@ oci_image(
 Platform-specific builds:
 
 ```yaml
-services:
+build:
   multi-arch:
-    build:
-      type: bazel
-      platforms:
-        linux/amd64: //platforms:linux_amd64
-        linux/arm64: //platforms:linux_arm64
-      targets:
-        app: //cmd/app:image
+    type: bazel
+    platforms:
+      linux/amd64: //platforms:linux_amd64
+      linux/arm64: //platforms:linux_arm64
+    targets:
+      app: //cmd/app:image
 ```
 
 ## Usage

example/steiger.yml

@@ -1,5 +1,4 @@
-services:
+build:
   rust:
-    build:
-      type: docker
-      context: .
+    type: docker
+    context: .

src/builder/mod.rs

@@ -1,14 +1,14 @@
+use futures::TryFutureExt;
+use miette::Diagnostic;
+use prodash::{messages::MessageLevel, tree::Item};
+use tokio::{task::JoinSet, time::Instant};
+
 use crate::{
     builder::{bazel::BazelBuilder, docker::DockerBuilder, ko::KoBuilder, nix::NixBuilder},
     config::{Build, Config},
     image::Image,
 };
 
-use futures::TryFutureExt;
-use miette::Diagnostic;
-use prodash::{messages::MessageLevel, tree::Item};
-use tokio::{task::JoinSet, time::Instant};
-
 mod bazel;
 mod docker;
 mod ko;
@@ -130,14 +130,14 @@ impl MetaBuild {
         let config = Arc::clone(&self.config);
         let mut set = JoinSet::default();
 
-        pb.init(Some(config.services.len()), None);
+        pb.init(Some(config.build.len()), None);
         pb.message(MessageLevel::Info, format!("detected platform: {platform}"));
 
-        for (name, service) in config.services.iter() {
+        for (name, build) in config.build.iter() {
             let progress = pb.add_child(name);
             let ctx = Context::new(name.clone(), platform.to_string(), ());
 
-            match &service.build {
+            match &build {
                 Build::Ko(ko) => {
                     set.spawn(
                         run_builder(&mut self.ko, progress, ctx.with(ko.clone()))?
@@ -175,7 +175,7 @@ impl MetaBuild {
         let elapsed = instant.elapsed();
 
         pb.message(
-            MessageLevel::Info,
+            MessageLevel::Success,
             format!("build completed in {elapsed:?}"),
         );
 

src/cmd/build.rs

@@ -14,17 +14,17 @@ use crate::{
     tag::{self, TagError},
 };
 
-mod skaffold {
-    use serde::Serialize;
+pub mod output {
+    use serde::{Deserialize, Serialize};
 
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Build {
         pub image_name: String,
         pub tag: String,
     }
 
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Output {
         pub builds: Vec<Build>,
@@ -131,10 +131,10 @@ pub async fn run(
             }
 
             if let Some(path) = output_file {
-                let output = skaffold::Output {
+                let output = output::Output {
                     builds: artifacts
                         .into_iter()
-                        .map(|(image_name, tag)| skaffold::Build { image_name, tag })
+                        .map(|(image_name, tag)| output::Build { image_name, tag })
                         .collect(),
                 };
 

src/config.rs

@@ -11,7 +11,7 @@ use serde_yml::{Mapping, Value};
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Config {
-    pub services: HashMap<String, Service>,
+    pub build: HashMap<String, Build>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
@@ -61,12 +61,6 @@ pub struct Profile {
     pub vars: HashMap<String, String>,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Service {
-    pub build: Build,
-}
-
 #[derive(Debug, Diagnostic, thiserror::Error)]
 pub enum ConfigError {
     #[error("I/O error")]

src/exec.rs

@@ -56,7 +56,6 @@ where
     P: Progress + 'static,
 {
     let progress = Arc::new(progress);
-
     let mut child = spawn(cmd).await?;
 
     progress::proxy_stdio(child.stdout, Arc::clone(&progress));

steiger.yml

@@ -1,5 +1,4 @@
-services:
+build:
   steiger:
-    build:
-      type: docker
-      context: .
+    type: docker
+    context: .