Skip to content

Commit e8a59fd

Browse files
ccoVeillemrueg
authored andcommitted
build(deps): bump github.com/ccoveille/go-safecast to 1.8.1
1 parent 2ffdb15 commit e8a59fd

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12
77
github.com/aws/aws-sdk-go-v2/service/ec2 v1.260.0
88
github.com/aws/smithy-go v1.23.1
9-
github.com/ccoveille/go-safecast v1.6.1
9+
github.com/ccoveille/go-safecast v1.8.1
1010
github.com/coreos/go-iptables v0.8.0
1111
github.com/docker/docker v28.4.0+incompatible
1212
github.com/hashicorp/go-version v1.7.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
3434
github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
3535
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
3636
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
37-
github.com/ccoveille/go-safecast v1.6.1 h1:Nb9WMDR8PqhnKCVs2sCB+OqhohwO5qaXtCviZkIff5Q=
38-
github.com/ccoveille/go-safecast v1.6.1/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
37+
github.com/ccoveille/go-safecast v1.8.1 h1:RoucjfYKKcx2lFmIjRjuo8AeX9k/GaZn5SUMHlA3kMw=
38+
github.com/ccoveille/go-safecast v1.8.1/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
3939
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
4040
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
4141
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

pkg/controllers/proxy/ipset_fixture_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func buildIPVSServicesFromFixtures(t *testing.T, services *v1.ServiceList) []*ip
149149
require.GreaterOrEqualf(t, port.Port, int32(0), "service %s/%s has negative port %d", svc.Namespace, svc.Name, port.Port)
150150
const maxServicePort = 1<<16 - 1
151151
require.LessOrEqualf(t, port.Port, int32(maxServicePort), "service %s/%s port %d exceeds %d", svc.Namespace, svc.Name, port.Port, maxServicePort)
152-
targetPort, err := safecast.ToUint16(port.Port)
152+
targetPort, err := safecast.Convert[uint16](port.Port)
153153
if err != nil {
154154
t.Fatalf("failed to convert port %d to uint16: %v", port.Port, err)
155155
}

