scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add minimum_retention_months to config endpoint (#20150)

Browse Source
This commit is contained in:
Mike Palmiotto
2023-04-13 14:33:23 -04:00
committed by GitHub
parent fc21d357ff
commit 002a59a370
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/20150.txt Normal file
View File

@@ -0,0 +1,4 @@
```release-note:improvement
api: `/sys/internal/counters/config` endpoint now contains read-only
`minimum_retention_months`.
```

39
vault/activity_log_test.go
View File

@@ -834,12 +834,13 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
defaults := map[string]interface{}{ defaults := map[string]interface{}{
"default_report_months": 12, "default_report_months": 12,
"retention_months": 24, "retention_months": 24,
"enabled": activityLogEnabledDefaultValue, "enabled": activityLogEnabledDefaultValue,
"queries_available": false, "queries_available": false,
"reporting_enabled": core.censusLicensingEnabled, "reporting_enabled": core.censusLicensingEnabled,
"billing_start_timestamp": core.GetBillingStart(), "billing_start_timestamp": core.GetBillingStart(),
"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
} }
if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 { if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 {
@@ -917,12 +918,13 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
expected := map[string]interface{}{ expected := map[string]interface{}{
"default_report_months": 1, "default_report_months": 1,
"retention_months": 2, "retention_months": 2,
"enabled": "enable", "enabled": "enable",
"queries_available": false, "queries_available": false,
"reporting_enabled": false, "reporting_enabled": core.censusLicensingEnabled,
"billing_start_timestamp": core.GetBillingStart(), "billing_start_timestamp": core.GetBillingStart(),
"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
} }
if diff := deep.Equal(resp.Data, expected); len(diff) > 0 { if diff := deep.Equal(resp.Data, expected); len(diff) > 0 {
@@ -955,12 +957,13 @@ func TestActivityLog_API_ConfigCRUD(t *testing.T) {
} }
defaults := map[string]interface{}{ defaults := map[string]interface{}{
"default_report_months": 12, "default_report_months": 12,
"retention_months": 24, "retention_months": 24,
"enabled": activityLogEnabledDefaultValue, "enabled": activityLogEnabledDefaultValue,
"queries_available": false, "queries_available": false,
"reporting_enabled": false, "reporting_enabled": core.censusLicensingEnabled,
"billing_start_timestamp": core.GetBillingStart(), "billing_start_timestamp": core.GetBillingStart(),
"minimum_retention_months": core.activityLog.configOverrides.MinimumRetentionMonths,
} }
if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 { if diff := deep.Equal(resp.Data, defaults); len(diff) > 0 {

13
vault/logical_system_activity.go
View File

@@ -304,12 +304,13 @@ func (b *SystemBackend) handleActivityConfigRead(ctx context.Context, req *logic
return &logical.Response{ return &logical.Response{
Data: map[string]interface{}{ Data: map[string]interface{}{
"default_report_months": config.DefaultReportMonths, "default_report_months": config.DefaultReportMonths,
"retention_months": config.RetentionMonths, "retention_months": config.RetentionMonths,
"enabled": config.Enabled, "enabled": config.Enabled,
"queries_available": qa, "queries_available": qa,
"reporting_enabled": b.Core.censusLicensingEnabled, "reporting_enabled": b.Core.censusLicensingEnabled,
"billing_start_timestamp": b.Core.GetBillingStart(), "billing_start_timestamp": b.Core.GetBillingStart(),
"minimum_retention_months": a.configOverrides.MinimumRetentionMonths,
}, },
}, nil }, nil
} }