From 154b781bc8c75c1c3e29086b3904516a1c90cb52 Mon Sep 17 00:00:00 2001 From: "Chris S. Kim" Date: Wed, 16 Feb 2022 12:56:38 -0500 Subject: [PATCH] Move IndexEntryName helpers to common files (#12365) --- agent/consul/state/kvs_oss.go | 8 -------- agent/consul/state/schema_oss.go | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 agent/consul/state/schema_oss.go diff --git a/agent/consul/state/kvs_oss.go b/agent/consul/state/kvs_oss.go index 54387e0d93..598ffc39df 100644 --- a/agent/consul/state/kvs_oss.go +++ b/agent/consul/state/kvs_oss.go @@ -116,11 +116,3 @@ func kvsDeleteWithEntry(tx WriteTxn, entry *structs.DirEntry, idx uint64) error return nil } - -func partitionedIndexEntryName(entry string, _ string) string { - return entry -} - -func partitionedAndNamespacedIndexEntryName(entry string, _ *structs.EnterpriseMeta) string { - return entry -} diff --git a/agent/consul/state/schema_oss.go b/agent/consul/state/schema_oss.go new file mode 100644 index 0000000000..758d224233 --- /dev/null +++ b/agent/consul/state/schema_oss.go @@ -0,0 +1,14 @@ +//go:build !consulent +// +build !consulent + +package state + +import "github.com/hashicorp/consul/agent/structs" + +func partitionedIndexEntryName(entry string, _ string) string { + return entry +} + +func partitionedAndNamespacedIndexEntryName(entry string, _ *structs.EnterpriseMeta) string { + return entry +}