pkg/controllers/proxy/linux_networking.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func (ln *linuxNetworking) ipvsAddService(svcs []*ipvs.Service, vip net.IP, prot
297297
vip, svc.Address, protocol, svc.Protocol, port, svc.Port)
298298
if vip.Equal(svc.Address) && protocol == svc.Protocol && port == svc.Port {
299299
klog.V(2).Info("Service matched VIP")
300-
ptim, err := safecast.ToUint32(persistentTimeout)
300+
ptim, err := safecast.Convert[uint32](persistentTimeout)
301301
if err != nil {
302302
return svcs, nil, fmt.Errorf("failed to convert persistent timeout to uint32: %v", err)
303303
}

pkg/controllers/proxy/metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (nsc *NetworkServicesController) getMetricsServiceMap() metricsServiceMap {
3030

3131
for _, svc := range nsc.getServiceMap() {
3232
key := metricsServiceMapKey{}
33-
key.uPort, err = safecast.ToUint16(svc.port)
33+
key.uPort, err = safecast.Convert[uint16](svc.port)
3434
if err != nil {
3535
klog.Errorf("failed to convert port %d to uint16: %v", svc.port, err)
3636
continue
@@ -51,7 +51,7 @@ func (nsc *NetworkServicesController) getMetricsServiceMap() metricsServiceMap {
5151
}
5252
if svc.nodePort != 0 {
5353
key.ip = nsc.krNode.GetPrimaryNodeIP().String()
54-
key.uPort, err = safecast.ToUint16(svc.nodePort)
54+
key.uPort, err = safecast.Convert[uint16](svc.nodePort)
5555
if err != nil {
5656
klog.Errorf("failed to convert nodePort %d to uint16: %v", svc.nodePort, err)
5757
continue

pkg/controllers/proxy/network_services_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ func ipvsDestinationString(d *ipvs.Destination) string {
14821482

14831483
func ipvsSetPersistence(svc *ipvs.Service, p bool, timeout int32) error {
14841484
if p {
1485-
uTimeout, err := safecast.ToUint32(timeout)
1485+
uTimeout, err := safecast.Convert[uint32](timeout)
14861486
if err != nil {
14871487
return fmt.Errorf("failed to convert timeout to uint32: %v", err)
14881488
}

pkg/controllers/proxy/service_endpoints_sync.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (nsc *NetworkServicesController) setupClusterIPServices(serviceInfoMap serv
133133
if err != nil {
134134
return fmt.Errorf("failed creating dummy interface: %v", err)
135135
}
136-
sPort, err := safecast.ToUint16(svc.port)
136+
sPort, err := safecast.Convert[uint16](svc.port)
137137
if err != nil {
138138
return fmt.Errorf("failed to convert service port to uint16: %v", err)
139139
}
@@ -242,7 +242,7 @@ func (nsc *NetworkServicesController) addEndpointsToIPVSService(endpoints []endp
242242
syscallINET = syscall.AF_INET6
243243
}
244244

245-
ePort, err := safecast.ToUint16(endpoint.port)
245+
ePort, err := safecast.Convert[uint16](endpoint.port)
246246
if err != nil {
247247
klog.Errorf("failed to convert endpoint port to uint16: %v", err)
248248
continue
@@ -289,7 +289,7 @@ func (nsc *NetworkServicesController) setupNodePortServices(serviceInfoMap servi
289289
continue
290290
}
291291

292-
nPort, err := safecast.ToUint16(svc.nodePort)
292+
nPort, err := safecast.Convert[uint16](svc.nodePort)
293293
if err != nil {
294294
return fmt.Errorf("failed to convert node port to uint16: %v", err)
295295
}
@@ -451,7 +451,7 @@ func (nsc *NetworkServicesController) setupExternalIPForService(svc *serviceInfo
451451
return fmt.Errorf("failed get list of IPVS services due to: %v", err)
452452
}
453453

454-
sPort, err := safecast.ToUint16(svc.port)
454+
sPort, err := safecast.Convert[uint16](svc.port)
455455
if err != nil {
456456
return fmt.Errorf("failed to convert service port to uint16: %v", err)
457457
}
@@ -549,7 +549,7 @@ func (nsc *NetworkServicesController) setupExternalIPForDSRService(svcIn *servic
549549
return fmt.Errorf("failed to generate FW mark")
550550
}
551551

552-
sInPort, err := safecast.ToUint16(svcIn.port)
552+
sInPort, err := safecast.Convert[uint16](svcIn.port)
553553
if err != nil {
554554
return fmt.Errorf("failed to convert serviceIn port to uint16: %v", err)
555555
}
@@ -614,7 +614,7 @@ func (nsc *NetworkServicesController) setupExternalIPForDSRService(svcIn *servic
614614
syscallINET = syscall.AF_INET6
615615
}
616616

617-
ePort, err := safecast.ToUint16(endpoint.port)
617+
ePort, err := safecast.Convert[uint16](endpoint.port)
618618
if err != nil {
619619
return fmt.Errorf("failed to convert endpoint port to uint16: %v", err)
620620
}

pkg/controllers/routing/bgp_policies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (nrc *NetworkRoutingController) addPodCidrDefinedSet() error {
136136
if cidrLen < 0 || cidrLen > cidrMax {
137137
return fmt.Errorf("the pod CIDR IP given is not a proper mask: %d", cidrLen)
138138
}
139-
uCIDRLen, err := safecast.ToUint32(cidrLen)
139+
uCIDRLen, err := safecast.Convert[uint32](cidrLen)
140140
if err != nil {
141141
return fmt.Errorf("failed to convert CIDR length to uint32: %v", err)
142142
}
@@ -324,7 +324,7 @@ func (nrc *NetworkRoutingController) addCustomImportRejectDefinedSet() error {
324324
prefix.IpPrefix = ipNet.String()
325325
mask, _ := ipNet.Mask.Size()
326326

327-
uIntMask, err := safecast.ToUint32(mask)
327+
uIntMask, err := safecast.Convert[uint32](mask)
328328
if err != nil {
329329
return fmt.Errorf("failed to convert mask to uint32: %v", err)
330330
}

pkg/controllers/routing/network_routes_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ func (nrc *NetworkRoutingController) startBgpServer(grpcServer bool) error {
10741074
localAddressList = append(localAddressList, addr)
10751075
}
10761076

1077-
intBGPPort, err := safecast.ToInt32(nrc.bgpPort)
1077+
intBGPPort, err := safecast.Convert[int32](nrc.bgpPort)
10781078
if err != nil {
10791079
return fmt.Errorf("failed to convert BGP port to int32: %v", err)
10801080
}
@@ -1422,7 +1422,7 @@ func NewNetworkRoutingController(clientset kubernetes.Interface,
14221422
// Convert ints to uint32s
14231423
peerASNs := make([]uint32, 0)
14241424
for _, i := range kubeRouterConfig.PeerASNs {
1425-
ui, err := safecast.ToUint32(i)
1425+
ui, err := safecast.Convert[uint32](i)
14261426
if err != nil {
14271427
return nil, fmt.Errorf("failed to convert Peer ASNs to uint32: %s", err)
14281428
}
@@ -1433,7 +1433,7 @@ func NewNetworkRoutingController(clientset kubernetes.Interface,
14331433
// Convert uints to uint16s
14341434
peerPorts := make([]uint32, 0)
14351435
for _, i := range kubeRouterConfig.PeerPorts {
1436-
ui, err := safecast.ToUint32(i)
1436+
ui, err := safecast.Convert[uint32](i)
14371437
if err != nil {
14381438
return nil, fmt.Errorf("failed to convert Peer Port to uint32: %s", err)
14391439
}

0 commit comments

Comments
 (0)