2019-04-07 06:38:08 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
2021-03-11 04:05:11 +00:00
|
|
|
"sort"
|
2019-04-07 06:38:08 +00:00
|
|
|
"testing"
|
2019-08-14 14:08:46 +00:00
|
|
|
"time"
|
2019-04-07 06:38:08 +00:00
|
|
|
|
2021-02-03 23:10:38 +00:00
|
|
|
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
"github.com/hashicorp/consul/acl"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
2019-08-20 16:01:13 +00:00
|
|
|
"github.com/hashicorp/consul/sdk/testutil/retry"
|
2019-04-07 06:38:08 +00:00
|
|
|
"github.com/hashicorp/consul/testrpc"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestConfigEntry_Apply(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
2019-08-20 16:01:13 +00:00
|
|
|
testrpc.WaitForLeader(t, s1.RPC, "dc1")
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.PrimaryDatacenter = "dc1"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
codec2 := rpcClient(t, s2)
|
|
|
|
defer codec2.Close()
|
|
|
|
|
|
|
|
testrpc.WaitForLeader(t, s2.RPC, "dc2")
|
|
|
|
joinWAN(t, s2, s1)
|
|
|
|
// wait for cross-dc queries to work
|
|
|
|
testrpc.WaitForLeader(t, s2.RPC, "dc1")
|
|
|
|
|
2019-08-19 15:44:06 +00:00
|
|
|
updated := &structs.ServiceConfigEntry{
|
|
|
|
Name: "foo",
|
|
|
|
}
|
2019-08-20 16:01:13 +00:00
|
|
|
// originally target this as going to dc2
|
2019-04-07 06:38:08 +00:00
|
|
|
args := structs.ConfigEntryRequest{
|
2019-08-20 16:01:13 +00:00
|
|
|
Datacenter: "dc2",
|
2019-08-19 15:44:06 +00:00
|
|
|
Entry: updated,
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
2019-04-30 23:27:16 +00:00
|
|
|
out := false
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec2, "ConfigEntry.Apply", &args, &out))
|
|
|
|
require.True(t, out)
|
2019-04-07 06:38:08 +00:00
|
|
|
|
2019-08-20 16:01:13 +00:00
|
|
|
// the previous RPC should not return until the primary has been updated but will return
|
|
|
|
// before the secondary has the data.
|
2019-04-07 06:38:08 +00:00
|
|
|
state := s1.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, err)
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
serviceConf, ok := entry.(*structs.ServiceConfigEntry)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.True(t, ok)
|
|
|
|
require.Equal(t, "foo", serviceConf.Name)
|
|
|
|
require.Equal(t, structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
|
|
// wait for replication to happen
|
|
|
|
state := s2.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(r, err)
|
|
|
|
require.NotNil(r, entry)
|
|
|
|
// this test is not testing that the config entries that are replicated are correct as thats done elsewhere.
|
|
|
|
})
|
2019-04-30 23:27:16 +00:00
|
|
|
|
2019-08-19 15:44:06 +00:00
|
|
|
updated = &structs.ServiceConfigEntry{
|
|
|
|
Name: "foo",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{
|
|
|
|
Mode: structs.MeshGatewayModeLocal,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2019-04-30 23:27:16 +00:00
|
|
|
args = structs.ConfigEntryRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ConfigEntryUpsertCAS,
|
2019-08-19 15:44:06 +00:00
|
|
|
Entry: updated,
|
2019-04-30 23:27:16 +00:00
|
|
|
}
|
|
|
|
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out))
|
|
|
|
require.False(t, out)
|
2019-04-30 23:27:16 +00:00
|
|
|
|
|
|
|
args.Entry.GetRaftIndex().ModifyIndex = serviceConf.ModifyIndex
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out))
|
|
|
|
require.True(t, out)
|
2019-04-30 23:27:16 +00:00
|
|
|
|
|
|
|
state = s1.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err = state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, err)
|
2019-04-30 23:27:16 +00:00
|
|
|
|
|
|
|
serviceConf, ok = entry.(*structs.ServiceConfigEntry)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.True(t, ok)
|
|
|
|
require.Equal(t, structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
require.Equal(t, "foo", serviceConf.Name)
|
|
|
|
require.Equal(t, "", serviceConf.Protocol)
|
|
|
|
require.Equal(t, structs.ServiceDefaults, serviceConf.Kind)
|
2019-06-18 00:52:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_ProxyDefaultsMeshGateway(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-06-18 00:52:01 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
args := structs.ConfigEntryRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Entry: &structs.ProxyConfigEntry{
|
|
|
|
Kind: "proxy-defaults",
|
|
|
|
Name: "global",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: "local"},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
out := false
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out))
|
|
|
|
require.True(t, out)
|
|
|
|
|
|
|
|
state := s1.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := state.ConfigEntry(nil, structs.ProxyDefaults, "global", nil)
|
2019-06-18 00:52:01 +00:00
|
|
|
require.NoError(t, err)
|
2019-04-30 23:27:16 +00:00
|
|
|
|
2019-06-18 00:52:01 +00:00
|
|
|
proxyConf, ok := entry.(*structs.ProxyConfigEntry)
|
|
|
|
require.True(t, ok)
|
|
|
|
require.Equal(t, structs.MeshGatewayModeLocal, proxyConf.MeshGateway.Mode)
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_Apply_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-07 06:38:08 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-07 06:38:08 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-07 06:38:08 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "write"
|
|
|
|
}
|
|
|
|
operator = "write"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// This should fail since we don't have write perms for the "db" service.
|
|
|
|
args := structs.ConfigEntryRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Entry: &structs.ServiceConfigEntry{
|
|
|
|
Name: "db",
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: id},
|
|
|
|
}
|
2019-04-30 23:27:16 +00:00
|
|
|
out := false
|
2019-04-07 06:38:08 +00:00
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The "foo" service should work.
|
|
|
|
args.Entry = &structs.ServiceConfigEntry{
|
|
|
|
Name: "foo",
|
|
|
|
}
|
|
|
|
err = msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out)
|
|
|
|
require.NoError(err)
|
|
|
|
|
|
|
|
state := s1.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(err)
|
|
|
|
|
|
|
|
serviceConf, ok := entry.(*structs.ServiceConfigEntry)
|
|
|
|
require.True(ok)
|
|
|
|
require.Equal("foo", serviceConf.Name)
|
|
|
|
require.Equal(structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
|
|
|
|
// Try to update the global proxy args with the anonymous token - this should fail.
|
|
|
|
proxyArgs := structs.ConfigEntryRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Entry: &structs.ProxyConfigEntry{
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"foo": 1,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
err = msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &proxyArgs, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now with the privileged token.
|
|
|
|
proxyArgs.WriteRequest.Token = id
|
|
|
|
err = msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &proxyArgs, &out)
|
|
|
|
require.NoError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_Get(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create a dummy service in the state store to look up.
|
|
|
|
entry := &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
}
|
|
|
|
state := s1.fsm.State()
|
2021-02-03 23:10:38 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(1, entry))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
args := structs.ConfigEntryQuery{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
}
|
2019-04-29 22:08:09 +00:00
|
|
|
var out structs.ConfigEntryResponse
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.Get", &args, &out))
|
|
|
|
|
2019-04-29 22:08:09 +00:00
|
|
|
serviceConf, ok := out.Entry.(*structs.ServiceConfigEntry)
|
2019-04-07 06:38:08 +00:00
|
|
|
require.True(ok)
|
|
|
|
require.Equal("foo", serviceConf.Name)
|
|
|
|
require.Equal(structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_Get_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-07 06:38:08 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-07 06:38:08 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-07 06:38:08 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "read"
|
|
|
|
}
|
|
|
|
operator = "read"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create some dummy service/proxy configs to be looked up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// This should fail since we don't have write perms for the "db" service.
|
|
|
|
args := structs.ConfigEntryQuery{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "db",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
QueryOptions: structs.QueryOptions{Token: id},
|
|
|
|
}
|
2019-04-29 22:08:09 +00:00
|
|
|
var out structs.ConfigEntryResponse
|
2019-04-07 06:38:08 +00:00
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.Get", &args, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The "foo" service should work.
|
|
|
|
args.Name = "foo"
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.Get", &args, &out))
|
|
|
|
|
2019-04-29 22:08:09 +00:00
|
|
|
serviceConf, ok := out.Entry.(*structs.ServiceConfigEntry)
|
2019-04-07 06:38:08 +00:00
|
|
|
require.True(ok)
|
|
|
|
require.Equal("foo", serviceConf.Name)
|
|
|
|
require.Equal(structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_List(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create some dummy services in the state store to look up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
expected := structs.IndexedConfigEntries{
|
|
|
|
Entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(1, expected.Entries[0]))
|
|
|
|
require.NoError(state.EnsureConfigEntry(2, expected.Entries[1]))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
args := structs.ConfigEntryQuery{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Datacenter: "dc1",
|
|
|
|
}
|
|
|
|
var out structs.IndexedConfigEntries
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.List", &args, &out))
|
|
|
|
|
2019-04-10 21:27:28 +00:00
|
|
|
expected.Kind = structs.ServiceDefaults
|
2019-04-07 06:38:08 +00:00
|
|
|
expected.QueryMeta = out.QueryMeta
|
|
|
|
require.Equal(expected, out)
|
|
|
|
}
|
|
|
|
|
2019-04-26 17:38:39 +00:00
|
|
|
func TestConfigEntry_ListAll(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-26 17:38:39 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create some dummy services in the state store to look up.
|
|
|
|
state := s1.fsm.State()
|
2020-10-06 18:24:05 +00:00
|
|
|
entries := []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: "global",
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
},
|
|
|
|
&structs.ServiceIntentionsConfigEntry{
|
|
|
|
Kind: structs.ServiceIntentions,
|
|
|
|
Name: "api",
|
|
|
|
Sources: []*structs.SourceIntention{
|
|
|
|
{
|
|
|
|
Name: "web",
|
|
|
|
Action: structs.IntentionActionAllow,
|
|
|
|
},
|
2019-04-26 17:38:39 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
require.NoError(t, state.EnsureConfigEntry(1, entries[0]))
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(2, entries[1]))
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(3, entries[2]))
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(4, entries[3]))
|
2020-10-06 18:24:05 +00:00
|
|
|
|
|
|
|
t.Run("all kinds", func(t *testing.T) {
|
|
|
|
args := structs.ConfigEntryListAllRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Kinds: structs.AllConfigEntryKinds,
|
|
|
|
}
|
|
|
|
var out structs.IndexedGenericConfigEntries
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ListAll", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.IndexedGenericConfigEntries{
|
|
|
|
Entries: entries[:],
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
})
|
2019-04-26 17:38:39 +00:00
|
|
|
|
2020-10-06 18:24:05 +00:00
|
|
|
t.Run("all kinds pre 1.9.0", func(t *testing.T) {
|
|
|
|
args := structs.ConfigEntryListAllRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Kinds: nil, // let it default
|
|
|
|
}
|
|
|
|
var out structs.IndexedGenericConfigEntries
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ListAll", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.IndexedGenericConfigEntries{
|
|
|
|
Entries: entries[0:3],
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
})
|
2019-04-26 17:38:39 +00:00
|
|
|
|
2020-10-06 18:24:05 +00:00
|
|
|
t.Run("omit service defaults", func(t *testing.T) {
|
|
|
|
args := structs.ConfigEntryListAllRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Kinds: []string{
|
|
|
|
structs.ProxyDefaults,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
var out structs.IndexedGenericConfigEntries
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ListAll", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.IndexedGenericConfigEntries{
|
|
|
|
Entries: entries[0:1],
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
})
|
2019-04-26 17:38:39 +00:00
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
func TestConfigEntry_List_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-07 06:38:08 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-07 06:38:08 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-07 06:38:08 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "read"
|
|
|
|
}
|
|
|
|
operator = "read"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create some dummy service/proxy configs to be looked up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(3, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "db",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// This should filter out the "db" service since we don't have permissions for it.
|
|
|
|
args := structs.ConfigEntryQuery{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
QueryOptions: structs.QueryOptions{Token: id},
|
|
|
|
}
|
|
|
|
var out structs.IndexedConfigEntries
|
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.List", &args, &out)
|
|
|
|
require.NoError(err)
|
|
|
|
|
|
|
|
serviceConf, ok := out.Entries[0].(*structs.ServiceConfigEntry)
|
|
|
|
require.Len(out.Entries, 1)
|
|
|
|
require.True(ok)
|
|
|
|
require.Equal("foo", serviceConf.Name)
|
|
|
|
require.Equal(structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
|
|
|
|
// Get the global proxy config.
|
|
|
|
args.Kind = structs.ProxyDefaults
|
|
|
|
err = msgpackrpc.CallWithCodec(codec, "ConfigEntry.List", &args, &out)
|
|
|
|
require.NoError(err)
|
|
|
|
|
|
|
|
proxyConf, ok := out.Entries[0].(*structs.ProxyConfigEntry)
|
|
|
|
require.Len(out.Entries, 1)
|
|
|
|
require.True(ok)
|
|
|
|
require.Equal(structs.ProxyConfigGlobal, proxyConf.Name)
|
|
|
|
require.Equal(structs.ProxyDefaults, proxyConf.Kind)
|
|
|
|
}
|
|
|
|
|
2019-04-26 17:38:39 +00:00
|
|
|
func TestConfigEntry_ListAll_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-26 17:38:39 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-26 17:38:39 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-26 17:38:39 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-26 17:38:39 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "read"
|
|
|
|
}
|
|
|
|
operator = "read"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create some dummy service/proxy configs to be looked up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-26 17:38:39 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-26 17:38:39 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(3, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "db",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-26 17:38:39 +00:00
|
|
|
|
|
|
|
// This should filter out the "db" service since we don't have permissions for it.
|
2020-10-06 18:24:05 +00:00
|
|
|
args := structs.ConfigEntryListAllRequest{
|
2019-04-26 17:38:39 +00:00
|
|
|
Datacenter: s1.config.Datacenter,
|
2020-10-06 18:24:05 +00:00
|
|
|
Kinds: structs.AllConfigEntryKinds,
|
2019-04-26 17:38:39 +00:00
|
|
|
QueryOptions: structs.QueryOptions{Token: id},
|
|
|
|
}
|
|
|
|
var out structs.IndexedGenericConfigEntries
|
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.ListAll", &args, &out)
|
|
|
|
require.NoError(err)
|
|
|
|
require.Len(out.Entries, 2)
|
|
|
|
svcIndex := 0
|
|
|
|
proxyIndex := 1
|
|
|
|
if out.Entries[0].GetKind() == structs.ProxyDefaults {
|
|
|
|
svcIndex = 1
|
|
|
|
proxyIndex = 0
|
|
|
|
}
|
|
|
|
|
|
|
|
svcConf, ok := out.Entries[svcIndex].(*structs.ServiceConfigEntry)
|
|
|
|
require.True(ok)
|
|
|
|
proxyConf, ok := out.Entries[proxyIndex].(*structs.ProxyConfigEntry)
|
|
|
|
require.True(ok)
|
|
|
|
|
|
|
|
require.Equal("foo", svcConf.Name)
|
|
|
|
require.Equal(structs.ServiceDefaults, svcConf.Kind)
|
|
|
|
require.Equal(structs.ProxyConfigGlobal, proxyConf.Name)
|
|
|
|
require.Equal(structs.ProxyDefaults, proxyConf.Kind)
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
func TestConfigEntry_Delete(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
2019-08-20 16:01:13 +00:00
|
|
|
testrpc.WaitForLeader(t, s1.RPC, "dc1")
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.PrimaryDatacenter = "dc1"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
codec2 := rpcClient(t, s2)
|
|
|
|
defer codec2.Close()
|
|
|
|
|
|
|
|
testrpc.WaitForLeader(t, s2.RPC, "dc2")
|
|
|
|
joinWAN(t, s2, s1)
|
|
|
|
// wait for cross-dc queries to work
|
|
|
|
testrpc.WaitForLeader(t, s2.RPC, "dc1")
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
// Create a dummy service in the state store to look up.
|
|
|
|
entry := &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
}
|
|
|
|
state := s1.fsm.State()
|
2021-02-03 23:10:38 +00:00
|
|
|
require.NoError(t, state.EnsureConfigEntry(1, entry))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// Verify it's there.
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err := state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, err)
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
serviceConf, ok := existing.(*structs.ServiceConfigEntry)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.True(t, ok)
|
|
|
|
require.Equal(t, "foo", serviceConf.Name)
|
|
|
|
require.Equal(t, structs.ServiceDefaults, serviceConf.Kind)
|
|
|
|
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
|
|
// wait for it to be replicated into the secondary dc
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err := s2.fsm.State().ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(r, err)
|
|
|
|
require.NotNil(r, existing)
|
|
|
|
})
|
2019-04-07 06:38:08 +00:00
|
|
|
|
2019-08-20 16:01:13 +00:00
|
|
|
// send the delete request to dc2 - it should get forwarded to dc1.
|
2019-04-07 06:38:08 +00:00
|
|
|
args := structs.ConfigEntryRequest{
|
2019-08-20 16:01:13 +00:00
|
|
|
Datacenter: "dc2",
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
|
|
|
args.Entry = entry
|
|
|
|
var out struct{}
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec2, "ConfigEntry.Delete", &args, &out))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// Verify the entry was deleted.
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err = s1.fsm.State().ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Nil(t, existing)
|
|
|
|
|
|
|
|
// verify it gets deleted from the secondary too
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err := s2.fsm.State().ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-08-20 16:01:13 +00:00
|
|
|
require.NoError(r, err)
|
|
|
|
require.Nil(r, existing)
|
|
|
|
})
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_Delete_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-07 06:38:08 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-07 06:38:08 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-07 06:38:08 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "write"
|
|
|
|
}
|
|
|
|
operator = "write"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create some dummy service/proxy configs to be looked up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// This should fail since we don't have write perms for the "db" service.
|
|
|
|
args := structs.ConfigEntryRequest{
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
Entry: &structs.ServiceConfigEntry{
|
|
|
|
Name: "db",
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: id},
|
|
|
|
}
|
|
|
|
var out struct{}
|
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.Delete", &args, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The "foo" service should work.
|
|
|
|
args.Entry = &structs.ServiceConfigEntry{
|
|
|
|
Name: "foo",
|
|
|
|
}
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.Delete", &args, &out))
|
|
|
|
|
|
|
|
// Verify the entry was deleted.
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err := state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(err)
|
|
|
|
require.Nil(existing)
|
|
|
|
|
|
|
|
// Try to delete the global proxy config without a token.
|
|
|
|
args = structs.ConfigEntryRequest{
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
Entry: &structs.ProxyConfigEntry{
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
err = msgpackrpc.CallWithCodec(codec, "ConfigEntry.Delete", &args, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now delete with a valid token.
|
|
|
|
args.WriteRequest.Token = id
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.Delete", &args, &out))
|
|
|
|
|
2020-01-24 15:04:58 +00:00
|
|
|
_, existing, err = state.ConfigEntry(nil, structs.ServiceDefaults, "foo", nil)
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(err)
|
|
|
|
require.Nil(existing)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigEntry_ResolveServiceConfig(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create a dummy proxy/service config in the state store to look up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
2019-05-01 23:39:31 +00:00
|
|
|
"foo": 1,
|
2019-04-07 06:38:08 +00:00
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
2019-05-01 23:39:31 +00:00
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
Protocol: "http",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-05-01 23:39:31 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
|
|
|
Protocol: "grpc",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
args := structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
2019-05-01 23:39:31 +00:00
|
|
|
Upstreams: []string{"bar", "baz"},
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out))
|
|
|
|
|
2019-05-01 23:39:31 +00:00
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"foo": int64(1),
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
UpstreamConfigs: map[string]map[string]interface{}{
|
2020-06-16 17:19:31 +00:00
|
|
|
"bar": {
|
2019-05-01 23:39:31 +00:00
|
|
|
"protocol": "grpc",
|
2019-04-07 06:38:08 +00:00
|
|
|
},
|
|
|
|
},
|
2019-05-01 23:39:31 +00:00
|
|
|
// Don't know what this is deterministically
|
|
|
|
QueryMeta: out.QueryMeta,
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
2019-05-01 23:39:31 +00:00
|
|
|
require.Equal(expected, out)
|
2019-05-06 16:09:59 +00:00
|
|
|
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := s1.fsm.State().ConfigEntry(nil, structs.ProxyDefaults, structs.ProxyConfigGlobal, nil)
|
2019-05-06 16:09:59 +00:00
|
|
|
require.NoError(err)
|
|
|
|
require.NotNil(entry)
|
|
|
|
proxyConf, ok := entry.(*structs.ProxyConfigEntry)
|
|
|
|
require.True(ok)
|
|
|
|
require.Equal(map[string]interface{}{"foo": 1}, proxyConf.Config)
|
2019-04-07 06:38:08 +00:00
|
|
|
}
|
|
|
|
|
2021-03-11 06:08:41 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_TransparentProxy(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
tt := []struct {
|
|
|
|
name string
|
|
|
|
entries []structs.ConfigEntry
|
|
|
|
request structs.ServiceConfigRequest
|
|
|
|
proxyCfg structs.ConnectProxyConfig
|
|
|
|
expect structs.ServiceConfigResponse
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "from proxy-defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
2021-06-09 20:34:17 +00:00
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 10101,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
2021-06-09 20:34:17 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 10101,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "from service-defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-04-12 15:35:14 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{OutboundListenerPort: 808},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
2021-04-12 15:35:14 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{OutboundListenerPort: 808},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "service-defaults overrides proxy-defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
2021-06-09 20:34:17 +00:00
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Mode: structs.ProxyModeDirect,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 10101,
|
|
|
|
DialedDirectly: false,
|
|
|
|
},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
2021-06-09 20:34:17 +00:00
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 808,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
2021-06-09 20:34:17 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 808,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-11 06:08:41 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Boostrap the config entries
|
|
|
|
idx := uint64(1)
|
|
|
|
for _, conf := range tc.entries {
|
|
|
|
require.NoError(t, s1.fsm.State().EnsureConfigEntry(idx, conf))
|
|
|
|
idx++
|
|
|
|
}
|
|
|
|
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &tc.request, &out))
|
|
|
|
|
|
|
|
// Don't know what this is deterministically, so we grab it from the response
|
|
|
|
tc.expect.QueryMeta = out.QueryMeta
|
|
|
|
|
|
|
|
require.Equal(t, tc.expect, out)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-11 04:05:11 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_Upstreams(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
t.Parallel()
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
mysql := structs.NewServiceID("mysql", structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
cache := structs.NewServiceID("cache", structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
wildcard := structs.NewServiceID(structs.WildcardSpecifier, structs.WildcardEnterpriseMetaInDefaultPartition())
|
2021-03-18 05:05:00 +00:00
|
|
|
|
2021-03-11 04:05:11 +00:00
|
|
|
tt := []struct {
|
|
|
|
name string
|
|
|
|
entries []structs.ConfigEntry
|
|
|
|
request structs.ServiceConfigRequest
|
|
|
|
proxyCfg structs.ConnectProxyConfig
|
|
|
|
expect structs.ServiceConfigResponse
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "upstream config entries from Upstreams and service-defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-11 04:05:11 +00:00
|
|
|
Protocol: "http",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-03-11 04:05:11 +00:00
|
|
|
Datacenter: "dc1",
|
2021-03-18 05:05:00 +00:00
|
|
|
Upstreams: []string{"cache"},
|
2021-03-11 04:05:11 +00:00
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
UpstreamConfigs: map[string]map[string]interface{}{
|
2021-03-18 05:05:00 +00:00
|
|
|
"mysql": {
|
2021-03-11 04:05:11 +00:00
|
|
|
"protocol": "http",
|
|
|
|
},
|
2021-03-18 05:05:00 +00:00
|
|
|
"cache": {
|
2021-03-11 04:05:11 +00:00
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "upstream config entries from UpstreamIDs and service-defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-11 04:05:11 +00:00
|
|
|
Protocol: "http",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
UpstreamIDs: []structs.ServiceID{
|
|
|
|
cache,
|
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
UpstreamIDConfigs: structs.OpaqueUpstreamConfigs{
|
|
|
|
{
|
2021-03-18 05:05:00 +00:00
|
|
|
Upstream: cache,
|
2021-03-11 04:05:11 +00:00
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Upstream: structs.ServiceID{
|
2021-03-18 05:05:00 +00:00
|
|
|
ID: "mysql",
|
2021-07-22 18:20:45 +00:00
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2021-03-11 04:05:11 +00:00
|
|
|
},
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "proxy registration overrides upstream_defaults",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Defaults: &structs.UpstreamConfig{
|
2021-03-11 04:05:11 +00:00
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeRemote},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-03-11 04:05:11 +00:00
|
|
|
Datacenter: "dc1",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{
|
|
|
|
Mode: structs.MeshGatewayModeNone,
|
|
|
|
},
|
2021-03-15 20:32:13 +00:00
|
|
|
UpstreamIDs: []structs.ServiceID{
|
2021-03-18 05:05:00 +00:00
|
|
|
mysql,
|
2021-03-15 20:32:13 +00:00
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
|
|
|
UpstreamIDConfigs: structs.OpaqueUpstreamConfigs{
|
2021-03-20 04:03:17 +00:00
|
|
|
{
|
|
|
|
Upstream: wildcard,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
{
|
2021-03-18 05:05:00 +00:00
|
|
|
Upstream: mysql,
|
2021-03-11 04:05:11 +00:00
|
|
|
Config: map[string]interface{}{
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "none",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2021-04-15 19:21:44 +00:00
|
|
|
name: "upstream_config.overrides override all",
|
2021-03-11 04:05:11 +00:00
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "udp",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-03-11 04:05:11 +00:00
|
|
|
Protocol: "tcp",
|
|
|
|
},
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Defaults: &structs.UpstreamConfig{
|
2021-03-11 04:05:11 +00:00
|
|
|
Protocol: "http",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeRemote},
|
2021-03-11 18:04:40 +00:00
|
|
|
PassiveHealthCheck: &structs.PassiveHealthCheck{
|
2021-03-11 04:05:11 +00:00
|
|
|
Interval: 10,
|
|
|
|
MaxFailures: 2,
|
|
|
|
},
|
|
|
|
},
|
2021-04-15 19:21:44 +00:00
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-11 04:05:11 +00:00
|
|
|
Protocol: "grpc",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeLocal},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-03-18 05:05:00 +00:00
|
|
|
Name: "api",
|
2021-03-11 04:05:11 +00:00
|
|
|
Datacenter: "dc1",
|
|
|
|
MeshGateway: structs.MeshGatewayConfig{
|
|
|
|
Mode: structs.MeshGatewayModeNone,
|
|
|
|
},
|
2021-03-15 20:32:13 +00:00
|
|
|
UpstreamIDs: []structs.ServiceID{
|
2021-03-18 05:05:00 +00:00
|
|
|
mysql,
|
2021-03-15 20:32:13 +00:00
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "udp",
|
|
|
|
},
|
|
|
|
UpstreamIDConfigs: structs.OpaqueUpstreamConfigs{
|
2021-03-20 04:03:17 +00:00
|
|
|
{
|
|
|
|
Upstream: wildcard,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"passive_health_check": map[string]interface{}{
|
|
|
|
"Interval": int64(10),
|
|
|
|
"MaxFailures": int64(2),
|
|
|
|
},
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
{
|
2021-03-18 05:05:00 +00:00
|
|
|
Upstream: mysql,
|
2021-03-11 04:05:11 +00:00
|
|
|
Config: map[string]interface{}{
|
|
|
|
"passive_health_check": map[string]interface{}{
|
|
|
|
"Interval": int64(10),
|
|
|
|
"MaxFailures": int64(2),
|
|
|
|
},
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "local",
|
|
|
|
},
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2021-03-20 04:03:17 +00:00
|
|
|
{
|
|
|
|
name: "without upstream args we should return centralized config with tproxy arg",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Defaults: &structs.UpstreamConfig{
|
2021-03-20 04:03:17 +00:00
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeRemote},
|
|
|
|
},
|
2021-04-15 19:21:44 +00:00
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-20 04:03:17 +00:00
|
|
|
Protocol: "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-04-12 15:35:14 +00:00
|
|
|
Name: "api",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Mode: structs.ProxyModeTransparent,
|
2021-03-20 04:03:17 +00:00
|
|
|
|
|
|
|
// Empty Upstreams/UpstreamIDs
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
|
|
|
UpstreamIDConfigs: structs.OpaqueUpstreamConfigs{
|
|
|
|
{
|
|
|
|
Upstream: wildcard,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Upstream: mysql,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "without upstream args we should return centralized config with tproxy default",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Defaults: &structs.UpstreamConfig{
|
2021-03-20 04:03:17 +00:00
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeRemote},
|
|
|
|
},
|
2021-04-15 19:21:44 +00:00
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-20 04:03:17 +00:00
|
|
|
Protocol: "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
// TransparentProxy on the config entry but not the config request
|
2021-06-09 20:34:17 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 10101,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-20 04:03:17 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
|
|
|
Name: "api",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
|
|
|
|
// Empty Upstreams/UpstreamIDs
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{
|
2021-06-09 20:34:17 +00:00
|
|
|
Mode: structs.ProxyModeTransparent,
|
|
|
|
TransparentProxy: structs.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 10101,
|
|
|
|
DialedDirectly: true,
|
|
|
|
},
|
2021-03-20 04:03:17 +00:00
|
|
|
UpstreamIDConfigs: structs.OpaqueUpstreamConfigs{
|
|
|
|
{
|
|
|
|
Upstream: wildcard,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Upstream: mysql,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "grpc",
|
|
|
|
"mesh_gateway": map[string]interface{}{
|
|
|
|
"Mode": "remote",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "without upstream args we should NOT return centralized config outside tproxy mode",
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "api",
|
2021-04-15 19:21:44 +00:00
|
|
|
UpstreamConfig: &structs.UpstreamConfiguration{
|
|
|
|
Defaults: &structs.UpstreamConfig{
|
2021-03-20 04:03:17 +00:00
|
|
|
MeshGateway: structs.MeshGatewayConfig{Mode: structs.MeshGatewayModeRemote},
|
|
|
|
},
|
2021-04-15 19:21:44 +00:00
|
|
|
Overrides: []*structs.UpstreamConfig{
|
|
|
|
{
|
|
|
|
Name: "mysql",
|
2021-03-20 04:03:17 +00:00
|
|
|
Protocol: "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
request: structs.ServiceConfigRequest{
|
2021-04-12 15:35:14 +00:00
|
|
|
Name: "api",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Mode: structs.ProxyModeDirect,
|
2021-03-20 04:03:17 +00:00
|
|
|
|
|
|
|
// Empty Upstreams/UpstreamIDs
|
|
|
|
},
|
|
|
|
expect: structs.ServiceConfigResponse{},
|
|
|
|
},
|
2021-03-11 04:05:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
state := s1.fsm.State()
|
|
|
|
|
|
|
|
// Boostrap the config entries
|
|
|
|
idx := uint64(1)
|
|
|
|
for _, conf := range tc.entries {
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(idx, conf))
|
|
|
|
idx++
|
|
|
|
}
|
|
|
|
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &tc.request, &out))
|
|
|
|
|
|
|
|
// Don't know what this is deterministically, so we grab it from the response
|
|
|
|
tc.expect.QueryMeta = out.QueryMeta
|
|
|
|
|
|
|
|
// Order of this slice is also not deterministic since it's populated from a map
|
|
|
|
sort.SliceStable(out.UpstreamIDConfigs, func(i, j int) bool {
|
|
|
|
return out.UpstreamIDConfigs[i].Upstream.String() < out.UpstreamIDConfigs[j].Upstream.String()
|
|
|
|
})
|
|
|
|
|
|
|
|
require.Equal(t, tc.expect, out)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-14 14:08:46 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_Blocking(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-08-14 14:08:46 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// The main thing this should test is that information from one iteration
|
|
|
|
// of the blocking query does NOT bleed over into the next run. Concretely
|
|
|
|
// in this test the data present in the initial proxy-defaults should not
|
|
|
|
// be present when we are woken up due to proxy-defaults being deleted.
|
2021-05-14 15:21:44 +00:00
|
|
|
//
|
|
|
|
// This test does not pertain to upstreams, see:
|
|
|
|
// TestConfigEntry_ResolveServiceConfig_Upstreams_Blocking
|
2019-08-14 14:08:46 +00:00
|
|
|
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"global": 1,
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-14 14:08:46 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
Protocol: "grpc",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-14 14:08:46 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(3, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
|
|
|
Protocol: "http",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-14 14:08:46 +00:00
|
|
|
|
|
|
|
var index uint64
|
|
|
|
|
|
|
|
{ // Verify that we get the results of proxy-defaults and service-defaults for 'foo'.
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"global": int64(1),
|
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
index = out.Index
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now setup a blocking query for 'foo' while we erase the service-defaults for foo.
|
|
|
|
{
|
|
|
|
// Async cause a change
|
|
|
|
start := time.Now()
|
|
|
|
go func() {
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
require.NoError(state.DeleteConfigEntry(index+1,
|
|
|
|
structs.ServiceDefaults,
|
|
|
|
"foo",
|
2020-01-24 15:04:58 +00:00
|
|
|
nil,
|
2019-08-14 14:08:46 +00:00
|
|
|
))
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Re-run the query
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
QueryOptions: structs.QueryOptions{
|
|
|
|
MinQueryIndex: index,
|
|
|
|
MaxQueryTime: time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
// Should block at least 100ms
|
|
|
|
require.True(time.Since(start) >= 100*time.Millisecond, "too fast")
|
|
|
|
|
|
|
|
// Check the indexes
|
|
|
|
require.Equal(out.Index, index+1)
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"global": int64(1),
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
|
|
|
|
index = out.Index
|
|
|
|
}
|
|
|
|
|
|
|
|
{ // Verify that we get the results of proxy-defaults and service-defaults for 'bar'.
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "bar",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"global": int64(1),
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
index = out.Index
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now setup a blocking query for 'bar' while we erase the global proxy-defaults.
|
|
|
|
{
|
|
|
|
// Async cause a change
|
|
|
|
start := time.Now()
|
|
|
|
go func() {
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
require.NoError(state.DeleteConfigEntry(index+1,
|
|
|
|
structs.ProxyDefaults,
|
|
|
|
structs.ProxyConfigGlobal,
|
2020-01-24 15:04:58 +00:00
|
|
|
nil,
|
2019-08-14 14:08:46 +00:00
|
|
|
))
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Re-run the query
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "bar",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
QueryOptions: structs.QueryOptions{
|
|
|
|
MinQueryIndex: index,
|
|
|
|
MaxQueryTime: time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
// Should block at least 100ms
|
|
|
|
require.True(time.Since(start) >= 100*time.Millisecond, "too fast")
|
|
|
|
|
|
|
|
// Check the indexes
|
|
|
|
require.Equal(out.Index, index+1)
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-14 15:21:44 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_Upstreams_Blocking(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// The main thing this should test is that information from one iteration
|
|
|
|
// of the blocking query does NOT bleed over into the next run. Concretely
|
|
|
|
// in this test the data present in the initial proxy-defaults should not
|
|
|
|
// be present when we are woken up due to proxy-defaults being deleted.
|
|
|
|
//
|
|
|
|
// This test is about fields in upstreams, see:
|
|
|
|
// TestConfigEntry_ResolveServiceConfig_Blocking
|
|
|
|
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(1, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
|
|
|
Protocol: "http",
|
|
|
|
}))
|
|
|
|
require.NoError(t, state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
|
|
|
Protocol: "http",
|
|
|
|
}))
|
|
|
|
|
|
|
|
var index uint64
|
|
|
|
|
|
|
|
runStep(t, "foo and bar should be both http", func(t *testing.T) {
|
|
|
|
// Verify that we get the results of service-defaults for 'foo' and 'bar'.
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
UpstreamIDs: []structs.ServiceID{
|
|
|
|
structs.NewServiceID("bar", nil),
|
|
|
|
structs.NewServiceID("other", nil),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
UpstreamIDConfigs: []structs.OpaqueUpstreamConfig{
|
|
|
|
{
|
|
|
|
Upstream: structs.NewServiceID("bar", nil),
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta, // don't care
|
|
|
|
}
|
|
|
|
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
index = out.Index
|
|
|
|
})
|
|
|
|
|
|
|
|
runStep(t, "blocking query for foo wakes on bar entry delete", func(t *testing.T) {
|
|
|
|
// Now setup a blocking query for 'foo' while we erase the
|
|
|
|
// service-defaults for bar.
|
|
|
|
|
|
|
|
// Async cause a change
|
|
|
|
start := time.Now()
|
|
|
|
go func() {
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
err := state.DeleteConfigEntry(index+1,
|
|
|
|
structs.ServiceDefaults,
|
|
|
|
"bar",
|
|
|
|
nil,
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("delete config entry failed: %v", err)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Re-run the query
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
UpstreamIDs: []structs.ServiceID{
|
|
|
|
structs.NewServiceID("bar", nil),
|
|
|
|
structs.NewServiceID("other", nil),
|
|
|
|
},
|
|
|
|
QueryOptions: structs.QueryOptions{
|
|
|
|
MinQueryIndex: index,
|
|
|
|
MaxQueryTime: time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
// Should block at least 100ms
|
|
|
|
require.True(t, time.Since(start) >= 100*time.Millisecond, "too fast")
|
|
|
|
|
|
|
|
// Check the indexes
|
|
|
|
require.Equal(t, out.Index, index+1)
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta, // don't care
|
|
|
|
}
|
|
|
|
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
index = out.Index
|
|
|
|
})
|
|
|
|
|
|
|
|
runStep(t, "foo should be http and bar should be unset", func(t *testing.T) {
|
|
|
|
// Verify that we get the results of service-defaults for just 'foo'.
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
UpstreamIDs: []structs.ServiceID{
|
|
|
|
structs.NewServiceID("bar", nil),
|
|
|
|
structs.NewServiceID("other", nil),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
QueryMeta: out.QueryMeta, // don't care
|
|
|
|
}
|
|
|
|
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
index = out.Index
|
|
|
|
})
|
|
|
|
|
|
|
|
runStep(t, "blocking query for foo wakes on foo entry delete", func(t *testing.T) {
|
|
|
|
// Now setup a blocking query for 'foo' while we erase the
|
|
|
|
// service-defaults for foo.
|
|
|
|
|
|
|
|
// Async cause a change
|
|
|
|
start := time.Now()
|
|
|
|
go func() {
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
err := state.DeleteConfigEntry(index+1,
|
|
|
|
structs.ServiceDefaults,
|
|
|
|
"foo",
|
|
|
|
nil,
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("delete config entry failed: %v", err)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Re-run the query
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig",
|
|
|
|
&structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
UpstreamIDs: []structs.ServiceID{
|
|
|
|
structs.NewServiceID("bar", nil),
|
|
|
|
structs.NewServiceID("other", nil),
|
|
|
|
},
|
|
|
|
QueryOptions: structs.QueryOptions{
|
|
|
|
MinQueryIndex: index,
|
|
|
|
MaxQueryTime: time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&out,
|
|
|
|
))
|
|
|
|
|
|
|
|
// Should block at least 100ms
|
|
|
|
require.True(t, time.Since(start) >= 100*time.Millisecond, "too fast")
|
|
|
|
|
|
|
|
// Check the indexes
|
|
|
|
require.Equal(t, out.Index, index+1)
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
QueryMeta: out.QueryMeta, // don't care
|
|
|
|
}
|
|
|
|
|
|
|
|
require.Equal(t, expected, out)
|
|
|
|
index = out.Index
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-08-05 19:52:35 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_UpstreamProxyDefaultsProtocol(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-08-05 19:52:35 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create a dummy proxy/service config in the state store to look up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-05 19:52:35 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-05 19:52:35 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "bar",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-05 19:52:35 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "other",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-05 19:52:35 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "alreadyprotocol",
|
|
|
|
Protocol: "grpc",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-08-05 19:52:35 +00:00
|
|
|
|
|
|
|
args := structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
Upstreams: []string{"bar", "other", "alreadyprotocol", "dne"},
|
|
|
|
}
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
UpstreamConfigs: map[string]map[string]interface{}{
|
2020-06-16 17:19:31 +00:00
|
|
|
"bar": {
|
2019-08-05 19:52:35 +00:00
|
|
|
"protocol": "http",
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
"other": {
|
2019-08-05 19:52:35 +00:00
|
|
|
"protocol": "http",
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
"dne": {
|
2020-05-21 21:08:39 +00:00
|
|
|
"protocol": "http",
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
"alreadyprotocol": {
|
2019-08-05 19:52:35 +00:00
|
|
|
"protocol": "grpc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// Don't know what this is deterministically
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
}
|
|
|
|
|
2020-05-21 21:08:39 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_ProxyDefaultsProtocol_UsedForAllUpstreams(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2020-05-21 21:08:39 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create a dummy proxy/service config in the state store to look up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2020-05-21 21:08:39 +00:00
|
|
|
|
|
|
|
args := structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
Upstreams: []string{"bar"},
|
|
|
|
}
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
UpstreamConfigs: map[string]map[string]interface{}{
|
2020-06-16 17:19:31 +00:00
|
|
|
"bar": {
|
2020-05-21 21:08:39 +00:00
|
|
|
"protocol": "http",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// Don't know what this is deterministically
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
}
|
|
|
|
|
2019-05-02 13:12:21 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfigNoConfig(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-05-02 13:12:21 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Don't create any config and make sure we don't nil panic (spoiler alert -
|
|
|
|
// we did in first RC)
|
|
|
|
args := structs.ServiceConfigRequest{
|
|
|
|
Name: "foo",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
Upstreams: []string{"bar", "baz"},
|
|
|
|
}
|
|
|
|
var out structs.ServiceConfigResponse
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out))
|
|
|
|
|
|
|
|
expected := structs.ServiceConfigResponse{
|
|
|
|
ProxyConfig: nil,
|
|
|
|
UpstreamConfigs: nil,
|
|
|
|
// Don't know what this is deterministically
|
|
|
|
QueryMeta: out.QueryMeta,
|
|
|
|
}
|
|
|
|
require.Equal(expected, out)
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
func TestConfigEntry_ResolveServiceConfig_ACLDeny(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-04-07 06:38:08 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
2021-08-06 22:00:58 +00:00
|
|
|
c.PrimaryDatacenter = "dc1"
|
2019-04-07 06:38:08 +00:00
|
|
|
c.ACLsEnabled = true
|
|
|
|
c.ACLMasterToken = "root"
|
2021-08-06 22:39:39 +00:00
|
|
|
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
2019-04-07 06:38:08 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2020-05-29 21:16:03 +00:00
|
|
|
testrpc.WaitForTestAgent(t, s1.RPC, "dc1", testrpc.WithToken("root"))
|
2019-04-07 06:38:08 +00:00
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
// Create the ACL.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTokenTypeClient,
|
|
|
|
Rules: `
|
|
|
|
service "foo" {
|
|
|
|
policy = "write"
|
|
|
|
}
|
|
|
|
operator = "write"
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var id string
|
|
|
|
if err := msgpackrpc.CallWithCodec(codec, "ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create some dummy service/proxy configs to be looked up.
|
|
|
|
state := s1.fsm.State()
|
|
|
|
require.NoError(state.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(2, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "foo",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
require.NoError(state.EnsureConfigEntry(3, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "db",
|
2021-02-03 23:10:38 +00:00
|
|
|
}))
|
2019-04-07 06:38:08 +00:00
|
|
|
|
|
|
|
// This should fail since we don't have write perms for the "db" service.
|
|
|
|
args := structs.ServiceConfigRequest{
|
|
|
|
Name: "db",
|
|
|
|
Datacenter: s1.config.Datacenter,
|
|
|
|
QueryOptions: structs.QueryOptions{Token: id},
|
|
|
|
}
|
2019-05-02 14:49:37 +00:00
|
|
|
var out structs.ServiceConfigResponse
|
2019-04-07 06:38:08 +00:00
|
|
|
err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out)
|
|
|
|
if !acl.IsErrPermissionDenied(err) {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The "foo" service should work.
|
|
|
|
args.Name = "foo"
|
|
|
|
require.NoError(msgpackrpc.CallWithCodec(codec, "ConfigEntry.ResolveServiceConfig", &args, &out))
|
|
|
|
|
|
|
|
}
|
2019-09-26 02:55:52 +00:00
|
|
|
|
|
|
|
func TestConfigEntry_ProxyDefaultsExposeConfig(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
}
|
|
|
|
|
2019-09-26 02:55:52 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
codec := rpcClient(t, s1)
|
|
|
|
defer codec.Close()
|
|
|
|
|
|
|
|
expose := structs.ExposeConfig{
|
|
|
|
Checks: true,
|
|
|
|
Paths: []structs.ExposePath{
|
|
|
|
{
|
|
|
|
LocalPathPort: 8080,
|
|
|
|
ListenerPort: 21500,
|
|
|
|
Protocol: "http2",
|
|
|
|
Path: "/healthz",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
args := structs.ConfigEntryRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Entry: &structs.ProxyConfigEntry{
|
|
|
|
Kind: "proxy-defaults",
|
|
|
|
Name: "global",
|
|
|
|
Expose: expose,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
out := false
|
|
|
|
require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.Apply", &args, &out))
|
|
|
|
require.True(t, out)
|
|
|
|
|
|
|
|
state := s1.fsm.State()
|
2020-01-24 15:04:58 +00:00
|
|
|
_, entry, err := state.ConfigEntry(nil, structs.ProxyDefaults, "global", nil)
|
2019-09-26 02:55:52 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
proxyConf, ok := entry.(*structs.ProxyConfigEntry)
|
|
|
|
require.True(t, ok)
|
|
|
|
require.Equal(t, expose, proxyConf.Expose)
|
|
|
|
}
|
2021-05-14 15:21:44 +00:00
|
|
|
|
|
|
|
func runStep(t *testing.T, name string, fn func(t *testing.T)) {
|
|
|
|
t.Helper()
|
|
|
|
if !t.Run(name, fn) {
|
|
|
|
t.FailNow()
|
|
|
|
}
|
|
|
|
}
|