chore(actions): bump actions/upload-artifact from 4 to 5

.github/dependabot.yml

@@ -7,7 +7,7 @@ updates:
       - actions
       - Skip Changelog
     commit-message:
-      prefix: "chore: "
+      prefix: "chore(actions): "
     schedule:
       interval: weekly
       day: sunday
@@ -18,7 +18,7 @@ updates:
       - docker
       - Skip Changelog
     commit-message:
-      prefix: "chore: "
+      prefix: "chore(deps): "
     schedule:
       interval: weekly
       day: sunday
@@ -29,7 +29,7 @@ updates:
       - go
       - Skip Changelog
     commit-message:
-      prefix: "chore: "
+      prefix: "chore(deps): "
     schedule:
       interval: weekly
       day: sunday

.github/workflows/build.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Create Helm Compose Distributions
         run: make dist
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: helm-compose
           path: release/*

.github/workflows/ci.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Install Helm Compose
         run: make install
 
-      - uses: helm/kind-action@v1.10.0
+      - uses: helm/kind-action@v1.12.0
 
       - name: Run Helm Compose
         run: helm compose up -f examples/simple-compose.yaml

.github/workflows/dependabot-automerge.yaml

@@ -3,6 +3,7 @@ on: pull_request
 
 permissions:
   pull-requests: write
+  contents: write
 
 jobs:
   dependabot:
@@ -22,7 +23,7 @@ jobs:
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Auto-merge PR
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --rebase "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/docs.yaml

@@ -20,8 +20,6 @@ jobs:
           fetch-tags: true
 
       - uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
 
       - name: Run generate cache key
         run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
@@ -33,8 +31,9 @@ jobs:
           restore-keys: |
             mkdocs-
 
-      - name: Run setup mkdocs dependencies
-        run: pip install mkdocs mkdocs-material mkdocs-autolinks-plugin mkdocs-drawio-file mkdocs-git-revision-date-localized-plugin fontawesome_markdown mike pymdown-extensions
+      - name: Install dependencies
+        run: |
+          pip install mkdocs mkdocs-material mkdocs-autolinks-plugin mkdocs-drawio mkdocs-git-revision-date-localized-plugin fontawesome_markdown mike pymdown-extensions
 
       - name: Run mkdocs deployment
         run: |
@@ -52,4 +51,3 @@ jobs:
           SHORT_VERSION=${LATEST_TAG%.*}
 
           mike deploy -b gh-pages -p -F mkdocs.yaml -u ${SHORT_VERSION} latest
-

CHANGELOG.md

@@ -1,4 +1,8 @@
-# Changes since 1.3.0
+# Changes since 1.4.0
+# 1.4.0
+- chore(deps): bump to golang 1.24
+- feat: add full environment substitution
+
 # 1.3.0
 - feat: add templating command
 - chore: upgrade to golang 1.22

README.md

@@ -15,7 +15,7 @@ It is requirement to use helm v3.10.0+.
 Install a specific version of helm compose (recommended). Click [here](https://github.com/seacrew/helm-compose/releases/latest) for the latest version.
 
 ```
-helm plugin install https://github.com/seacrew/helm-compose --version 1.3.0
+helm plugin install https://github.com/seacrew/helm-compose --version 1.4.0
 ```
 
 Install the latest version.

docs/key-features-and-use-cases.md

@@ -61,9 +61,21 @@ repositories:
 
 ### Environment variables
 
-`helm-compose` is able to inject environment variables inside your values block to deal with secrets that shouldn't be committed to your source control.
+`helm-compose` utilizes [a8m/envsubst](https://github.com/a8m/envsubst?tab=readme-ov-file#docs) to substitute environment variables inside your values block. This allows for better dealing with secrets that shouldn't be committed to your source control.
+
+|__Expression__     | __Meaning__    |
+| ----------------- | -------------- |
+|`${var}`           | Value of var (same as `$var`)
+|`${var-$DEFAULT}`  | If var not set, evaluate expression as $DEFAULT
+|`${var:-$DEFAULT}` | If var not set or is empty, evaluate expression as $DEFAULT
+|`${var=$DEFAULT}`  | If var not set, evaluate expression as $DEFAULT
+|`${var:=$DEFAULT}` | If var not set or is empty, evaluate expression as $DEFAULT
+|`${var+$OTHER}`    | If var set, evaluate expression as $OTHER, otherwise as empty string
+|`${var:+$OTHER}`   | If var set, evaluate expression as $OTHER, otherwise as empty string
+|`$${var}`            | Escape expressions. Result will be `${var}`. 
+
+<sub>Most of the rows in this table were taken from [here](http://www.tldp.org/LDP/abs/html/refcards.html#AEN22728)</sub>
 
-Syntax: `${MY_ENV_VARIABLE}`.
 
 ```bash
 export WORDPRESS_ADMIN_PASSWORD="xxx"

docs/quick-start.md

@@ -5,7 +5,7 @@
 Install a specific version (recommended). Click [here](https://github.com/seacrew/helm-compose/releases/latest) for the latest version.
 
 ```
-helm plugin install https://github.com/seacrew/helm-compose --version 1.3.0
+helm plugin install https://github.com/seacrew/helm-compose --version 1.4.0
 ```
 
 Install latest version.

examples/s3-storage-compose.yaml

@@ -17,9 +17,9 @@ releases:
       - ./values/wordpress.yaml
     values:
       wordpressBlogName: Awesome Site
-      wordpressPassword: "${WORDPRESS_PASSWORD}}"
+      wordpressPassword: "${WORDPRESS_PASSWORD}"
       mariadb.auth:
-        rootPassword: "${MARIADB_ROOT_PASSWORD}}"
+        rootPassword: "${MARIADB_ROOT_PASSWORD}"
 
 repositories:
   bitnami: https://charts.bitnami.com/bitnami

go.mod

@@ -1,60 +1,64 @@
 module github.com/seacrew/helm-compose
 
-go 1.22.0
-
-toolchain go1.22.2
+go 1.24
 
 require (
 	github.com/Masterminds/semver v1.5.0
-	github.com/aws/aws-sdk-go v1.53.7
+	github.com/aws/aws-sdk-go v1.55.6
 	github.com/jwalton/go-supportscolor v1.2.0
-	github.com/spf13/cobra v1.8.0
-	github.com/stretchr/testify v1.9.0
+	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.10.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.30.1
-	k8s.io/client-go v0.30.1
+	k8s.io/apimachinery v0.32.3
+	k8s.io/client-go v0.32.3
 )
 
 require (
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/a8m/envsubst v1.4.3 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.20.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/oauth2 v0.29.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.30.1
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
-	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/api v0.32.3
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )