kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 01:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: consul mesh gateway type need not be pointer

Browse Source 
This PR changes the use of structs.ConsulMeshGateway to value types
instead of via pointers. This will help in a follow up PR where we
cleanup a lot of custom comparison code with helper functions instead.
This commit is contained in:
Seth Hoenig
2022-08-13 09:31:17 -05:00
parent 3bb59bee82
commit 47d44d62bb
7 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/consul/connect.go
View File

@@ -209,15 +209,11 @@ func connectUpstreams(in []structs.ConsulUpstream) []api.Upstream {
// connectMeshGateway creates an api.MeshGatewayConfig from the nomad upstream
// block. A non-existent config or unsupported gateway mode will default to the
// Consul default mode.
func connectMeshGateway(in *structs.ConsulMeshGateway) api.MeshGatewayConfig {
func connectMeshGateway(in structs.ConsulMeshGateway) api.MeshGatewayConfig {
gw := api.MeshGatewayConfig{
Mode: api.MeshGatewayModeDefault,
}
if in == nil {
return gw
}
switch in.Mode {
case "local":
gw.Mode = api.MeshGatewayModeLocal

12
command/agent/consul/connect_test.go
View File

@@ -568,28 +568,28 @@ func TestConnect_newConnectGateway(t *testing.T) {
func Test_connectMeshGateway(t *testing.T) {
ci.Parallel(t)
t.Run("nil", func(t *testing.T) {
result := connectMeshGateway(nil)
t.Run("empty", func(t *testing.T) {
result := connectMeshGateway(structs.ConsulMeshGateway{})
require.Equal(t, api.MeshGatewayConfig{Mode: api.MeshGatewayModeDefault}, result)
})
t.Run("local", func(t *testing.T) {
result := connectMeshGateway(&structs.ConsulMeshGateway{Mode: "local"})
result := connectMeshGateway(structs.ConsulMeshGateway{Mode: "local"})
require.Equal(t, api.MeshGatewayConfig{Mode: api.MeshGatewayModeLocal}, result)
})
t.Run("remote", func(t *testing.T) {
result := connectMeshGateway(&structs.ConsulMeshGateway{Mode: "remote"})
result := connectMeshGateway(structs.ConsulMeshGateway{Mode: "remote"})
require.Equal(t, api.MeshGatewayConfig{Mode: api.MeshGatewayModeRemote}, result)
})
t.Run("none", func(t *testing.T) {
result := connectMeshGateway(&structs.ConsulMeshGateway{Mode: "none"})
result := connectMeshGateway(structs.ConsulMeshGateway{Mode: "none"})
require.Equal(t, api.MeshGatewayConfig{Mode: api.MeshGatewayModeNone}, result)
})
t.Run("nonsense", func(t *testing.T) {
result := connectMeshGateway(nil)
result := connectMeshGateway(structs.ConsulMeshGateway{})
require.Equal(t, api.MeshGatewayConfig{Mode: api.MeshGatewayModeDefault}, result)
})
}

11
command/agent/job_endpoint.go
View File

@@ -1655,13 +1655,12 @@ func apiUpstreamsToStructs(in []*api.ConsulUpstream) []structs.ConsulUpstream {
return upstreams
}
func apiMeshGatewayToStructs(in *api.ConsulMeshGateway) *structs.ConsulMeshGateway {
if in == nil {
return nil
}
return &structs.ConsulMeshGateway{
Mode: in.Mode,
func apiMeshGatewayToStructs(in *api.ConsulMeshGateway) structs.ConsulMeshGateway {
var gw structs.ConsulMeshGateway
if in != nil {
gw.Mode = in.Mode
}
return gw
}
func apiConsulExposeConfigToStructs(in *api.ConsulExposeConfig) *structs.ConsulExposeConfig {

7
command/agent/job_endpoint_test.go
View File

@@ -3486,6 +3486,7 @@ func TestJobs_ApiJobToStructsJobUpdate(t *testing.T) {
}
// TestJobs_Matching_Resources asserts:
//
// api.{Default,Min}Resources == structs.{Default,Min}Resources
//
// While this is an odd place to test that, this is where both are imported,
@@ -3694,7 +3695,7 @@ func TestConversion_apiUpstreamsToStructs(t *testing.T) {
LocalBindPort: 8000,
Datacenter: "dc2",
LocalBindAddress: "127.0.0.2",
MeshGateway: &structs.ConsulMeshGateway{Mode: "local"},
MeshGateway: structs.ConsulMeshGateway{Mode: "local"},
}}, apiUpstreamsToStructs([]*api.ConsulUpstream{{
DestinationName: "upstream",
DestinationNamespace: "ns2",
@@ -3707,8 +3708,8 @@ func TestConversion_apiUpstreamsToStructs(t *testing.T) {
func TestConversion_apiConsulMeshGatewayToStructs(t *testing.T) {
ci.Parallel(t)
require.Nil(t, apiMeshGatewayToStructs(nil))
require.Equal(t, &structs.ConsulMeshGateway{Mode: "remote"},
require.Equal(t, structs.ConsulMeshGateway{}, apiMeshGatewayToStructs(nil))
require.Equal(t, structs.ConsulMeshGateway{Mode: "remote"},
apiMeshGatewayToStructs(&api.ConsulMeshGateway{Mode: "remote"}))
}

2
nomad/structs/diff_test.go
View File

@@ -2778,7 +2778,7 @@ func TestTaskGroupDiff(t *testing.T) {
LocalBindPort: 8000,
Datacenter: "dc2",
LocalBindAddress: "127.0.0.2",
MeshGateway: &ConsulMeshGateway{
MeshGateway: ConsulMeshGateway{
Mode: "remote",
},
},

16
nomad/structs/services.go
View File

@@ -1457,21 +1457,13 @@ type ConsulMeshGateway struct {
Mode string
}
func (c *ConsulMeshGateway) Copy() *ConsulMeshGateway {
if c == nil {
return nil
}
return &ConsulMeshGateway{
func (c *ConsulMeshGateway) Copy() ConsulMeshGateway {
return ConsulMeshGateway{
Mode: c.Mode,
}
}
func (c *ConsulMeshGateway) Equals(o *ConsulMeshGateway) bool {
if c == nil || o == nil {
return c == o
}
func (c *ConsulMeshGateway) Equals(o ConsulMeshGateway) bool {
return c.Mode == o.Mode
}
@@ -1509,7 +1501,7 @@ type ConsulUpstream struct {
// MeshGateway is the optional configuration of the mesh gateway for this
// upstream to use.
MeshGateway *ConsulMeshGateway
MeshGateway ConsulMeshGateway
}
func upstreamsEquals(a, b []ConsulUpstream) bool {

10
nomad/structs/services_test.go
View File

@@ -712,8 +712,8 @@ func TestConsulUpstream_upstreamEquals(t *testing.T) {
})
t.Run("different mesh_gateway", func(t *testing.T) {
a := []ConsulUpstream{{DestinationName: "foo", MeshGateway: &ConsulMeshGateway{Mode: "local"}}}
b := []ConsulUpstream{{DestinationName: "foo", MeshGateway: &ConsulMeshGateway{Mode: "remote"}}}
a := []ConsulUpstream{{DestinationName: "foo", MeshGateway: ConsulMeshGateway{Mode: "local"}}}
b := []ConsulUpstream{{DestinationName: "foo", MeshGateway: ConsulMeshGateway{Mode: "remote"}}}
require.False(t, upstreamsEquals(a, b))
})
@@ -1637,11 +1637,11 @@ func TestConsulMeshGateway_Copy(t *testing.T) {
func TestConsulMeshGateway_Equals(t *testing.T) {
ci.Parallel(t)
c := &ConsulMeshGateway{Mode: "local"}
require.False(t, c.Equals(nil))
c := ConsulMeshGateway{Mode: "local"}
require.False(t, c.Equals(ConsulMeshGateway{}))
require.True(t, c.Equals(c))
o := &ConsulMeshGateway{Mode: "remote"}
o := ConsulMeshGateway{Mode: "remote"}
require.False(t, c.Equals(o))
}