implement SetTableName patttern that allows table name to be set back to the default for the storage type. (#196)

This commit is contained in:
Jim authored and GitHub committed 2020-07-17 16:20:56 -04:00
1 parent fa5f45260b
commit c83e90ed38
20 files changed
+768 -46

No files matched your search

+35 -12
View File
@@ -1,16 +1,27 @@
package static
const (
defaultHostCatalogTableName = "static_host_catalog"
defaultHostTableName = "static_host"
defaultHostSetTableName = "static_host_set"
defaultHostSetMemberTableName = "static_host_set_member"
)
// TableName returns the table name for the host catalog.
func (c *HostCatalog) TableName() string {
if c.tableName != "" {
return c.tableName
}
return "static_host_catalog"
return defaultHostCatalogTableName
}
// SetTableName sets the table name.
// SetTableName sets the table name. If the caller attempts to
// set the name to "" the name will be reset to the default name.
func (c *HostCatalog) SetTableName(n string) {
if n != "" {
switch n {
case "":
c.tableName = defaultHostCatalogTableName
default:
c.tableName = n
}
}
@@ -20,12 +31,16 @@ func (h *Host) TableName() string {
if h.tableName != "" {
return h.tableName
}
return "static_host"
return defaultHostTableName
}
// SetTableName sets the table name.
// SetTableName sets the table name. If the caller attempts to
// set the name to "" the name will be reset to the default name.
func (h *Host) SetTableName(n string) {
if n != "" {
switch n {
case "":
h.tableName = defaultHostTableName
default:
h.tableName = n
}
}
@@ -35,12 +50,16 @@ func (s *HostSet) TableName() string {
if s.tableName != "" {
return s.tableName
}
return "static_host_set"
return defaultHostSetTableName
}
// SetTableName sets the table name.
// SetTableName sets the table name. If the caller attempts to
// set the name to "" the name will be reset to the default name.
func (s *HostSet) SetTableName(n string) {
if n != "" {
switch n {
case "":
s.tableName = defaultHostSetTableName
default:
s.tableName = n
}
}
@@ -50,12 +69,16 @@ func (m *HostSetMember) TableName() string {
if m.tableName != "" {
return m.tableName
}
return "static_host_set_member"
return defaultHostSetMemberTableName
}
// SetTableName sets the table name.
// SetTableName sets the table name. If the caller attempts to
// set the name to "" the name will be reset to the default name.
func (m *HostSetMember) SetTableName(n string) {
if n != "" {
switch n {
case "":
m.tableName = defaultHostSetMemberTableName
default:
m.tableName = n
}
}
+159
View File
@@ -0,0 +1,159 @@
package static
import (
"testing"
"github.com/hashicorp/watchtower/internal/host/static/store"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestHostCatalog_SetTableName(t *testing.T) {
defaultTableName := defaultHostCatalogTableName
tests := []struct {
name string
initialName string
setNameTo string
want string
}{
{
name: "new-name",
initialName: "",
setNameTo: "new-name",
want: "new-name",
},
{
name: "reset to default",
initialName: "initial",
setNameTo: "",
want: defaultTableName,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
def := allocCatalog()
require.Equal(defaultTableName, def.TableName())
s := &HostCatalog{
HostCatalog: &store.HostCatalog{},
tableName: tt.initialName,
}
s.SetTableName(tt.setNameTo)
assert.Equal(tt.want, s.TableName())
})
}
}
func TestHost_SetTableName(t *testing.T) {
defaultTableName := defaultHostTableName
tests := []struct {
name string
initialName string
setNameTo string
want string
}{
{
name: "new-name",
initialName: "",
setNameTo: "new-name",
want: "new-name",
},
{
name: "reset to default",
initialName: "initial",
setNameTo: "",
want: defaultTableName,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
def := &Host{
Host: &store.Host{},
}
require.Equal(defaultTableName, def.TableName())
s := &Host{
Host: &store.Host{},
tableName: tt.initialName,
}
s.SetTableName(tt.setNameTo)
assert.Equal(tt.want, s.TableName())
})
}
}
func TestHostSet_SetTableName(t *testing.T) {
defaultTableName := defaultHostSetTableName
tests := []struct {
name string
initialName string
setNameTo string
want string
}{
{
name: "new-name",
initialName: "",
setNameTo: "new-name",
want: "new-name",
},
{
name: "reset to default",
initialName: "initial",
setNameTo: "",
want: defaultTableName,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
def := &HostSet{
HostSet: &store.HostSet{},
}
require.Equal(defaultTableName, def.TableName())
s := &HostSet{
HostSet: &store.HostSet{},
tableName: tt.initialName,
}
s.SetTableName(tt.setNameTo)
assert.Equal(tt.want, s.TableName())
})
}
}
func TestHostSetMember_SetTableName(t *testing.T) {
defaultTableName := defaultHostSetMemberTableName
tests := []struct {
name string
initialName string
setNameTo string
want string
}{
{
name: "new-name",
initialName: "",
setNameTo: "new-name",
want: "new-name",
},
{
name: "reset to default",
initialName: "initial",
setNameTo: "",
want: defaultTableName,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
def := &HostSetMember{
HostSetMember: &store.HostSetMember{},
}
require.Equal(defaultTableName, def.TableName())
s := &HostSetMember{
HostSetMember: &store.HostSetMember{},
tableName: tt.initialName,
}
s.SetTableName(tt.setNameTo)
assert.Equal(tt.want, s.TableName())
})
}
}