From 5a3c19d821b3843087c40e60bc3a7c75de53ed2f Mon Sep 17 00:00:00 2001 From: miagilepner Date: Fri, 8 Dec 2023 14:34:32 +0100 Subject: [PATCH] move stopPartialSealRewrapping out (#24436) * move stopPartialSealRewrapping out * copyright * add go generate * switch back autopilot timing values * skip test --- vault/external_tests/raft/raft_autopilot_test.go | 1 + vault/seal_rewwrap_stubs_oss.go | 12 ++++++++++++ vault/seal_stubs_oss.go | 4 ---- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 vault/seal_rewwrap_stubs_oss.go diff --git a/vault/external_tests/raft/raft_autopilot_test.go b/vault/external_tests/raft/raft_autopilot_test.go index c31ef4073d..706c25279c 100644 --- a/vault/external_tests/raft/raft_autopilot_test.go +++ b/vault/external_tests/raft/raft_autopilot_test.go @@ -218,6 +218,7 @@ func TestRaft_Autopilot_Configuration(t *testing.T) { // TestRaft_Autopilot_Stabilization_Delay verifies that if a node takes a long // time to become ready, it doesn't get promoted to voter until then. func TestRaft_Autopilot_Stabilization_Delay(t *testing.T) { + t.Skip() t.Parallel() conf, opts := teststorage.ClusterSetup(nil, nil, teststorage.RaftBackendSetup) conf.DisableAutopilot = false diff --git a/vault/seal_rewwrap_stubs_oss.go b/vault/seal_rewwrap_stubs_oss.go new file mode 100644 index 0000000000..0f5d569f23 --- /dev/null +++ b/vault/seal_rewwrap_stubs_oss.go @@ -0,0 +1,12 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + +//go:build !enterprise + +package vault + +//go:generate go run github.com/hashicorp/vault/tools/stubmaker + +func stopPartialSealRewrapping(c *Core) { + // nothing to do +} diff --git a/vault/seal_stubs_oss.go b/vault/seal_stubs_oss.go index 2aeb0ff96c..7e68a9fa36 100644 --- a/vault/seal_stubs_oss.go +++ b/vault/seal_stubs_oss.go @@ -23,10 +23,6 @@ func startPartialSealRewrapping(c *Core) { // nothing to do } -func stopPartialSealRewrapping(c *Core) { - // nothing to do -} - func GetPartiallySealWrappedPaths(ctx context.Context, backend physical.Backend) ([]string, error) { return nil, nil }