Revert #18683 (#18942)

* Revert "Don't execute the seal recovery tests on ENT. (#18841)"

This reverts commit 990d3bacc2.

* Revert "Add the ability to unseal using recovery keys via an explicit seal option. (#18683)"

This reverts commit 2ffe49aab0.

command/operator_init.go

@@ -29,11 +29,10 @@ type OperatorInitCommand struct {
 	flagRootTokenPGPKey string
 
 	// Auto Unseal
-	flagRecoveryShares        int
-	flagRecoveryThreshold     int
-	flagRecoveryPGPKeys       []string
-	flagStoredShares          int
-	flagDisableUnsealRecovery bool
+	flagRecoveryShares    int
+	flagRecoveryThreshold int
+	flagRecoveryPGPKeys   []string
+	flagStoredShares      int
 
 	// Consul
 	flagConsulAuto    bool
@@ -150,13 +149,6 @@ func (c *OperatorInitCommand) Flags() *FlagSets {
 		Usage:   "DEPRECATED: This flag does nothing. It will be removed in Vault 1.3.",
 	})
 
-	f.BoolVar(&BoolVar{
-		Name:    "disable-unseal-recovery",
-		Target:  &c.flagDisableUnsealRecovery,
-		Default: false,
-		Usage:   "If disabled, unsealing Vault using recovery keys is not possible.",
-	})
-
 	// Consul Options
 	f = set.NewFlagSet("Consul Options")
 
@@ -288,10 +280,9 @@ func (c *OperatorInitCommand) Run(args []string) int {
 		PGPKeys:         c.flagPGPKeys,
 		RootTokenPGPKey: c.flagRootTokenPGPKey,
 
-		RecoveryShares:         c.flagRecoveryShares,
-		RecoveryThreshold:      c.flagRecoveryThreshold,
-		RecoveryPGPKeys:        c.flagRecoveryPGPKeys,
-		UnsealRecoveryDisabled: c.flagDisableUnsealRecovery,
+		RecoveryShares:    c.flagRecoveryShares,
+		RecoveryThreshold: c.flagRecoveryThreshold,
+		RecoveryPGPKeys:   c.flagRecoveryPGPKeys,
 	}
 
 	// Check auto mode