From 9bd378a95c175f304f9b1bffc5c15445cc7712b0 Mon Sep 17 00:00:00 2001
From: Matt Keeler <mkeeler@users.noreply.github.com>
Date: Tue, 1 Oct 2019 14:34:55 -0400
Subject: [PATCH] Add EnterpriseConfig stubs (#6566)

---
 agent/consul/config.go                | 4 ++++
 agent/consul/enterprise_config_oss.go | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 agent/consul/enterprise_config_oss.go

diff --git a/agent/consul/config.go b/agent/consul/config.go
index 96183c53e..2e4fc62c3 100644
--- a/agent/consul/config.go
+++ b/agent/consul/config.go
@@ -424,6 +424,9 @@ type Config struct {
 	// AutoEncryptAllowTLS is whether to enable the server responding to
 	// AutoEncrypt.Sign requests.
 	AutoEncryptAllowTLS bool
+
+	// Embedded Consul Enterprise specific configuration
+	*EnterpriseConfig
 }
 
 // ToTLSUtilConfig is only used by tests, usually the config is being passed
@@ -543,6 +546,7 @@ func DefaultConfig() *Config {
 
 		ServerHealthInterval: 2 * time.Second,
 		AutopilotInterval:    10 * time.Second,
+		EnterpriseConfig:     DefaultEnterpriseConfig(),
 	}
 
 	// Increase our reap interval to 3 days instead of 24h.
diff --git a/agent/consul/enterprise_config_oss.go b/agent/consul/enterprise_config_oss.go
new file mode 100644
index 000000000..8cd1e7124
--- /dev/null
+++ b/agent/consul/enterprise_config_oss.go
@@ -0,0 +1,9 @@
+// +build !consulent
+
+package consul
+
+type EnterpriseConfig struct{}
+
+func DefaultEnterpriseConfig() *EnterpriseConfig {
+	return nil
+}