Revert "backport of commit b4fab6a (#20117)" (#20142)

This reverts commit 57086ad.
hashicorp · Apr 13, 2023 · 5d13255 · 5d13255
1 parent 4fa8fac
commit 5d13255
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 24 deletions.
diff --git a/changelog/19891.txt b/changelog/19891.txt
diff --git a/command/server/config_test_helpers.go b/command/server/config_test_helpers.go
@@ -1097,7 +1097,6 @@ func testParseSeals(t *testing.T) {
 			},
 		},
 	}
-	addExpectedDefaultEntConfig(expected)
 	config.Prune()
 	require.Equal(t, config, expected)
 }

diff --git a/command/server/config_test_helpers_util.go b/command/server/config_test_helpers_util.go
@@ -3,5 +3,4 @@
 package server
 
 func addExpectedEntConfig(c *Config, sentinelModules []string)                         {}
-func addExpectedDefaultEntConfig(c *Config)                                            {}
 func addExpectedEntSanitizedConfig(c map[string]interface{}, sentinelModules []string) {}
diff --git a/vault/activity_log.go b/vault/activity_log.go
@@ -193,9 +193,6 @@ type ActivityLogCoreConfig struct {
 
 	// CensusReportInterval is the testing configuration for time
 	CensusReportInterval time.Duration
-
-	// MinimumRetentionMonths defines the minimum value for retention
-	MinimumRetentionMonths int
 }
 
 // NewActivityLog creates an activity log.
@@ -956,10 +953,6 @@ func (a *ActivityLog) SetConfigInit(config activityConfig) {
 	a.defaultReportMonths = config.DefaultReportMonths
 	a.retentionMonths = config.RetentionMonths
 
-	if a.retentionMonths < a.configOverrides.MinimumRetentionMonths {
-		a.retentionMonths = a.configOverrides.MinimumRetentionMonths
-	}
-
 	if a.configOverrides.CensusReportInterval > 0 {
 		a.CensusReportInterval = a.configOverrides.CensusReportInterval
 	}
@@ -1017,9 +1010,6 @@ func (a *ActivityLog) SetConfig(ctx context.Context, config activityConfig) {
 
 	a.defaultReportMonths = config.DefaultReportMonths
 	a.retentionMonths = config.RetentionMonths
-	if a.retentionMonths < a.configOverrides.MinimumRetentionMonths {
-		a.retentionMonths = a.configOverrides.MinimumRetentionMonths
-	}
 
 	// check for segments out of retention period, if it has changed
 	go a.retentionWorker(ctx, time.Now(), a.retentionMonths)

diff --git a/vault/core.go b/vault/core.go
@@ -641,9 +641,6 @@ type Core struct {
 	// censusAgent is the mechanism used for reporting Vault's billing data.
 	censusAgent *CensusAgent
 
-	// censusLicensingEnabled records whether Vault is exporting census metrics
-	censusLicensingEnabled bool
-
 	// activeTime is set on active nodes indicating the time at which this node
 	// became active.
 	activeTime time.Time

diff --git a/vault/logical_system_activity.go b/vault/logical_system_activity.go
@@ -322,11 +322,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
 			if config.Enabled == "enable" && enabledStr == "disable" ||
 				!activityLogEnabledDefault && config.Enabled == "enable" && enabledStr == "default" ||
 				activityLogEnabledDefault && config.Enabled == "default" && enabledStr == "disable" {
-
-				// if census is enabled, the activity log cannot be disabled
-				if a.core.censusLicensingEnabled {
-					return logical.ErrorResponse("cannot disable the activity log while Reporting is enabled"), logical.ErrInvalidRequest
-				}
 				warnings = append(warnings, "the current monthly segment will be deleted because the activity log was disabled")
 			}
 

diff --git a/vault/testing.go b/vault/testing.go
@@ -236,7 +236,6 @@ func TestCoreWithSealAndUINoCleanup(t testing.T, opts *CoreConfig) *Core {
 	}
 
 	conf.ActivityLogConfig = opts.ActivityLogConfig
-	testApplyEntBaseConfig(conf, opts)
 
 	c, err := NewCore(conf)
 	if err != nil {