From f7ae9033715ffd94ccd84be70f1eeeb96e944847 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Thu, 18 Jan 2018 13:44:27 -0500
Subject: [PATCH] Remove RegisterLicense from logical.Backend

It's almost certainly the wrong signature and nothing uses it currently
anyways.
---
 logical/framework/backend.go     |  8 --------
 logical/logical.go               |  3 ---
 logical/plugin/backend_client.go | 30 ------------------------------
 logical/plugin/backend_server.go | 15 ---------------
 vault/router_test.go             |  4 ----
 vault/testing.go                 |  4 ----
 6 files changed, 64 deletions(-)

diff --git a/logical/framework/backend.go b/logical/framework/backend.go
index 502398f3b7..196226532d 100644
--- a/logical/framework/backend.go
+++ b/logical/framework/backend.go
@@ -290,14 +290,6 @@ func (b *Backend) Type() logical.BackendType {
 	return b.BackendType
 }
 
-// RegisterLicense performs backend license registration.
-func (b *Backend) RegisterLicense(license interface{}) error {
-	if b.LicenseRegistration == nil {
-		return nil
-	}
-	return b.LicenseRegistration(license)
-}
-
 // SanitizeTTLStr takes in the TTL and MaxTTL values provided by the user,
 // compares those with the SystemView values. If they are empty a value of 0 is
 // set, which will cause initial secret or LeaseExtend operations to use the
diff --git a/logical/logical.go b/logical/logical.go
index 2988892ba6..3becc065e2 100644
--- a/logical/logical.go
+++ b/logical/logical.go
@@ -86,9 +86,6 @@ type Backend interface {
 
 	// Type returns the BackendType for the particular backend
 	Type() BackendType
-
-	// RegisterLicense performs backend license registration
-	RegisterLicense(interface{}) error
 }
 
 // BackendConfig is provided to the factory to initialize the backend
diff --git a/logical/plugin/backend_client.go b/logical/plugin/backend_client.go
index bb175ff3f1..4895c15ade 100644
--- a/logical/plugin/backend_client.go
+++ b/logical/plugin/backend_client.go
@@ -79,16 +79,6 @@ type TypeReply struct {
 	Type logical.BackendType
 }
 
-// RegisterLicenseArgs is the args for the RegisterLicense method.
-type RegisterLicenseArgs struct {
-	License interface{}
-}
-
-// RegisterLicenseReply is the reply for the RegisterLicense method.
-type RegisterLicenseReply struct {
-	Error error
-}
-
 func (b *backendPluginClient) HandleRequest(ctx context.Context, req *logical.Request) (*logical.Response, error) {
 	if b.metadataMode {
 		return nil, ErrClientInMetadataMode
@@ -265,23 +255,3 @@ func (b *backendPluginClient) Type() logical.BackendType {
 
 	return logical.BackendType(reply.Type)
 }
-
-func (b *backendPluginClient) RegisterLicense(license interface{}) error {
-	if b.metadataMode {
-		return ErrClientInMetadataMode
-	}
-
-	var reply RegisterLicenseReply
-	args := RegisterLicenseArgs{
-		License: license,
-	}
-	err := b.client.Call("Plugin.RegisterLicense", args, &reply)
-	if err != nil {
-		return err
-	}
-	if reply.Error != nil {
-		return reply.Error
-	}
-
-	return nil
-}
diff --git a/logical/plugin/backend_server.go b/logical/plugin/backend_server.go
index a55e05aca2..c655bf094b 100644
--- a/logical/plugin/backend_server.go
+++ b/logical/plugin/backend_server.go
@@ -171,18 +171,3 @@ func (b *backendPluginServer) Type(_ interface{}, reply *TypeReply) error {
 
 	return nil
 }
-
-func (b *backendPluginServer) RegisterLicense(args *RegisterLicenseArgs, reply *RegisterLicenseReply) error {
-	if inMetadataMode() {
-		return ErrServerInMetadataMode
-	}
-
-	err := b.backend.RegisterLicense(args.License)
-	if err != nil {
-		*reply = RegisterLicenseReply{
-			Error: wrapError(err),
-		}
-	}
-
-	return nil
-}
diff --git a/vault/router_test.go b/vault/router_test.go
index 6eb70d17bf..7eeb061e08 100644
--- a/vault/router_test.go
+++ b/vault/router_test.go
@@ -95,10 +95,6 @@ func (n *NoopBackend) Type() logical.BackendType {
 	return logical.TypeLogical
 }
 
-func (n *NoopBackend) RegisterLicense(license interface{}) error {
-	return nil
-}
-
 func TestRouter_Mount(t *testing.T) {
 	r := NewRouter()
 	_, barrier, _ := mockBarrier(t)
diff --git a/vault/testing.go b/vault/testing.go
index a841db1d6a..9eb322de68 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -706,10 +706,6 @@ func (n *rawHTTP) Type() logical.BackendType {
 	return logical.TypeUnknown
 }
 
-func (n *rawHTTP) RegisterLicense(license interface{}) error {
-	return nil
-}
-
 func GenerateRandBytes(length int) ([]byte, error) {
 	if length < 0 {
 		return nil, fmt.Errorf("length must be >= 0")