scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VAULT-22270] API: add enterprise field to the response from /sys/health/ endpoint (#24270)

Browse Source
This commit is contained in:
Kuba Wieczorek
2023-11-28 14:22:33 +00:00
committed by GitHub
parent 51d99fc7cf
commit 8f064b90ec
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/24270.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:change
api: add the `enterprise` parameter to the `/sys/health` endpoint
```

3
http/sys_health.go
View File

@@ -12,6 +12,7 @@ import (
"time" "time"
"github.com/hashicorp/go-secure-stdlib/parseutil" "github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/helper/constants"
"github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault"
"github.com/hashicorp/vault/version" "github.com/hashicorp/vault/version"
@@ -204,6 +205,7 @@ func getSysHealth(core *vault.Core, r *http.Request) (int, *HealthResponse, erro
ReplicationDRMode: replicationState.GetDRString(), ReplicationDRMode: replicationState.GetDRString(),
ServerTimeUTC: time.Now().UTC().Unix(), ServerTimeUTC: time.Now().UTC().Unix(),
Version: version.GetVersion().VersionNumber(), Version: version.GetVersion().VersionNumber(),
Enterprise: constants.IsEnterprise,
ClusterName: clusterName, ClusterName: clusterName,
ClusterID: clusterID, ClusterID: clusterID,
} }
@@ -245,6 +247,7 @@ type HealthResponse struct {
ReplicationDRMode string `json:"replication_dr_mode"` ReplicationDRMode string `json:"replication_dr_mode"`
ServerTimeUTC int64 `json:"server_time_utc"` ServerTimeUTC int64 `json:"server_time_utc"`
Version string `json:"version"` Version string `json:"version"`
Enterprise bool `json:"enterprise"`
ClusterName string `json:"cluster_name,omitempty"` ClusterName string `json:"cluster_name,omitempty"`
ClusterID string `json:"cluster_id,omitempty"` ClusterID string `json:"cluster_id,omitempty"`
LastWAL uint64 `json:"last_wal,omitempty"` LastWAL uint64 `json:"last_wal,omitempty"`

7
http/sys_health_test.go
View File

@@ -10,6 +10,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/hashicorp/vault/helper/constants"
"github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault"
) )
@@ -26,6 +27,7 @@ func TestSysHealth_get(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(),
"initialized": false, "initialized": false,
@@ -60,6 +62,7 @@ func TestSysHealth_get(t *testing.T) {
actual = map[string]interface{}{} actual = map[string]interface{}{}
expected = map[string]interface{}{ expected = map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(),
"initialized": true, "initialized": true,
@@ -98,6 +101,7 @@ func TestSysHealth_get(t *testing.T) {
actual = map[string]interface{}{} actual = map[string]interface{}{}
expected = map[string]interface{}{ expected = map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(), "replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(), "replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(),
"initialized": true, "initialized": true,
@@ -141,6 +145,7 @@ func TestSysHealth_customcodes(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(),
"initialized": false, "initialized": false,
@@ -176,6 +181,7 @@ func TestSysHealth_customcodes(t *testing.T) {
actual = map[string]interface{}{} actual = map[string]interface{}{}
expected = map[string]interface{}{ expected = map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(), "replication_performance_mode": consts.ReplicationUnknown.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationUnknown.GetDRString(), "replication_dr_mode": consts.ReplicationUnknown.GetDRString(),
"initialized": true, "initialized": true,
@@ -215,6 +221,7 @@ func TestSysHealth_customcodes(t *testing.T) {
actual = map[string]interface{}{} actual = map[string]interface{}{}
expected = map[string]interface{}{ expected = map[string]interface{}{
"enterprise": constants.IsEnterprise,
"replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(), "replication_performance_mode": consts.ReplicationPerformanceDisabled.GetPerformanceString(),
"replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(), "replication_dr_mode": consts.ReplicationDRDisabled.GetDRString(),
"initialized": true, "initialized": true,