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

Fixup filtering tests 

Missed annotations for SocketPath, LocalSocketPath, LocalServiceSocketPath

Signed-off-by: Mark Anderson <manderson@hashicorp.com>
This commit is contained in:
Mark Anderson 2021-05-04 18:30:48 -07:00
parent ac4cb213a1
commit a78a891d56
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
agent/structs/structs_filtering_test.go
View File

@ -183,8 +183,8 @@ var expectedFieldConfigUpstreams bexpr.FieldConfigurations = bexpr.FieldConfigur
}, },
"LocalBindSocketMode": &bexpr.FieldConfiguration{ "LocalBindSocketMode": &bexpr.FieldConfiguration{
StructFieldName: "LocalBindSocketMode", StructFieldName: "LocalBindSocketMode",
CoerceFn: bexpr.CoerceInt, CoerceFn: bexpr.CoerceString,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual}, SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
}, },
"MeshGateway": &bexpr.FieldConfiguration{ "MeshGateway": &bexpr.FieldConfiguration{
StructFieldName: "MeshGateway", StructFieldName: "MeshGateway",
@ -213,6 +213,11 @@ var expectedFieldConfigConnectProxyConfig bexpr.FieldConfigurations = bexpr.Fiel
CoerceFn: bexpr.CoerceInt, CoerceFn: bexpr.CoerceInt,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual}, SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
}, },
"LocalServiceSocketPath": &bexpr.FieldConfiguration{
StructFieldName: "LocalServiceSocketPath",
CoerceFn: bexpr.CoerceString,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
},
"Upstreams": &bexpr.FieldConfiguration{ "Upstreams": &bexpr.FieldConfiguration{
StructFieldName: "Upstreams", StructFieldName: "Upstreams",
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchIsEmpty, bexpr.MatchIsNotEmpty}, SupportedOperations: []bexpr.MatchOperator{bexpr.MatchIsEmpty, bexpr.MatchIsNotEmpty},
@ -366,6 +371,11 @@ var expectedFieldConfigNodeService bexpr.FieldConfigurations = bexpr.FieldConfig
CoerceFn: bexpr.CoerceInt, CoerceFn: bexpr.CoerceInt,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual}, SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
}, },
"SocketPath": &bexpr.FieldConfiguration{
StructFieldName: "SocketPath",
CoerceFn: bexpr.CoerceString,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
},
"Weights": &bexpr.FieldConfiguration{ "Weights": &bexpr.FieldConfiguration{
StructFieldName: "Weights", StructFieldName: "Weights",
SubFields: expectedFieldConfigWeights, SubFields: expectedFieldConfigWeights,
@ -460,6 +470,11 @@ var expectedFieldConfigServiceNode bexpr.FieldConfigurations = bexpr.FieldConfig
CoerceFn: bexpr.CoerceInt, CoerceFn: bexpr.CoerceInt,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual}, SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
}, },
"ServiceSocketPath": &bexpr.FieldConfiguration{
StructFieldName: "ServiceSocketPath",
CoerceFn: bexpr.CoerceString,
SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
},
"ServiceWeights": &bexpr.FieldConfiguration{ "ServiceWeights": &bexpr.FieldConfiguration{
StructFieldName: "ServiceWeights", StructFieldName: "ServiceWeights",
SubFields: expectedFieldConfigWeights, SubFields: expectedFieldConfigWeights,

1
api/agent.go
View File

@ -82,6 +82,7 @@ type AgentService struct {
Meta map[string]string Meta map[string]string
Port int Port int
Address string Address string
SocketPath string
TaggedAddresses map[string]ServiceAddress `json:",omitempty"` TaggedAddresses map[string]ServiceAddress `json:",omitempty"`
Weights AgentWeights Weights AgentWeights
EnableTagOverride bool EnableTagOverride bool