Skip to content

Commit 6d62fca

Browse files
dependabot[bot]AshleyDumaine
dependabot[bot]
and
AshleyDumaine
authored
🌱 Bump github.com/linode/linodego from 1.58.0 to 1.59.0 (#886)
* 🌱 Bump github.com/linode/linodego from 1.58.0 to 1.59.0 Bumps [github.com/linode/linodego](https://github.com/linode/linodego) from 1.58.0 to 1.59.0. - [Release notes](https://github.com/linode/linodego/releases) - [Commits](linode/linodego@v1.58.0...v1.59.0) --- updated-dependencies: - dependency-name: github.com/linode/linodego dependency-version: 1.59.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * address breaking pointer updates for linodego 1.59.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ashley Dumaine <[email protected]>
1 parent 845230c commit 6d62fca

File tree

5 files changed

+30
-29
lines changed

5 files changed

+30
-29
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/go-logr/logr v1.4.3
1616
github.com/google/go-cmp v0.7.0
1717
github.com/google/uuid v1.6.0
18-
github.com/linode/linodego v1.58.0
18+
github.com/linode/linodego v1.59.0
1919
github.com/onsi/ginkgo/v2 v2.25.3
2020
github.com/onsi/gomega v1.38.2
2121
github.com/stretchr/testify v1.11.1
@@ -137,7 +137,7 @@ require (
137137
go.uber.org/ratelimit v0.2.0 // indirect
138138
go.uber.org/zap v1.27.0 // indirect
139139
golang.org/x/net v0.44.0 // indirect
140-
golang.org/x/oauth2 v0.30.0 // indirect
140+
golang.org/x/oauth2 v0.31.0 // indirect
141141
golang.org/x/sys v0.36.0 // indirect
142142
golang.org/x/term v0.35.0 // indirect
143143
golang.org/x/text v0.29.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
178178
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
179179
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
180180
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
181-
github.com/linode/linodego v1.58.0 h1:yf/tDTf5v74qcxqWWvu3bEDOmDT1ulG9NBDdivp0/oM=
182-
github.com/linode/linodego v1.58.0/go.mod h1:ViH3Tun41yQdknbSyrdHz/iFDXsquLu+YwFdFneEZbY=
181+
github.com/linode/linodego v1.59.0 h1:kYz6sQH9g0u21gbI1UUFjZmFLirtc39JPybygrW76Q0=
182+
github.com/linode/linodego v1.59.0/go.mod h1:1+Bt0oTz5rBnDOJbGhccxn7LYVytXTIIfAy7QYmijDs=
183183
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
184184
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
185185
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
@@ -357,8 +357,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
357357
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
358358
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
359359
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
360-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
361-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
360+
golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
361+
golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
362362
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
363363
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
364364
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎internal/controller/linodemachine_controller_helpers.go‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ func getVPCLinodeInterfaceConfig(ctx context.Context, machineScope *scope.Machin
666666
VPC: &linodego.VPCInterfaceCreateOptions{
667667
SubnetID: subnetID,
668668
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
669-
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
669+
Addresses: &[]linodego.VPCInterfaceIPv4AddressCreateOptions{{
670670
Primary: ptr.To(true),
671671
NAT1To1Address: ptr.To("auto"),
672672
Address: ptr.To("auto"),
@@ -751,7 +751,7 @@ func getVPCLinodeInterfaceConfigFromDirectID(ctx context.Context, machineScope *
751751
VPC: &linodego.VPCInterfaceCreateOptions{
752752
SubnetID: subnetID,
753753
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
754-
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
754+
Addresses: &[]linodego.VPCInterfaceIPv4AddressCreateOptions{{
755755
Primary: ptr.To(true),
756756
NAT1To1Address: ptr.To("auto"),
757757
Address: ptr.To("auto"),
@@ -841,10 +841,7 @@ func isIPv6ConfigEmpty(opts *linodego.InstanceConfigInterfaceCreateOptionsIPv6)
841841
}
842842

843843
func isVPCInterfaceIPv6ConfigEmpty(opts *linodego.VPCInterfaceIPv6CreateOptions) bool {
844-
return opts == nil ||
845-
len(opts.SLAAC) == 0 &&
846-
len(opts.Ranges) == 0 &&
847-
!opts.IsPublic
844+
return opts == nil || (opts.SLAAC == nil && opts.Ranges == nil && opts.IsPublic == nil)
848845
}
849846

850847
// getMachineIPv6Config returns the IPv6 configuration for a LinodeMachine.
@@ -898,18 +895,18 @@ func getVPCLinodeInterfaceIPv6Config(machineScope *scope.MachineScope, numIPv6Ra
898895

899896
if machineScope.LinodeMachine.Spec.IPv6Options.IsPublicIPv6 != nil {
900897
// Set the public IPv6 flag based on the IsPublicIPv6 specification.
901-
intfOpts.IsPublic = *machineScope.LinodeMachine.Spec.IPv6Options.IsPublicIPv6
898+
intfOpts.IsPublic = machineScope.LinodeMachine.Spec.IPv6Options.IsPublicIPv6
902899
}
903900

904901
if machineScope.LinodeMachine.Spec.IPv6Options.EnableSLAAC != nil && *machineScope.LinodeMachine.Spec.IPv6Options.EnableSLAAC {
905-
intfOpts.SLAAC = []linodego.VPCInterfaceIPv6SLAACCreateOptions{
902+
intfOpts.SLAAC = &[]linodego.VPCInterfaceIPv6SLAACCreateOptions{
906903
{
907904
Range: defaultNodeIPv6CIDRRange,
908905
},
909906
}
910907
}
911908
if machineScope.LinodeMachine.Spec.IPv6Options.EnableRanges != nil && *machineScope.LinodeMachine.Spec.IPv6Options.EnableRanges {
912-
intfOpts.Ranges = []linodego.VPCInterfaceIPv6RangeCreateOptions{
909+
intfOpts.Ranges = &[]linodego.VPCInterfaceIPv6RangeCreateOptions{
913910
{
914911
Range: defaultNodeIPv6CIDRRange,
915912
},
@@ -1009,13 +1006,13 @@ func constructLinodeInterfaceVPC(iface infrav1alpha2.LinodeInterfaceCreateOption
10091006
return &linodego.VPCInterfaceCreateOptions{
10101007
SubnetID: subnetID,
10111008
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
1012-
Addresses: ipv4Addrs,
1013-
Ranges: ipv4Ranges,
1009+
Addresses: &ipv4Addrs,
1010+
Ranges: &ipv4Ranges,
10141011
},
10151012
IPv6: &linodego.VPCInterfaceIPv6CreateOptions{
1016-
SLAAC: ipv6SLAAC,
1017-
Ranges: ipv6Ranges,
1018-
IsPublic: ipv6IsPublic,
1013+
SLAAC: &ipv6SLAAC,
1014+
Ranges: &ipv6Ranges,
1015+
IsPublic: &ipv6IsPublic,
10191016
},
10201017
}
10211018
}
@@ -1043,10 +1040,10 @@ func constructLinodeInterfacePublic(iface infrav1alpha2.LinodeInterfaceCreateOpt
10431040
}
10441041
return &linodego.PublicInterfaceCreateOptions{
10451042
IPv4: &linodego.PublicInterfaceIPv4CreateOptions{
1046-
Addresses: ipv4Addrs,
1043+
Addresses: &ipv4Addrs,
10471044
},
10481045
IPv6: &linodego.PublicInterfaceIPv6CreateOptions{
1049-
Ranges: ipv6Ranges,
1046+
Ranges: &ipv6Ranges,
10501047
},
10511048
}
10521049
}

‎internal/controller/linodemachine_controller_helpers_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -646,15 +646,19 @@ func validateInterfaceExpectations(
646646
require.NotNil(t, linodeIface)
647647
require.NotNil(t, linodeIface.VPC)
648648
if linodeIface.VPC.IPv6 != nil && linodeIface.VPC.IPv6.SLAAC != nil {
649-
require.Equal(t, defaultNodeIPv6CIDRRange, linodeIface.VPC.IPv6.SLAAC[0].Range)
649+
slaac := *linodeIface.VPC.IPv6.SLAAC
650+
require.Equal(t, defaultNodeIPv6CIDRRange, slaac[0].Range)
650651
} else if linodeIface.VPC.IPv6 != nil && linodeIface.VPC.IPv6.Ranges != nil {
651-
require.Equal(t, defaultNodeIPv6CIDRRange, linodeIface.VPC.IPv6.Ranges[0].Range)
652+
ranges := *linodeIface.VPC.IPv6.Ranges
653+
require.Equal(t, defaultNodeIPv6CIDRRange, ranges[0].Range)
652654
}
653655
require.NotNil(t, linodeIface.VPC.SubnetID)
654656
require.Equal(t, expectSubnetID, linodeIface.VPC.SubnetID)
655657
require.NotNil(t, linodeIface.VPC.IPv4)
656-
require.NotNil(t, linodeIface.VPC.IPv4.Addresses[0].NAT1To1Address)
657-
require.Equal(t, "auto", *linodeIface.VPC.IPv4.Addresses[0].NAT1To1Address)
658+
require.NotNil(t, linodeIface.VPC.IPv4.Addresses)
659+
addresses := *linodeIface.VPC.IPv4.Addresses
660+
require.NotNil(t, addresses[0].NAT1To1Address)
661+
require.Equal(t, "auto", *addresses[0].NAT1To1Address)
658662
} else {
659663
require.Nil(t, linodeIface)
660664
}

‎internal/controller/linodemachine_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2816,7 +2816,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
28162816
VPC: &linodego.VPCInterfaceCreateOptions{
28172817
SubnetID: 1,
28182818
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
2819-
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
2819+
Addresses: &[]linodego.VPCInterfaceIPv4AddressCreateOptions{{
28202820
NAT1To1Address: ptr.To("auto"),
28212821
Primary: ptr.To(true),
28222822
Address: ptr.To("auto"),
@@ -2883,7 +2883,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
28832883
VPC: &linodego.VPCInterfaceCreateOptions{
28842884
SubnetID: 1,
28852885
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
2886-
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
2886+
Addresses: &[]linodego.VPCInterfaceIPv4AddressCreateOptions{{
28872887
NAT1To1Address: ptr.To("auto"),
28882888
Primary: ptr.To(true),
28892889
Address: ptr.To("auto"),
@@ -2956,7 +2956,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
29562956
VPC: &linodego.VPCInterfaceCreateOptions{
29572957
SubnetID: 27,
29582958
IPv4: &linodego.VPCInterfaceIPv4CreateOptions{
2959-
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
2959+
Addresses: &[]linodego.VPCInterfaceIPv4AddressCreateOptions{{
29602960
NAT1To1Address: ptr.To("auto"),
29612961
Primary: ptr.To(true),
29622962
Address: ptr.To("auto"),

0 commit comments

Comments
 (0)