b43799eee1
The api module previously had defaultPartition and defaultNamespace vars for when we need default/empty split usage between ent/oss respectively. This commit moves those two variables out of test code so that they can be used for the service exports config entry's `GetNamespace()` method. Previously `GetNamespace()` would return "default" in both OSS and enterprise, which can trip up automation that passes the result of this method as the namespace to write a config entry. The split vars are kept private to prevent external usage, and prefixed with `split` for more clarity about their behavior.
104 lines
2.4 KiB
Go
104 lines
2.4 KiB
Go
package api
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/hashicorp/consul/sdk/testutil"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAPI_ConfigEntries_ExportedServices(t *testing.T) {
|
|
t.Parallel()
|
|
c, s := makeClient(t)
|
|
defer s.Stop()
|
|
|
|
entries := c.ConfigEntries()
|
|
|
|
testutil.RunStep(t, "set and get", func(t *testing.T) {
|
|
exports := &ExportedServicesConfigEntry{
|
|
Name: PartitionDefaultName,
|
|
Partition: splitDefaultPartition,
|
|
Meta: map[string]string{
|
|
"gir": "zim",
|
|
},
|
|
}
|
|
|
|
_, wm, err := entries.Set(exports, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, wm)
|
|
require.NotEqual(t, 0, wm.RequestTime)
|
|
|
|
entry, qm, err := entries.Get(ExportedServices, PartitionDefaultName, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, qm)
|
|
require.NotEqual(t, 0, qm.RequestTime)
|
|
|
|
result, ok := entry.(*ExportedServicesConfigEntry)
|
|
require.True(t, ok)
|
|
|
|
// ignore indexes
|
|
result.CreateIndex = 0
|
|
result.ModifyIndex = 0
|
|
require.Equal(t, exports, result)
|
|
})
|
|
|
|
testutil.RunStep(t, "update", func(t *testing.T) {
|
|
updated := &ExportedServicesConfigEntry{
|
|
Name: PartitionDefaultName,
|
|
Services: []ExportedService{
|
|
{
|
|
Name: "db",
|
|
Namespace: splitDefaultNamespace,
|
|
Consumers: []ServiceConsumer{
|
|
{
|
|
PeerName: "alpha",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Meta: map[string]string{
|
|
"foo": "bar",
|
|
"gir": "zim",
|
|
},
|
|
Partition: splitDefaultPartition,
|
|
}
|
|
|
|
_, wm, err := entries.Set(updated, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, wm)
|
|
require.NotEqual(t, 0, wm.RequestTime)
|
|
|
|
entry, qm, err := entries.Get(ExportedServices, PartitionDefaultName, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, qm)
|
|
require.NotEqual(t, 0, qm.RequestTime)
|
|
|
|
result, ok := entry.(*ExportedServicesConfigEntry)
|
|
require.True(t, ok)
|
|
|
|
// ignore indexes
|
|
result.CreateIndex = 0
|
|
result.ModifyIndex = 0
|
|
require.Equal(t, updated, result)
|
|
})
|
|
|
|
testutil.RunStep(t, "list", func(t *testing.T) {
|
|
entries, qm, err := entries.List(ExportedServices, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, qm)
|
|
require.NotEqual(t, 0, qm.RequestTime)
|
|
require.Len(t, entries, 1)
|
|
})
|
|
|
|
testutil.RunStep(t, "delete", func(t *testing.T) {
|
|
wm, err := entries.Delete(ExportedServices, PartitionDefaultName, nil)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, wm)
|
|
require.NotEqual(t, 0, wm.RequestTime)
|
|
|
|
// verify deletion
|
|
_, _, err = entries.Get(MeshConfig, PartitionDefaultName, nil)
|
|
require.Error(t, err)
|
|
})
|
|
}
|