Merge pull request #7 from flokoe/install-bolt-puppet-feature

Allow installation of Bolt via puppet feature
flokoe · Oct 10, 2023 · ffa0670 · ffa0670
2 parents 2cd40b8 + f6cbf66
commit ffa0670
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/src/puppet/devcontainer-feature.json b/src/puppet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "puppet",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "name": "Puppet Agent and PDK",
     "description": "Install and configure Puppet Agent and PDK via official Puppetlabs repository and Puppet extension for VS Code. This feature is intended for Puppet code/modules development.",
     "documentationURL": "https://github.com/flokoe/devcontainer-features/tree/main/src/puppet",
@@ -16,6 +16,11 @@
             ],
             "default": "latest",
             "description": "Select Puppet version to install."
+        },
+        "installBolt": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install Bolt, a tool to orchestrate and automate manual work without the need for an agent."
         }
     },
     "customizations": {

diff --git a/src/puppet/install.sh b/src/puppet/install.sh
@@ -3,6 +3,7 @@
 set -e
 
 PUPPET_VERSION=${VERSION:-"latest"}
+INSTALL_BOLT=${INSTALLBOLT:-"false"}
 PUPPET_RELEASE_GPG_KEY="D6811ED3ADEEB8441AF5AA8F4528B6CD9E61EF26"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
@@ -101,6 +102,10 @@ echo "deb [arch=${ARCHITECTURE} signed-by=/usr/share/keyrings/puppet.gpg] https:
 apt-get update -y
 apt-get install -y puppet-agent pdk
 
+if [[ $INSTALL_BOLT == "true" ]]; then
+    apt-get install -y puppet-bolt
+fi
+
 # Clean up
 rm -rf /tmp/tmp-gnupg
 rm -rf /var/lib/apt/lists/*

diff --git a/test/puppet/install_bolt.sh b/test/puppet/install_bolt.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+check "puppet version" puppet --version
+check "bolt version" bolt --version
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
diff --git a/test/puppet/scenarios.json b/test/puppet/scenarios.json
@@ -13,5 +13,13 @@
                 "version": "7"
             }
         }
+    },
+    "install_bolt": {
+        "image": "debian:bullseye",
+        "features": {
+            "puppet": {
+                "installBolt": "true"
+            }
+        }
     }
 }