Skip to content

Commit dac763f

Browse files
authored
change isPublic to be a pointer on new IPv6/linode interface config to be in line with other isPublic values (#826)
1 parent 33e08cf commit dac763f

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

instance_config_interfaces.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type InstanceConfigInterface struct {
2727
type InstanceConfigInterfaceIPv6 struct {
2828
SLAAC []InstanceConfigInterfaceIPv6SLAAC `json:"slaac"`
2929
Ranges []InstanceConfigInterfaceIPv6Range `json:"ranges"`
30-
IsPublic bool `json:"is_public"`
30+
IsPublic *bool `json:"is_public"`
3131
}
3232

3333
// InstanceConfigInterfaceIPv6SLAAC represents a single IPv6 SLAAC under
@@ -173,7 +173,7 @@ func (i InstanceConfigInterface) GetCreateOptions() InstanceConfigInterfaceCreat
173173
}
174174
},
175175
),
176-
IsPublic: copyValue(&ipv6.IsPublic),
176+
IsPublic: copyValue(ipv6.IsPublic),
177177
}
178178
}
179179

@@ -219,7 +219,7 @@ func (i InstanceConfigInterface) GetUpdateOptions() InstanceConfigInterfaceUpdat
219219
opts.IPv6 = &InstanceConfigInterfaceUpdateOptionsIPv6{
220220
SLAAC: &newSLAAC,
221221
Ranges: &newRanges,
222-
IsPublic: copyValue(&ipv6.IsPublic),
222+
IsPublic: copyValue(ipv6.IsPublic),
223223
}
224224
}
225225
}

