From 8f064b90ecd27587f6cd8c0f263ccd398db4b093 Mon Sep 17 00:00:00 2001 From: Kuba Wieczorek Date: Tue, 28 Nov 2023 14:22:33 +0000 Subject: [PATCH] [VAULT-22270] API: add enterprise field to the response from /sys/health/ endpoint (#24270) --- changelog/24270.txt | 3 +++ http/sys_health.go | 3 +++ http/sys_health_test.go | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 changelog/24270.txt diff --git a/changelog/24270.txt b/changelog/24270.txt new file mode 100644 index 0000000000..eb8e4c04fb --- /dev/null +++ b/changelog/24270.txt @@ -0,0 +1,3 @@ +```release-note:change +api: add the `enterprise` parameter to the `/sys/health` endpoint +``` diff --git a/http/sys_health.go b/http/sys_health.go index d0c4362a8a..b5e92961d1 100644 --- a/http/sys_health.go +++ b/http/sys_health.go @@ -12,6 +12,7 @@ import ( "time" "github.com/hashicorp/go-secure-stdlib/parseutil" + "github.com/hashicorp/vault/helper/constants" "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/version" @@ -204,6 +205,7 @@ func getSysHealth(core *vault.Core, r *http.Request) (int, *HealthResponse, erro ReplicationDRMode: replicationState.GetDRString(), ServerTimeUTC: time.Now().UTC().Unix(), Version: version.GetVersion().VersionNumber(), + Enterprise: constants.IsEnterprise, ClusterName: clusterName, ClusterID: clusterID, } @@ -245,6 +247,7 @@ type HealthResponse struct { ReplicationDRMode string `json:"replication_dr_mode"` ServerTimeUTC int64 `json:"server_time_utc"` Version string `json:"version"` + Enterprise bool `json:"enterprise"` ClusterName string `json:"cluster_name,omitempty"` ClusterID string `json:"cluster_id,omitempty"` LastWAL uint64 `json:"last_wal,omitempty"` diff --git a/http/sys_health_test.go b/http/sys_health_test.go index 48caa6e1ca..83ec63db00 100644 --- a/http/sys_health_test.go +++ b/http/sys_health_test.go @@ -10,6 +10,7 @@ import ( "reflect" "testing" + "github.com/hashicorp/vault/helper/constants" "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/vault" ) @@ -26,6 +27,7 @@ func TestSysHealth_get(t *testing.T) { var actual map[string]interface{} expected := map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "initialized": false, @@ -60,6 +62,7 @@ func TestSysHealth_get(t *testing.T) { actual = map[string]interface{}{} expected = map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "initialized": true, @@ -98,6 +101,7 @@ func TestSysHealth_get(t *testing.T) { actual = map[string]interface{}{} expected = map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(), "replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(), "initialized": true, @@ -141,6 +145,7 @@ func TestSysHealth_customcodes(t *testing.T) { var actual map[string]interface{} expected := map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "initialized": false, @@ -176,6 +181,7 @@ func TestSysHealth_customcodes(t *testing.T) { actual = map[string]interface{}{} expected = map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "initialized": true, @@ -215,6 +221,7 @@ func TestSysHealth_customcodes(t *testing.T) { actual = map[string]interface{}{} expected = map[string]interface{}{ + "enterprise": constants.IsEnterprise, "replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(), "replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(), "initialized": true,