From 4fa8facbd18239b4820064dc669b4466c1913486 Mon Sep 17 00:00:00 2001
From: miagilepner <mia.epner@hashicorp.com>
Date: Thu, 13 Apr 2023 16:10:51 +0200
Subject: [PATCH] Revert "backport of commit
4b6ec4079d1bdccde4cab416417a296c8c233c1b (#20118)" (#20143)
This reverts commit a9d296234e4b5cce6a662bacf362ae4b2ba47333.
---
changelog/20078.txt | 3 ---
vault/logical_system_activity.go | 4 ----
2 files changed, 7 deletions(-)
delete mode 100644 changelog/20078.txt
diff --git a/changelog/20078.txt b/changelog/20078.txt
deleted file mode 100644
index 8749354b315d..000000000000
--- a/changelog/20078.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-core/activity: error when attempting to update retention configuration below the minimum
-```
\ No newline at end of file
diff --git a/vault/logical_system_activity.go b/vault/logical_system_activity.go
index 2c1dde1ee126..9c121db67829 100644
--- 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 {