Skip to content

Commit ab74d45

Browse files
prometherionprometherion
committed
MINOR: sd: non setting port with a zero value
1 parent cdd356b commit ab74d45

File tree

4 files changed

+33
-19
lines changed

4 files changed

+33
-19
lines changed

‎discovery/aws_service_discovery_instance.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131

3232
"github.com/haproxytech/dataplaneapi/haproxy"
3333
"github.com/haproxytech/dataplaneapi/log"
34+
"github.com/haproxytech/dataplaneapi/misc"
3435
)
3536

3637
const (
@@ -76,7 +77,7 @@ func (a awsService) Changed() bool {
7677

7778
func (a awsService) GetServers() (servers []configuration.ServiceServer) {
7879
for _, instance := range a.instances {
79-
port, _ := a.instancePortFromEC2(instance)
80+
parsedPort, _ := a.instancePortFromEC2(instance)
8081
var address string
8182
switch a.ipv4 {
8283
case models.AwsRegionIPV4AddressPrivate:
@@ -90,6 +91,12 @@ func (a awsService) GetServers() (servers []configuration.ServiceServer) {
9091
if len(address) == 0 {
9192
continue
9293
}
94+
var port *int64
95+
96+
if parsedPort > 0 {
97+
port = misc.Int64P(parsedPort)
98+
}
99+
93100
servers = append(servers, configuration.ServiceServer{
94101
Address: address,
95102
Port: port,

‎discovery/consul_service_discovery_instance.go

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import (
2727

2828
"github.com/haproxytech/client-native/v6/configuration"
2929
"github.com/haproxytech/client-native/v6/models"
30+
3031
"github.com/haproxytech/dataplaneapi/log"
32+
"github.com/haproxytech/dataplaneapi/misc"
33+
3134
jsoniter "github.com/json-iterator/go"
3235
)
3336

@@ -178,15 +181,21 @@ func (c *consulInstance) convertToServers(nodes []*serviceEntry) []configuration
178181
continue
179182
}
180183
if node.Service.Address != "" {
181-
servers = append(servers, configuration.ServiceServer{
184+
ss := configuration.ServiceServer{
182185
Address: node.Service.Address,
183-
Port: node.Service.Port,
184-
})
186+
}
187+
if node.Service.Port > 0 {
188+
ss.Port = misc.Int64P(node.Service.Port)
189+
}
190+
servers = append(servers, ss)
185191
} else {
186-
servers = append(servers, configuration.ServiceServer{
192+
ss := configuration.ServiceServer{
187193
Address: node.Node.Address,
188-
Port: node.Service.Port,
189-
})
194+
}
195+
if node.Service.Port > 0 {
196+
ss.Port = misc.Int64P(node.Service.Port)
197+
}
198+
servers = append(servers, ss)
190199
}
191200
}
192201
return servers

‎go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/docker/go-units v0.5.0
1414
github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0
1515
github.com/fsnotify/fsnotify v1.9.0
16-
github.com/getkin/kin-openapi v0.132.0
16+
github.com/getkin/kin-openapi v0.124.0
1717
github.com/go-openapi/errors v0.22.1
1818
github.com/go-openapi/loads v0.22.0
1919
github.com/go-openapi/runtime v0.28.0
@@ -24,7 +24,7 @@ require (
2424
github.com/google/go-cmp v0.7.0
2525
github.com/google/renameio v1.0.1
2626
github.com/google/uuid v1.6.0
27-
github.com/haproxytech/client-native/v6 v6.1.1-0.20250512124316-6fa1f9776b04
27+
github.com/haproxytech/client-native/v6 v6.1.1-0.20250514135309-d3350c57651a
2828
github.com/jessevdk/go-flags v1.6.1
2929
github.com/joho/godotenv v1.5.1
3030
github.com/json-iterator/go v1.1.12
@@ -64,6 +64,7 @@ require (
6464
github.com/go-openapi/jsonreference v0.21.0 // indirect
6565
github.com/gofrs/flock v0.12.1 // indirect
6666
github.com/haproxytech/go-logger v1.1.0 // indirect
67+
github.com/invopop/yaml v0.2.0 // indirect
6768
github.com/josharian/intern v1.0.0 // indirect
6869
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
6970
github.com/kr/text v0.2.0 // indirect
@@ -73,8 +74,6 @@ require (
7374
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7475
github.com/modern-go/reflect2 v1.0.2 // indirect
7576
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
76-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
77-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
7877
github.com/oklog/ulid v1.3.1 // indirect
7978
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
8079
github.com/perimeterx/marshmallow v1.1.5 // indirect

‎go.sum

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yi
4848
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
4949
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
5050
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
51-
github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk=
52-
github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58=
51+
github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
52+
github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
5353
github.com/go-faker/faker/v4 v4.6.1 h1:xUyVpAjEtB04l6XFY0V/29oR332rOSPWV4lU8RwDt4k=
5454
github.com/go-faker/faker/v4 v4.6.1/go.mod h1:arSdxNCSt7mOhdk8tEolvHeIJ7eX4OX80wXjKKvkKBY=
5555
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -86,10 +86,12 @@ github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU
8686
github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
8787
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8888
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
89-
github.com/haproxytech/client-native/v6 v6.1.1-0.20250512124316-6fa1f9776b04 h1:CVSB4YfZSKDOapT6iWMLpiS1fY79YJFMRU9tqEs5kSU=
90-
github.com/haproxytech/client-native/v6 v6.1.1-0.20250512124316-6fa1f9776b04/go.mod h1:9oSa/7gU3+/cyQKaugiELyExVpHh2hJ7zXSA6kOxRuA=
89+
github.com/haproxytech/client-native/v6 v6.1.1-0.20250514135309-d3350c57651a h1:JtrtDL8jqUIj/iEr28p3KDPynMDrznZtqpK7sVag1cU=
90+
github.com/haproxytech/client-native/v6 v6.1.1-0.20250514135309-d3350c57651a/go.mod h1:9oSa/7gU3+/cyQKaugiELyExVpHh2hJ7zXSA6kOxRuA=
9191
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
9292
github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
93+
github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
94+
github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
9395
github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
9496
github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=
9597
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
@@ -126,10 +128,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
126128
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
127129
github.com/nathanaelle/syslog5424/v2 v2.0.5 h1:oLVYQmKnv3nlnmvlbBWM+iWl9AONcU+tuxIL0fjko5A=
128130
github.com/nathanaelle/syslog5424/v2 v2.0.5/go.mod h1:f9MvsGkLOtYh2VzLT4Pjuwx3+Xv2EogxJNda+HLPDus=
129-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY=
130-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
131-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
132-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
133131
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
134132
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
135133
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
@@ -191,5 +189,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
191189
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
192190
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
193191
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
192+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
194193
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
195194
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)