licensing: remove raft storage and sync

command/agent/agent.go

@@ -423,6 +423,7 @@ func convertServerConfig(agentConfig *Config) (*nomad.Config, error) {
 	// Add Enterprise license configs
 	conf.LicenseEnv = agentConfig.Server.LicenseEnv
 	conf.LicensePath = agentConfig.Server.LicensePath
+	conf.LicenseConfig.AdditionalPubKeys = agentConfig.Server.licenseAdditionalPublicKeys
 
 	// Add the search configuration
 	if search := agentConfig.Server.Search; search != nil {

command/agent/config.go

@@ -508,6 +508,10 @@ type ServerConfig struct {
 	// is set, LicenseEnv will be set to the value at startup.
 	LicenseEnv string
 
+	// licenseAdditionalPublicKeys is an internal-only field used to
+	// setup test licenses.
+	licenseAdditionalPublicKeys []string
+
 	// ExtraKeysHCL is used by hcl to surface unexpected keys
 	ExtraKeysHCL []string `hcl:",unusedKeys" json:"-"`
 

command/agent/testagent.go

@@ -112,6 +112,8 @@ func (a *TestAgent) Start() *TestAgent {
 	if a.Config == nil {
 		a.Config = a.config()
 	}
+	defaultEnterpriseTestServerConfig(a.Config.Server)
+
 	if a.Config.DataDir == "" {
 		name := "agent"
 		if a.Name != "" {

command/agent/testagent_oss.go

@@ -6,3 +6,5 @@ const (
 	// EnterpriseTestAgent is used to configure a TestAgent's Enterprise flag
 	EnterpriseTestAgent = false
 )
+
+func defaultEnterpriseTestServerConfig(c *ServerConfig) {}

command/commands.go

@@ -392,11 +392,6 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
 				Meta: meta,
 			}, nil
 		},
-		"license put": func() (cli.Command, error) {
-			return &LicensePutCommand{
-				Meta: meta,
-			}, nil
-		},
 		"logs": func() (cli.Command, error) {
 			return &AllocLogsCommand{
 				Meta: meta,

command/license.go

@@ -18,18 +18,12 @@ type LicenseCommand struct {
 func (l *LicenseCommand) Help() string {
 	helpText := `
 Usage: nomad license <subcommand> [options] [args]
-	
+
 This command has subcommands for managing the Nomad Enterprise license.
 For more detailed examples see:
 https://www.nomadproject.io/docs/commands/license/
 
-Install a new license from a file:
-	$ nomad license put <path>
-
-Install a new license from stdin:
-	$ nomad license put -
-
-Retrieve the current license:
+Retrieve the server's license:
 
 	$ nomad license get
 

e2e/e2e_test.go

@@ -19,7 +19,6 @@ import (
 	_ "github.com/hashicorp/nomad/e2e/events"
 	_ "github.com/hashicorp/nomad/e2e/example"
 	_ "github.com/hashicorp/nomad/e2e/isolation"
-	_ "github.com/hashicorp/nomad/e2e/license"
 	_ "github.com/hashicorp/nomad/e2e/lifecycle"
 	_ "github.com/hashicorp/nomad/e2e/metrics"
 	_ "github.com/hashicorp/nomad/e2e/namespaces"

nomad/server_setup_oss.go

@@ -8,7 +8,9 @@ import (
 
 // LicenseConfig allows for tunable licensing config
 // primarily used for enterprise testing
-type LicenseConfig struct{}
+type LicenseConfig struct {
+	AdditionalPubKeys []string
+}
 
 type EnterpriseState struct{}
 

nomad/testing.go

@@ -44,6 +44,10 @@ func TestACLServer(t testing.T, cb func(*Config)) (*Server, *structs.ACLToken, f
 func TestServer(t testing.T, cb func(*Config)) (*Server, func()) {
 	// Setup the default settings
 	config := DefaultConfig()
+
+	// Setup default enterprise-specific settings, including license
+	defaultEnterpriseTestConfig(config)
+
 	config.Logger = testlog.HCLogger(t)
 	config.Build = version.Version + "+unittest"
 	config.DevMode = true

nomad/testing_oss.go

@@ -0,0 +1,5 @@
+// +build !ent
+
+package nomad
+
+func defaultEnterpriseTestConfig(c *Config) {}