From d0a74971fbbc1c0ab8ccf79f2225e682e8e24c1e Mon Sep 17 00:00:00 2001
From: Mukul Anand <anandmukul93@gmail.com>
Date: Thu, 13 Feb 2025 04:12:55 +0530
Subject: [PATCH 1/2] Update CHANGELOG and version files

---
 CHANGELOG.md       | 16 ++++++++++++++++
 version/version.go |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 988f00060..415ac35b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 0.39.2 (February 13, 2025)
+
+IMPROVEMENTS:
+* Bump github.com/hashicorp/go-retryablehttp from v0.7.2 to v0.7.7 due to CVE [GH-1967](https://github.com/hashicorp/consul-template/pull/1967)
+* Bump golang.org/x/net to v0.34.0 from v0.24.0 [GH-2017](https://github.com/hashicorp/consul-template/pull/2017)
+* Bump golang.org/x/crypto to v0.32.0 from v0.22.0 [GH-2017](https://github.com/hashicorp/consul-template/pull/2017)
+* Bump golang.org/x/sys to v0.29.0 from v0.20.0 [GH-2017](https://github.com/hashicorp/consul-template/pull/2017)
+* Bump golang.org/x/text to v0.21.0 from v0.14.0 [GH-2017](https://github.com/hashicorp/consul-template/pull/2017)
+* Add support for the Vault KV subkeys API path [GH-2016](https://github.com/hashicorp/consul-template/pull/2016)
+
+REPO MAINTENANCE:
+* Update code owner file [GH-2006](https://github.com/hashicorp/consul-template/pull/2006)
+
+BUG FIXES:
+* Add quiescence run flag to avoid render loops among multiple templates [GH-2010](https://github.com/hashicorp/consul-template/pull/2010)
+
 # 0.39.1 (July 16, 2024)
 
 IMPROVEMENTS:
diff --git a/version/version.go b/version/version.go
index 4ffea608b..4ed240676 100644
--- a/version/version.go
+++ b/version/version.go
@@ -6,7 +6,7 @@ package version
 import "fmt"
 
 const (
-	Version           = "0.39.1"
+	Version           = "0.39.2"
 	VersionPrerelease = "" // "-dev", "-beta", "-rc1", etc. (include dash)
 )
 

From af3dba1ddcf683b2296fba67db900163e68ecc8c Mon Sep 17 00:00:00 2001
From: Mukul Anand <anandmukul93@gmail.com>
Date: Fri, 14 Feb 2025 02:37:04 +0530
Subject: [PATCH 2/2] - Removing caching for post set up go step issue for CI
 workflow - Increasing timeout and verbosity for workflow logs - Fixed fail
 fast issue for two jobs in workflow to fail independently and avoid caching
 race conditions

---
 .github/workflows/ci.yml | 2 ++
 Makefile                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff3716e4f..74d4b8299 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
     name: Run test cases (with consul${{ matrix.consul-ent-tag }})
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
         go: [^1]
@@ -27,6 +28,7 @@ jobs:
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version: ${{ matrix.go }}
+          cache: false
 
       - name: Install Consul${{ matrix.consul-ent-tag }}, Vault and Nomad for integration testing
         run: |
diff --git a/Makefile b/Makefile
index 6f31f9226..2b0827161 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ test:
 # test-race runs the test suite.
 test-race:
 	@echo "==> Testing ${NAME} (race)"
-	@go test -timeout=60s -race -tags="${GOTAGS}" ./... ${TESTARGS}
+	@go test -v -timeout=120s -race -tags="${GOTAGS}" ./... ${TESTARGS}
 .PHONY: test-race
 
 # _cleanup removes any previous binaries