docker: support referencing env vars in rolecule.yml (#15)

* docker: support referencing env vars in rolecule.yml * Add env var expansion support for podman engine --------- Co-authored-by: gurpalw <[email protected]> Co-authored-by: z0mbix <[email protected]>
z0mbix · Oct 16, 2024 · 396f2d5 · 396f2d5
1 parent 4596d2d
commit 396f2d5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pkg/container/docker.go b/pkg/container/docker.go
@@ -2,6 +2,7 @@ package container
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/apex/log"
@@ -28,13 +29,12 @@ func (p *DockerEngine) Run(image string, args []string) (string, error) {
 }
 
 func (p *DockerEngine) Exec(containerName string, envVars map[string]string, cmd string, args []string) error {
-	execArgs := []string{
-		"exec",
-	}
+	execArgs := []string{"exec"}
 
 	for k, v := range envVars {
+		// Expand environment variables within the value if they exist using os.ExpandEnv
 		execArgs = append(execArgs, "--env")
-		execArgs = append(execArgs, fmt.Sprintf("%s=%s", k, v))
+		execArgs = append(execArgs, fmt.Sprintf("%s=%s", k, os.ExpandEnv(v)))
 	}
 
 	execArgs = append(execArgs, containerName)

diff --git a/pkg/container/podman.go b/pkg/container/podman.go
@@ -2,6 +2,7 @@ package container
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/apex/log"
 	"github.com/z0mbix/rolecule/pkg/command"
@@ -36,7 +37,7 @@ func (p *PodmanEngine) Exec(containerName string, envVars map[string]string, cmd
 	if len(envVars) > 0 {
 		for k, v := range envVars {
 			execArgs = append(execArgs, "--env")
-			execArgs = append(execArgs, fmt.Sprintf("%s=%s", k, v))
+			execArgs = append(execArgs, fmt.Sprintf("%s=%s", k, os.ExpandEnv(v)))
 		}
 	}
 

diff --git a/testing/ansible/roles/sysctl/tasks/main.yml b/testing/ansible/roles/sysctl/tasks/main.yml
@@ -5,7 +5,7 @@
     value: "{{ ansible_swappiness }}"
     state: present
   tags:
-      - provision
+    - provision
 
 - name: output swappiness
   ansible.builtin.debug: