From 50cc9fdd065ff80188822973362ff4db0f3608a9 Mon Sep 17 00:00:00 2001
From: Matt Keeler <mjkeeler7@gmail.com>
Date: Mon, 10 May 2021 10:10:39 -0400
Subject: [PATCH] Add OSS bits for supporting specifying the enterprise license
 via config

---
 .changelog/10210.txt                   | 3 +++
 agent/config/builder_oss.go            | 4 ++++
 agent/config/builder_oss_test.go       | 9 +++++++++
 agent/config/config.go                 | 1 +
 agent/config/runtime_oss_test.go       | 1 +
 agent/config/testdata/full-config.hcl  | 1 +
 agent/config/testdata/full-config.json | 1 +
 7 files changed, 20 insertions(+)
 create mode 100644 .changelog/10210.txt

diff --git a/.changelog/10210.txt b/.changelog/10210.txt
new file mode 100644
index 0000000000..a6f142fd82
--- /dev/null
+++ b/.changelog/10210.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+licensing: **(Enterprise Only)** Consul Enterprise has gained the ability to autoload a license via configuration. This can be specified with the `license_path` configuration, the `CONSUL_LICENSE` environment variable or the `CONSUL_LICENSE_PATH` environment variable
+```
\ No newline at end of file
diff --git a/agent/config/builder_oss.go b/agent/config/builder_oss.go
index e55a0f9906..c663e8bb6c 100644
--- a/agent/config/builder_oss.go
+++ b/agent/config/builder_oss.go
@@ -49,6 +49,10 @@ func validateEnterpriseConfigKeys(config *Config) []error {
 	if boolVal(config.Audit.Enabled) || len(config.Audit.Sinks) > 0 {
 		add("audit")
 	}
+	if config.LicensePath != nil {
+		add("license_path")
+		config.LicensePath = nil
+	}
 
 	return result
 }
diff --git a/agent/config/builder_oss_test.go b/agent/config/builder_oss_test.go
index d03ef165b6..3d2b7ba308 100644
--- a/agent/config/builder_oss_test.go
+++ b/agent/config/builder_oss_test.go
@@ -97,6 +97,15 @@ func TestValidateEnterpriseConfigKeys(t *testing.T) {
 				require.Nil(t, c.ACL.Tokens.ManagedServiceProvider)
 			},
 		},
+		"license_path": {
+			config: Config{
+				LicensePath: &stringVal,
+			},
+			badKeys: []string{"license_path"},
+			check: func(t *testing.T, c *Config) {
+				require.Empty(t, c.LicensePath)
+			},
+		},
 		"multi": {
 			config: Config{
 				ReadReplica: &boolVal,
diff --git a/agent/config/config.go b/agent/config/config.go
index 50dce655c8..b654c12b31 100644
--- a/agent/config/config.go
+++ b/agent/config/config.go
@@ -187,6 +187,7 @@ type Config struct {
 	HTTPConfig                       HTTPConfig          `mapstructure:"http_config"`
 	KeyFile                          *string             `mapstructure:"key_file"`
 	LeaveOnTerm                      *bool               `mapstructure:"leave_on_terminate"`
+	LicensePath                      *string             `mapstructure:"license_path"`
 	Limits                           Limits              `mapstructure:"limits"`
 	LogLevel                         *string             `mapstructure:"log_level"`
 	LogJSON                          *bool               `mapstructure:"log_json"`
diff --git a/agent/config/runtime_oss_test.go b/agent/config/runtime_oss_test.go
index 47d3c73649..4635302fba 100644
--- a/agent/config/runtime_oss_test.go
+++ b/agent/config/runtime_oss_test.go
@@ -9,6 +9,7 @@ func entFullRuntimeConfig(rt *RuntimeConfig) {}
 var enterpriseReadReplicaWarnings = []string{enterpriseConfigKeyError{key: "read_replica (or the deprecated non_voting_server)"}.Error()}
 
 var enterpriseConfigKeyWarnings = []string{
+	enterpriseConfigKeyError{key: "license_path"}.Error(),
 	enterpriseConfigKeyError{key: "read_replica (or the deprecated non_voting_server)"}.Error(),
 	enterpriseConfigKeyError{key: "autopilot.redundancy_zone_tag"}.Error(),
 	enterpriseConfigKeyError{key: "autopilot.upgrade_version_tag"}.Error(),
diff --git a/agent/config/testdata/full-config.hcl b/agent/config/testdata/full-config.hcl
index 05a7a071cd..cf7a3d3d80 100644
--- a/agent/config/testdata/full-config.hcl
+++ b/agent/config/testdata/full-config.hcl
@@ -277,6 +277,7 @@ http_config {
 }
 key_file = "IEkkwgIA"
 leave_on_terminate = true
+license_path = "/path/to/license.lic"
 limits {
     http_max_conns_per_client = 100
     https_handshake_timeout = "2391ms"
diff --git a/agent/config/testdata/full-config.json b/agent/config/testdata/full-config.json
index 7a817c538c..8a575ceb6a 100644
--- a/agent/config/testdata/full-config.json
+++ b/agent/config/testdata/full-config.json
@@ -277,6 +277,7 @@
   },
   "key_file": "IEkkwgIA",
   "leave_on_terminate": true,
+  "license_path": "/path/to/license.lic",
   "limits": {
     "http_max_conns_per_client": 100,
     "https_handshake_timeout": "2391ms",