interfaces.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ type VPCInterfaceIPv4Range struct {
9090
type VPCInterfaceIPv6 struct {
9191
SLAAC []VPCInterfaceIPv6SLAAC `json:"slaac"`
9292
Ranges []VPCInterfaceIPv6Range `json:"ranges"`
93-
IsPublic bool `json:"is_public"`
93+
IsPublic *bool `json:"is_public"`
9494
}
9595

9696
// VPCInterfaceIPv6SLAAC contains the information for a single IPv6 SLAAC under a VPC.
@@ -174,7 +174,7 @@ type VPCInterfaceIPv4RangeCreateOptions struct {
174174
type VPCInterfaceIPv6CreateOptions struct {
175175
SLAAC []VPCInterfaceIPv6SLAACCreateOptions `json:"slaac,omitempty"`
176176
Ranges []VPCInterfaceIPv6RangeCreateOptions `json:"ranges,omitempty"`
177-
IsPublic bool `json:"is_public"`
177+
IsPublic *bool `json:"is_public"`
178178
}
179179

180180
// VPCInterfaceIPv6SLAACCreateOptions defines the IPv6 SLAAC configuration parameters for VPC creation.

test/unit/instance_config_interfaces_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestInstanceConfigInterface_List(t *testing.T) {
3131
assert.Equal(t, "1234::5678/64", interfaces[0].IPv6.SLAAC[0].Range)
3232
assert.Equal(t, "1234::5678", interfaces[0].IPv6.SLAAC[0].Address)
3333
assert.Equal(t, "1234::5678/64", interfaces[0].IPv6.Ranges[0].Range)
34-
assert.True(t, interfaces[0].IPv6.IsPublic)
34+
assert.True(t, *interfaces[0].IPv6.IsPublic)
3535
}
3636

3737
func TestInstanceConfigInterface_Get(t *testing.T) {
@@ -56,7 +56,7 @@ func TestInstanceConfigInterface_Get(t *testing.T) {
5656
assert.Equal(t, "1234::5678/64", iface.IPv6.SLAAC[0].Range)
5757
assert.Equal(t, "1234::5678", iface.IPv6.SLAAC[0].Address)
5858
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
59-
assert.True(t, iface.IPv6.IsPublic)
59+
assert.True(t, *iface.IPv6.IsPublic)
6060
}
6161

6262
func TestInstanceConfigInterface_Create(t *testing.T) {
@@ -95,7 +95,7 @@ func TestInstanceConfigInterface_Create(t *testing.T) {
9595
assert.Equal(t, "1234::5678/64", iface.IPv6.SLAAC[0].Range)
9696
assert.Equal(t, "1234::5678", iface.IPv6.SLAAC[0].Address)
9797
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
98-
assert.True(t, iface.IPv6.IsPublic)
98+
assert.True(t, *iface.IPv6.IsPublic)
9999
}
100100

101101
func TestInstanceConfigInterface_Update(t *testing.T) {
@@ -130,7 +130,7 @@ func TestInstanceConfigInterface_Update(t *testing.T) {
130130
assert.Equal(t, "1234::5678/64", iface.IPv6.SLAAC[0].Range)
131131
assert.Equal(t, "1234::5678", iface.IPv6.SLAAC[0].Address)
132132
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
133-
assert.True(t, iface.IPv6.IsPublic)
133+
assert.True(t, *iface.IPv6.IsPublic)
134134
}
135135

136136
func TestInstanceConfigInterface_Delete(t *testing.T) {

test/unit/instance_config_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestInstanceConfig_List(t *testing.T) {
4343
assert.Len(t, iface.IPv6.Ranges, 1)
4444
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
4545

46-
assert.Equal(t, true, iface.IPv6.IsPublic)
46+
assert.Equal(t, true, *iface.IPv6.IsPublic)
4747

4848
assert.ElementsMatch(t, []string{"192.168.1.0/24"}, iface.IPRanges)
4949
}
@@ -85,7 +85,7 @@ func TestInstanceConfig_Get(t *testing.T) {
8585
assert.Len(t, iface.IPv6.Ranges, 1)
8686
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
8787

88-
assert.Equal(t, true, iface.IPv6.IsPublic)
88+
assert.Equal(t, true, *iface.IPv6.IsPublic)
8989

9090
assert.ElementsMatch(t, []string{"192.168.1.0/24"}, iface.IPRanges)
9191
}
@@ -134,7 +134,7 @@ func TestInstanceConfig_Create(t *testing.T) {
134134
assert.Len(t, iface.IPv6.Ranges, 1)
135135
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
136136

137-
assert.Equal(t, true, iface.IPv6.IsPublic)
137+
assert.Equal(t, true, *iface.IPv6.IsPublic)
138138

139139
assert.ElementsMatch(t, []string{"192.168.1.0/24"}, iface.IPRanges)
140140
}
@@ -180,7 +180,7 @@ func TestInstanceConfig_Update(t *testing.T) {
180180
assert.Len(t, iface.IPv6.Ranges, 1)
181181
assert.Equal(t, "1234::5678/64", iface.IPv6.Ranges[0].Range)
182182

183-
assert.Equal(t, true, iface.IPv6.IsPublic)
183+
assert.Equal(t, true, *iface.IPv6.IsPublic)
184184

185185
assert.ElementsMatch(t, []string{"192.168.1.0/24"}, iface.IPRanges)
186186
}

test/unit/interface_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func TestInterface_GetVPC(t *testing.T) {
138138

139139
assert.Equal(t, "4321::/64", iface.VPC.IPv6.Ranges[0].Range)
140140

141-
assert.Equal(t, true, iface.VPC.IPv6.IsPublic)
141+
assert.Equal(t, true, *iface.VPC.IPv6.IsPublic)
142142
}
143143

144144
func TestInterface_CreatePublic(t *testing.T) {
@@ -277,7 +277,7 @@ func TestInterface_UpdateVPC(t *testing.T) {
277277

278278
assert.Equal(t, "4322::/64", iface.VPC.IPv6.Ranges[0].Range)
279279

280-
assert.Equal(t, false, iface.VPC.IPv6.IsPublic)
280+
assert.Equal(t, false, *iface.VPC.IPv6.IsPublic)
281281
}
282282

283283
func TestInterface_Upgrade(t *testing.T) {

0 commit comments

Comments
 (0)