From 36b1534b7c05828e9d9a22b221fc233352b41862 Mon Sep 17 00:00:00 2001
From: skpratt <sarah.pratt@hashicorp.com>
Date: Tue, 30 May 2023 17:40:31 -0500
Subject: [PATCH] FIPS gossip changes (#17507)

* separate fips gossip

* clean up
---
 agent/consul/merge_oss.go | 4 ++++
 version/fips.go           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/agent/consul/merge_oss.go b/agent/consul/merge_oss.go
index 0f144ab21..59704f653 100644
--- a/agent/consul/merge_oss.go
+++ b/agent/consul/merge_oss.go
@@ -13,6 +13,10 @@ import (
 )
 
 func (md *lanMergeDelegate) enterpriseNotifyMergeMember(m *serf.Member) error {
+	if memberFIPS := m.Tags["fips"]; memberFIPS != "" {
+		return fmt.Errorf("Member '%s' is FIPS Consul; FIPS Consul is only available in Consul Enterprise",
+			m.Name)
+	}
 	if memberPartition := m.Tags["ap"]; memberPartition != "" {
 		return fmt.Errorf("Member '%s' part of partition '%s'; Partitions are a Consul Enterprise feature",
 			m.Name, memberPartition)
diff --git a/version/fips.go b/version/fips.go
index 5b131754c..4700bc681 100644
--- a/version/fips.go
+++ b/version/fips.go
@@ -2,6 +2,10 @@
 
 package version
 
+func IsFIPS() bool {
+	return false
+}
+
 func GetFIPSInfo() string {
 	return ""
 }