luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #4384 from hashicorp/revert-4294 

Revert PR 4294 - Catalog Register: Generate UUID for services registered without one
This commit is contained in:
Paul Banks 2018-07-12 15:24:57 +01:00 committed by GitHub
parent a3c92217e2 d8a4d9137b
commit ba49acf960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/consul/catalog_endpoint.go
View File

@ -37,13 +37,6 @@ func (c *Catalog) Register(args *structs.RegisterRequest, reply *struct{}) error
if _, err := uuid.ParseUUID(string(args.ID)); err != nil {
return fmt.Errorf("Bad node ID: %v", err)
}
} else {
id, err := uuid.GenerateUUID()
if err != nil {
return fmt.Errorf("Failed to generate ID: %v", err)
}
args.ID = types.NodeID(id)
}
// Fetch the ACL token, if any.

31
agent/consul/catalog_endpoint_test.go
View File

@ -50,37 +50,6 @@ func TestCatalog_Register(t *testing.T) {
}
}
func TestCatalog_RegisterNoID(t *testing.T) {
t.Parallel()
dir1, s1 := testServer(t)
defer os.RemoveAll(dir1)
defer s1.Shutdown()
codec := rpcClient(t, s1)
defer codec.Close()
arg := structs.RegisterRequest{
Datacenter: "dc1",
Node: "foo",
Address: "127.0.0.1",
Service: &structs.NodeService{
Service: "db",
Tags: []string{"master"},
Port: 8000,
},
}
var out struct{}
require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.Register", &arg, &out))
var ns structs.IndexedNodeServices
nodeArgs := structs.NodeSpecificRequest{
Datacenter: "dc1",
Node: "foo",
}
require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.NodeServices", &nodeArgs, &ns))
require.NotEqual(t, types.NodeID(""), ns.NodeServices.Node.ID)
}
func TestCatalog_RegisterService_InvalidAddress(t *testing.T) {
t.Parallel()
dir1, s1 := testServer(t)