Merge pull request #1791 from hashicorp/NET-5176-fix-specs

[NET-5176] Fix repo tests, changelog and bump repo version to 0.33.0
hashicorp · Aug 9, 2023 · 15b89c9 · 15b89c9
2 parents 46a38b7 + 560ac5a
commit 15b89c9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## v0.33.0 (August 9, 2023)
+
+IMPROVEMENTS:
+* Add support for setting Vault CA from VAULT_CACERT_BYTES. [GH-1782](https://github.com/hashicorp/consul-template/pull/1782)
+* Add CLI support for exec env configs. [GH-1761](https://github.com/hashicorp/consul-template/pull/1761)
+* Add function for HMAC SHA256. [GH-1760](https://github.com/hashicorp/consul-template/pull/1760)
+* Bump go version from 1.19 to 1.20. [GH-1783](https://github.com/hashicorp/consul-template/pull/1783)
+* Bump hashicorp/consul/api from 1.13.0 to 1.23.0. [GH-1781](https://github.com/hashicorp/consul-template/pull/1781) & [GH-1758](https://github.com/hashicorp/consul-template/pull/1758)
+* Bump BurntSushi/toml from 1.2.1 to 1.3.2. [GH-1766](https://github.com/hashicorp/consul-template/pull/1766)
+* Bump golang.org/x/sys from 0.10.0 to 0.11.0. [GH-1788](https://github.com/hashicorp/consul-template/pull/1788)
+* Bump golang.org/x/net from 0.12.0 to 0.13.0. [GH-1784](https://github.com/hashicorp/consul-template/pull/1784)
+* Bump golang.org/x/text from 0.7.0 to 0.10.0. [GH-1763](https://github.com/hashicorp/consul-template/pull/1763)
+* Bump stretchr/testify from 1.8.2 to 1.8.4. [GH-1757](https://github.com/hashicorp/consul-template/pull/1757)
+* Bump hashicorp/vault/api/auth/kubernetes from 0.3.0 to 0.4.1. [GH-1755](https://github.com/hashicorp/consul-template/pull/1755)
+
+REPO MAINTENANCE:
+* Code quality fixes and various lint improvements. [GH-1762](https://github.com/hashicorp/consul-template/pull/1762)
+
+
 ## v0.32.0 (May 18, 2023)
 
 IMPROVEMENTS:

diff --git a/dependency/catalog_node_test.go b/dependency/catalog_node_test.go
@@ -99,6 +99,7 @@ func TestCatalogNodeQuery_Fetch(t *testing.T) {
 					},
 					Meta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 				},
 				Services: []*CatalogNodeService{

diff --git a/dependency/catalog_nodes_test.go b/dependency/catalog_nodes_test.go
@@ -92,6 +92,7 @@ func TestCatalogNodesQuery_Fetch(t *testing.T) {
 					},
 					Meta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 				},
 			},

diff --git a/dependency/catalog_service_test.go b/dependency/catalog_service_test.go
@@ -164,6 +164,7 @@ func TestCatalogServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceID:      "consul",
 					ServiceName:    "consul",
@@ -188,6 +189,7 @@ func TestCatalogServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceID:      "service-meta",
 					ServiceName:    "service-meta",

diff --git a/dependency/health_service_test.go b/dependency/health_service_test.go
@@ -182,6 +182,7 @@ func TestHealthConnectServiceQuery_Fetch(t *testing.T) {
 					Tags:        ServiceTags([]string{}),
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					Weights: api.AgentWeights{
 						Passing: 1,
@@ -239,6 +240,7 @@ func TestHealthServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceMeta: map[string]string{},
 					Address:     testConsul.Config.Bind,
@@ -272,6 +274,7 @@ func TestHealthServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceMeta: map[string]string{},
 					Address:     testConsul.Config.Bind,
@@ -300,6 +303,7 @@ func TestHealthServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceMeta: map[string]string{
 						"meta1": "value1",
@@ -329,6 +333,7 @@ func TestHealthServiceQuery_Fetch(t *testing.T) {
 					},
 					NodeMeta: map[string]string{
 						"consul-network-segment": "",
+						"consul-version":         "1.16.1",
 					},
 					ServiceMeta: map[string]string{},
 					Address:     testConsul.Config.Bind,

diff --git a/version/version.go b/version/version.go
@@ -6,7 +6,7 @@ package version
 import "fmt"
 
 const (
-	Version           = "0.32.0"
+	Version           = "0.33.0"
 	VersionPrerelease = "" // "-dev", "-beta", "-rc1", etc. (include dash)
 )