Skip to content

Commit 8a917ee

Browse files
bjee19bjee19
committed
Replace GetStringPointer uses with generic GetPointer
1 parent 2a458e6 commit 8a917ee

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎internal/framework/status/updater_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ var _ = Describe("Updater", func() {
210210
{
211211
ControllerName: v1beta1.GatewayController(gatewayCtrlName),
212212
ParentRef: v1beta1.ParentReference{
213-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("test")),
213+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("test")),
214214
Name: "gateway",
215-
SectionName: (*v1beta1.SectionName)(helpers.GetStringPointer("http")),
215+
SectionName: (*v1beta1.SectionName)(helpers.GetPointer("http")),
216216
},
217217
Conditions: status.CreateExpectedAPIConditions("Test", 5, fakeClockTime),
218218
},

‎internal/mode/static/state/dataplane/configuration_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestBuildConfiguration(t *testing.T) {
3232
Matches: []v1beta1.HTTPRouteMatch{
3333
{
3434
Path: &v1beta1.HTTPPathMatch{
35-
Value: helpers.GetStringPointer(p.path),
35+
Value: helpers.GetPointer(p.path),
3636
Type: helpers.GetPointer(p.pathType),
3737
},
3838
},
@@ -48,9 +48,9 @@ func TestBuildConfiguration(t *testing.T) {
4848
CommonRouteSpec: v1beta1.CommonRouteSpec{
4949
ParentRefs: []v1beta1.ParentReference{
5050
{
51-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("test")),
51+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("test")),
5252
Name: "gateway",
53-
SectionName: (*v1beta1.SectionName)(helpers.GetStringPointer(listenerName)),
53+
SectionName: (*v1beta1.SectionName)(helpers.GetPointer(listenerName)),
5454
},
5555
},
5656
},
@@ -218,7 +218,7 @@ func TestBuildConfiguration(t *testing.T) {
218218
redirect := v1beta1.HTTPRouteFilter{
219219
Type: v1beta1.HTTPRouteFilterRequestRedirect,
220220
RequestRedirect: &v1beta1.HTTPRequestRedirectFilter{
221-
Hostname: (*v1beta1.PreciseHostname)(helpers.GetStringPointer("foo.example.com")),
221+
Hostname: (*v1beta1.PreciseHostname)(helpers.GetPointer("foo.example.com")),
222222
},
223223
}
224224
addFilters(hr5, []v1beta1.HTTPRouteFilter{redirect})
@@ -350,7 +350,7 @@ func TestBuildConfiguration(t *testing.T) {
350350
Mode: helpers.GetPointer(v1beta1.TLSModeTerminate),
351351
CertificateRefs: []v1beta1.SecretObjectReference{
352352
{
353-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Secret")),
353+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Secret")),
354354
Namespace: helpers.GetPointer(v1beta1.Namespace(secret1NsName.Namespace)),
355355
Name: v1beta1.ObjectName(secret1NsName.Name),
356356
},
@@ -367,7 +367,7 @@ func TestBuildConfiguration(t *testing.T) {
367367
Mode: helpers.GetPointer(v1beta1.TLSModeTerminate),
368368
CertificateRefs: []v1beta1.SecretObjectReference{
369369
{
370-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Secret")),
370+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Secret")),
371371
Namespace: helpers.GetPointer(v1beta1.Namespace(secret2NsName.Namespace)),
372372
Name: v1beta1.ObjectName(secret2NsName.Name),
373373
},
@@ -386,7 +386,7 @@ func TestBuildConfiguration(t *testing.T) {
386386
Mode: helpers.GetPointer(v1beta1.TLSModeTerminate),
387387
CertificateRefs: []v1beta1.SecretObjectReference{
388388
{
389-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Secret")),
389+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Secret")),
390390
Namespace: helpers.GetPointer(v1beta1.Namespace(secret2NsName.Namespace)),
391391
Name: v1beta1.ObjectName(secret2NsName.Name),
392392
},
@@ -1506,7 +1506,7 @@ func TestGetPath(t *testing.T) {
15061506
msg string
15071507
}{
15081508
{
1509-
path: &v1beta1.HTTPPathMatch{Value: helpers.GetStringPointer("/abc")},
1509+
path: &v1beta1.HTTPPathMatch{Value: helpers.GetPointer("/abc")},
15101510
expected: "/abc",
15111511
msg: "normal case",
15121512
},
@@ -1521,7 +1521,7 @@ func TestGetPath(t *testing.T) {
15211521
msg: "nil value",
15221522
},
15231523
{
1524-
path: &v1beta1.HTTPPathMatch{Value: helpers.GetStringPointer("")},
1524+
path: &v1beta1.HTTPPathMatch{Value: helpers.GetPointer("")},
15251525
expected: "/",
15261526
msg: "empty value",
15271527
},

‎internal/mode/static/state/graph/gateway_listener_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ func TestValidateHTTPSListener(t *testing.T) {
4949
secretNs := "secret-ns"
5050

5151
validSecretRef := v1beta1.SecretObjectReference{
52-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Secret")),
52+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Secret")),
5353
Name: "secret",
54-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer(secretNs)),
54+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer(secretNs)),
5555
}
5656

5757
invalidSecretRefGroup := v1beta1.SecretObjectReference{
58-
Group: (*v1beta1.Group)(helpers.GetStringPointer("some-group")),
59-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Secret")),
58+
Group: (*v1beta1.Group)(helpers.GetPointer("some-group")),
59+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Secret")),
6060
Name: "secret",
61-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer(secretNs)),
61+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer(secretNs)),
6262
}
6363

6464
invalidSecretRefKind := v1beta1.SecretObjectReference{
65-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("ConfigMap")),
65+
Kind: (*v1beta1.Kind)(helpers.GetPointer("ConfigMap")),
6666
Name: "secret",
67-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer(secretNs)),
67+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer(secretNs)),
6868
}
6969

7070
tests := []struct {
@@ -184,22 +184,22 @@ func TestValidateListenerHostname(t *testing.T) {
184184
name: "nil hostname",
185185
},
186186
{
187-
hostname: (*v1beta1.Hostname)(helpers.GetStringPointer("")),
187+
hostname: (*v1beta1.Hostname)(helpers.GetPointer("")),
188188
expectErr: false,
189189
name: "empty hostname",
190190
},
191191
{
192-
hostname: (*v1beta1.Hostname)(helpers.GetStringPointer("foo.example.com")),
192+
hostname: (*v1beta1.Hostname)(helpers.GetPointer("foo.example.com")),
193193
expectErr: false,
194194
name: "valid hostname",
195195
},
196196
{
197-
hostname: (*v1beta1.Hostname)(helpers.GetStringPointer("*.example.com")),
197+
hostname: (*v1beta1.Hostname)(helpers.GetPointer("*.example.com")),
198198
expectErr: false,
199199
name: "wildcard hostname",
200200
},
201201
{
202-
hostname: (*v1beta1.Hostname)(helpers.GetStringPointer("example$com")),
202+
hostname: (*v1beta1.Hostname)(helpers.GetPointer("example$com")),
203203
expectErr: true,
204204
name: "invalid hostname",
205205
},

‎internal/mode/static/state/graph/graph_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ func TestBuildGraph(t *testing.T) {
4040
CommonRouteSpec: v1beta1.CommonRouteSpec{
4141
ParentRefs: []v1beta1.ParentReference{
4242
{
43-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("test")),
43+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("test")),
4444
Name: v1beta1.ObjectName(gatewayName),
45-
SectionName: (*v1beta1.SectionName)(helpers.GetStringPointer(listenerName)),
45+
SectionName: (*v1beta1.SectionName)(helpers.GetPointer(listenerName)),
4646
},
4747
},
4848
},
@@ -55,17 +55,17 @@ func TestBuildGraph(t *testing.T) {
5555
{
5656
Path: &v1beta1.HTTPPathMatch{
5757
Type: helpers.GetPointer(v1beta1.PathMatchPathPrefix),
58-
Value: helpers.GetStringPointer("/"),
58+
Value: helpers.GetPointer("/"),
5959
},
6060
},
6161
},
6262
BackendRefs: []v1beta1.HTTPBackendRef{
6363
{
6464
BackendRef: v1beta1.BackendRef{
6565
BackendObjectReference: v1beta1.BackendObjectReference{
66-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Service")),
66+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Service")),
6767
Name: "foo",
68-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("service")),
68+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("service")),
6969
Port: (*v1beta1.PortNumber)(helpers.GetPointer(int32(80))),
7070
},
7171
},

‎internal/mode/static/state/graph/httproute_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ func TestBindRouteToListeners(t *testing.T) {
540540
return &Listener{
541541
Source: v1beta1.Listener{
542542
Name: v1beta1.SectionName(name),
543-
Hostname: (*v1beta1.Hostname)(helpers.GetStringPointer("foo.example.com")),
543+
Hostname: (*v1beta1.Hostname)(helpers.GetPointer("foo.example.com")),
544544
},
545545
Valid: true,
546546
Routes: map[types.NamespacedName]*Route{},

‎internal/mode/static/state/relationship/capturer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ func createBackendRefs(backendNames ...v1beta1.ObjectName) []v1beta1.HTTPBackend
2121
refs = append(refs, v1beta1.HTTPBackendRef{
2222
BackendRef: v1beta1.BackendRef{
2323
BackendObjectReference: v1beta1.BackendObjectReference{
24-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Service")),
24+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Service")),
2525
Name: name,
26-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("test")),
26+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("test")),
2727
},
2828
},
2929
})

‎internal/mode/static/state/relationship/relationships_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ func TestGetBackendServiceNamesFromRoute(t *testing.T) {
1717
{
1818
BackendRef: v1beta1.BackendRef{
1919
BackendObjectReference: v1beta1.BackendObjectReference{
20-
Kind: (*v1beta1.Kind)(helpers.GetStringPointer("Service")),
20+
Kind: (*v1beta1.Kind)(helpers.GetPointer("Service")),
2121
Name: svcName,
22-
Namespace: (*v1beta1.Namespace)(helpers.GetStringPointer("test")),
22+
Namespace: (*v1beta1.Namespace)(helpers.GetPointer("test")),
2323
Port: (*v1beta1.PortNumber)(helpers.GetPointer(int32(80))),
2424
},
2525
},
@@ -48,7 +48,7 @@ func TestGetBackendServiceNamesFromRoute(t *testing.T) {
4848
BackendRefs: getModifiedRefs(
4949
"invalid-kind",
5050
func(refs []v1beta1.HTTPBackendRef) []v1beta1.HTTPBackendRef {
51-
refs[0].Kind = (*v1beta1.Kind)(helpers.GetStringPointer("Invalid"))
51+
refs[0].Kind = (*v1beta1.Kind)(helpers.GetPointer("Invalid"))
5252
return refs
5353
},
5454
),
@@ -67,7 +67,7 @@ func TestGetBackendServiceNamesFromRoute(t *testing.T) {
6767
"diff-namespace",
6868
func(refs []v1beta1.HTTPBackendRef) []v1beta1.HTTPBackendRef {
6969
refs[0].Namespace = (*v1beta1.Namespace)(
70-
helpers.GetStringPointer("not-test"),
70+
helpers.GetPointer("not-test"),
7171
)
7272
return refs
7373
},
@@ -87,11 +87,11 @@ func TestGetBackendServiceNamesFromRoute(t *testing.T) {
8787
BackendRef: v1beta1.BackendRef{
8888
BackendObjectReference: v1beta1.BackendObjectReference{
8989
Kind: (*v1beta1.Kind)(
90-
helpers.GetStringPointer("Service"),
90+
helpers.GetPointer("Service"),
9191
),
9292
Name: "multiple-refs2",
9393
Namespace: (*v1beta1.Namespace)(
94-
helpers.GetStringPointer("test"),
94+
helpers.GetPointer("test"),
9595
),
9696
Port: (*v1beta1.PortNumber)(
9797
helpers.GetPointer(int32(80)),

‎internal/mode/static/state/resolver/resolver_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var (
7575
Endpoints: []discoveryV1.Endpoint{readyEndpoint1},
7676
Ports: []discoveryV1.EndpointPort{
7777
{
78-
Name: helpers.GetStringPointer("other-svc-port"),
78+
Name: helpers.GetPointer("other-svc-port"),
7979
Port: helpers.GetPointer(int32(8080)),
8080
},
8181
},
@@ -238,7 +238,7 @@ func TestIgnoreEndpointSlice(t *testing.T) {
238238
AddressType: discoveryV1.AddressTypeIPv4,
239239
Ports: []discoveryV1.EndpointPort{
240240
{
241-
Name: helpers.GetStringPointer("other-svc-port"),
241+
Name: helpers.GetPointer("other-svc-port"),
242242
Port: &port4000,
243243
},
244244
},
@@ -401,15 +401,15 @@ func TestFindPort(t *testing.T) {
401401
msg: "no matching endpoint name",
402402
ports: []discoveryV1.EndpointPort{
403403
{
404-
Name: helpers.GetStringPointer("other-svc-port"),
404+
Name: helpers.GetPointer("other-svc-port"),
405405
Port: helpers.GetPointer(int32(8080)),
406406
},
407407
{
408-
Name: helpers.GetStringPointer("other-svc-port2"),
408+
Name: helpers.GetPointer("other-svc-port2"),
409409
Port: helpers.GetPointer(int32(8081)),
410410
},
411411
{
412-
Name: helpers.GetStringPointer("other-svc-port3"),
412+
Name: helpers.GetPointer("other-svc-port3"),
413413
Port: helpers.GetPointer(int32(8082)),
414414
},
415415
},
@@ -424,11 +424,11 @@ func TestFindPort(t *testing.T) {
424424
msg: "matching endpoint name",
425425
ports: []discoveryV1.EndpointPort{
426426
{
427-
Name: helpers.GetStringPointer("other-svc-port"),
427+
Name: helpers.GetPointer("other-svc-port"),
428428
Port: helpers.GetPointer(int32(8080)),
429429
},
430430
{
431-
Name: helpers.GetStringPointer("other-svc-port2"),
431+
Name: helpers.GetPointer("other-svc-port2"),
432432
Port: helpers.GetPointer(int32(8081)),
433433
},
434434
{
@@ -448,7 +448,7 @@ func TestFindPort(t *testing.T) {
448448
ports: []discoveryV1.EndpointPort{
449449
{
450450
// If a service port is unnamed (empty string), then the endpoint port will also be empty string.
451-
Name: helpers.GetStringPointer(""),
451+
Name: helpers.GetPointer(""),
452452
Port: helpers.GetPointer(int32(8080)),
453453
},
454454
},

0 commit comments

Comments
 (0)