feat(module-if): Add support for conditional modules

Author: gmpinder

Cargo.lock

@@ -12,18 +12,79 @@ modules:
       - example.sh
 
   - type: script
+    env:
+      TEST_ARG_2: "another"
+    if:
+      env:
+        exists:
+          - TEST_ARG
+          - TEST_ARG_2
+    snippets:
+      - exit 1
+
+  - type: script
+    env:
+      TEST_ARG: "test"
+      TEST_ARG_2: "another"
+    if:
+      env:
+        not-exists:
+          - TEST_ARG
+          - TEST_ARG_2
+    snippets:
+      - exit 1
+
+  - type: script
+    env:
+      TEST_ARG: "test"
+    if:
+      env:
+        equals:
+          TEST_ARG:
+            - no-test
+            - some-test
     snippets:
-      - '[ -z "$TEST_ARG" ]'
+      - exit 1
 
   - type: script
     env:
       TEST_ARG: "test"
+    if:
+      env:
+        not-equals:
+          TEST_ARG:
+            - test
+            - some-test
     snippets:
-      - '[ "$TEST_ARG" = "test" ]'
+      - exit 1
 
   - type: script
+    env:
+      TEST_ARG: "test"
+      TEST_ARG_2: "another"
+    if: '[ "$TEST_ARG" = "$TEST_ARG_2" ]'
+    snippets:
+      - exit 1
+
+  - type: script
+    env:
+      TEST_ARG: "test"
+      TEST_ARG_2: "another"
+    if:
+      eval: '[ "$TEST_ARG" = "$TEST_ARG_2" ]'
+      env:
+        exists:
+          - TEST_ARG_2
+          - TEST_ARG_3
+        not-exists: TEST_ARG
+        equals:
+          TEST_ARG:
+            - no-test
+            - some-test
+        not-equals:
+          TEST_ARG_2: another
     snippets:
-      - '[ -z "$TEST_ARG" ]'
+      - exit 1
 
   - type: dnf
     repos:

integration-tests/test-repo/recipes/common.yml

@@ -0,0 +1,43 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+modules:
+  - type: apt
+    if:
+      os-release:
+        ID:
+          - ubuntu
+          - debian
+    install:
+      packages:
+        - git
+  - type: dnf
+    if:
+      os-release:
+        ID:
+          - fedora
+          - centos
+          - rhel
+    install:
+      packages:
+        - git
+  - type: apk
+    if:
+      os-release:
+        ID: alpine
+    install:
+      packages:
+        - git
+  - type: pacman
+    if:
+      os-release:
+        ID: archlinux
+    install:
+      packages:
+        - git
+  - type: zypper
+    if:
+      os-release:
+        ID: opensuse-tumbleweed
+    install:
+      packages:
+        - git

integration-tests/test-repo/recipes/git.yml

@@ -5,51 +5,27 @@ stages:
     from: docker.io/library/ubuntu
     modules:
       - from-file: stages.yml
-      - type: apt
-        install:
-          packages:
-            - git
   - name: debian-test
     from: docker.io/library/debian
     modules:
       - from-file: stages.yml
-      - type: apt
-        install:
-          packages:
-            - git
   - name: fedora-test
     from: docker.io/library/fedora
     modules:
       - from-file: stages.yml
-      - type: dnf
-        install:
-          packages:
-            - git
   - name: alpine-test
     from: docker.io/library/alpine
     modules:
       - from-file: stages.yml
-      - type: apk
-        install:
-          packages:
-            - git
   - name: arch-test
     from: docker.io/archlinux/archlinux
     platform: linux/amd64
     modules:
       - from-file: stages.yml
-      - type: pacman
-        install:
-          packages:
-            - git
   - name: suse-test
     from: docker.io/opensuse/tumbleweed
     modules:
       - from-file: stages.yml
-      - type: zypper
-        install:
-          packages:
-            - git
 modules:
   - type: files
     files:
@@ -74,3 +50,4 @@ modules:
       - is
       - a
       - test
+  - from-file: git.yml

integration-tests/test-repo/recipes/stages.yml

@@ -13,6 +13,7 @@ blue-build-utils = { version = "=0.9.30", path = "../utils" }
 
 cached.workspace = true
 colored.workspace = true
+comlexr.workspace = true
 log.workspace = true
 miette.workspace = true
 oci-client.workspace = true
@@ -23,5 +24,9 @@ serde_yaml.workspace = true
 serde_json.workspace = true
 bon.workspace = true
 
+[dev-dependencies]
+rstest.workspace = true
+pretty_assertions.workspace = true
+
 [lints]
 workspace = true

recipe/Cargo.toml

@@ -13,8 +13,10 @@ use serde_yaml::Value;
 
 use crate::{AkmodsInfo, ModuleExt, base_recipe_path};
 
+mod module_if;
 mod type_ver;
 
+pub use module_if::*;
 pub use type_ver::*;
 
 #[derive(Serialize, Deserialize, Debug, Clone, Builder)]
@@ -39,6 +41,10 @@ pub struct ModuleRequiredFields {
     #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub secrets: Vec<Secret>,
 
+    #[serde(rename = "if")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub if_check: Option<ModuleIf>,
+
     #[serde(flatten)]
     #[builder(default, into)]
     pub config: IndexMap<String, Value>,