Revert "backport of commit 4b6ec40 (hashicorp#20118)" (hashicorp#20143)

This reverts commit a9d2962.
fopina · Apr 13, 2023 · 4fa8fac · 4fa8fac
1 parent c110d97
commit 4fa8fac
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/changelog/20078.txt b/changelog/20078.txt
diff --git a/vault/logical_system_activity.go b/vault/logical_system_activity.go
@@ -348,10 +348,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
 		return logical.ErrorResponse("retention_months cannot be 0 while enabled"), logical.ErrInvalidRequest
 	}
 
-	if a.core.censusLicensingEnabled && config.RetentionMonths < a.configOverrides.MinimumRetentionMonths {
-		return logical.ErrorResponse("retention_months must be at least %d while Reporting is enabled", a.configOverrides.MinimumRetentionMonths), logical.ErrInvalidRequest
-	}
-
 	// Store the config
 	entry, err := logical.StorageEntryJSON(path.Join(activitySubPath, activityConfigKey), config)
 	if err != nil {