Skip to content

Commit 5f83648

Browse files
jojomo96jojomo96
committed
chore: refactor mock provider imports and update message initialization
1 parent b8cec05 commit 5f83648

File tree

14 files changed

+47
-54
lines changed

14 files changed

+47
-54
lines changed

‎internal/stackitprovider/apply_changes_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func getValidResponseZoneAllBytes(t *testing.T) []byte {
375375
func getValidZoneResponseAll() stackitdnsclient.ListZonesResponse {
376376
return stackitdnsclient.ListZonesResponse{
377377
ItemsPerPage: int32(10),
378-
Message: pointerTo("success"),
378+
Message: new("success"),
379379
TotalItems: int32(2),
380380
TotalPages: int32(1),
381381
Zones: []stackitdnsclient.Zone{
@@ -397,7 +397,7 @@ func getValidResponseRRSetAllBytes(t *testing.T) []byte {
397397

398398
func getValidRecordSetResponse() stackitdnsclient.RecordSetResponse {
399399
return stackitdnsclient.RecordSetResponse{
400-
Message: pointerTo("success"),
400+
Message: new("success"),
401401
Rrset: stackitdnsclient.RecordSet{
402402
Name: "test.com",
403403
Type: "A",
@@ -412,7 +412,7 @@ func getValidRecordSetResponse() stackitdnsclient.RecordSetResponse {
412412
func getValidResponseRRSetAll() stackitdnsclient.ListRecordSetsResponse {
413413
return stackitdnsclient.ListRecordSetsResponse{
414414
ItemsPerPage: int32(20),
415-
Message: pointerTo("success"),
415+
Message: new("success"),
416416
RrSets: []stackitdnsclient.RecordSet{
417417
{
418418
Name: "test.com",

‎internal/stackitprovider/helper.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func getStackitRecordSetPayload(change *endpoint.Endpoint) stackitdnsclient.Crea
7878
return stackitdnsclient.CreateRecordSetPayload{
7979
Name: change.DNSName,
8080
Records: records,
81-
Ttl: pointerTo(int32(change.RecordTTL)),
81+
Ttl: new(int32(change.RecordTTL)),
8282
Type: change.RecordType,
8383
}
8484
}
@@ -95,7 +95,7 @@ func getStackitPartialUpdateRecordSetPayload(change *endpoint.Endpoint) stackitd
9595
return stackitdnsclient.PartialUpdateRecordSetPayload{
9696
Name: &change.DNSName,
9797
Records: records,
98-
Ttl: pointerTo(int32(change.RecordTTL)),
98+
Ttl: new(int32(change.RecordTTL)),
9999
}
100100
}
101101

@@ -109,8 +109,3 @@ func getLogFields(change *endpoint.Endpoint, action string, id string) []zap.Fie
109109
zap.String("id", id),
110110
}
111111
}
112-
113-
// pointerTo returns a pointer to the given value.
114-
func pointerTo[T any](v T) *T {
115-
return &v
116-
}

‎internal/stackitprovider/helper_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestGetStackitRRSetRecordPost(t *testing.T) {
7373
}
7474
expected := stackitdnsclient.CreateRecordSetPayload{
7575
Name: "test.",
76-
Ttl: pointerTo(int32(300)),
76+
Ttl: new(int32(300)),
7777
Type: "A",
7878
Records: []stackitdnsclient.RecordPayload{
7979
{
@@ -196,8 +196,8 @@ func TestGetStackitRRSetRecordPatch(t *testing.T) {
196196
}
197197

198198
expected := stackitdnsclient.PartialUpdateRecordSetPayload{
199-
Name: pointerTo("test."),
200-
Ttl: pointerTo(int32(300)),
199+
Name: new("test."),
200+
Ttl: new(int32(300)),
201201
Records: []stackitdnsclient.RecordPayload{
202202
{
203203
Content: "192.0.2.1",

‎internal/stackitprovider/records_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestEmptyRRSetRouteRecords(t *testing.T) {
111111

112112
zones := stackitdnsclient.ListZonesResponse{
113113
ItemsPerPage: int32(1),
114-
Message: pointerTo("success"),
114+
Message: new("success"),
115115
TotalItems: int32(2),
116116
TotalPages: int32(2),
117117
Zones: []stackitdnsclient.Zone{{Id: "1234"}},
@@ -213,7 +213,7 @@ func getZonesHandlerRecordsPaged(t *testing.T) http.HandlerFunc {
213213
if r.URL.Query().Get("page") == "1" {
214214
zones = stackitdnsclient.ListZonesResponse{
215215
ItemsPerPage: int32(1),
216-
Message: pointerTo("success"),
216+
Message: new("success"),
217217
TotalItems: int32(2),
218218
TotalPages: int32(2),
219219
Zones: []stackitdnsclient.Zone{{Id: "1234"}},
@@ -222,7 +222,7 @@ func getZonesHandlerRecordsPaged(t *testing.T) http.HandlerFunc {
222222
if r.URL.Query().Get("page") == "2" {
223223
zones = stackitdnsclient.ListZonesResponse{
224224
ItemsPerPage: int32(1),
225-
Message: pointerTo("success"),
225+
Message: new("success"),
226226
TotalItems: int32(2),
227227
TotalPages: int32(2),
228228
Zones: []stackitdnsclient.Zone{{Id: "5678"}},
@@ -246,7 +246,7 @@ func getRrsetsHandlerReecodsPaged(t *testing.T, domain string) http.HandlerFunc
246246
if domain == "1234" {
247247
rrSets = stackitdnsclient.ListRecordSetsResponse{
248248
ItemsPerPage: int32(1),
249-
Message: pointerTo("success"),
249+
Message: new("success"),
250250
RrSets: []stackitdnsclient.RecordSet{
251251
{
252252
Name: "test.com.",
@@ -264,7 +264,7 @@ func getRrsetsHandlerReecodsPaged(t *testing.T, domain string) http.HandlerFunc
264264
if domain == "5678" {
265265
rrSets = stackitdnsclient.ListRecordSetsResponse{
266266
ItemsPerPage: int32(1),
267-
Message: pointerTo("success"),
267+
Message: new("success"),
268268
RrSets: []stackitdnsclient.RecordSet{
269269
{
270270
Name: "test2.com.",
@@ -308,7 +308,7 @@ func getZonesResponseRecordsNonPaged(t *testing.T, w http.ResponseWriter) {
308308

309309
zones := stackitdnsclient.ListZonesResponse{
310310
ItemsPerPage: int32(10),
311-
Message: pointerTo("success"),
311+
Message: new("success"),
312312
TotalItems: int32(2),
313313
TotalPages: int32(1),
314314
Zones: []stackitdnsclient.Zone{
@@ -330,7 +330,7 @@ func getRrsetsResponseRecordsNonPaged(t *testing.T, w http.ResponseWriter, domai
330330

331331
var rrSets = stackitdnsclient.ListRecordSetsResponse{
332332
ItemsPerPage: int32(20),
333-
Message: pointerTo("success"),
333+
Message: new("success"),
334334
RrSets: []stackitdnsclient.RecordSet{
335335
{
336336
Name: domain,

‎internal/stackitprovider/zone_fetcher.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ func newZoneFetcher(
2929
func (z *zoneFetcher) zones(ctx context.Context) ([]stackitdnsclient.Zone, error) {
3030
if len(z.domainFilter.Filters) == 0 {
3131
// no filters, return all zones
32-
listRequest := z.apiClient.DefaultAPI.ListZones(ctx, z.projectId).ActiveEq(true)
33-
zones, err := z.fetchZones(listRequest)
32+
zones, err := z.fetchZones(new(z.apiClient.DefaultAPI.ListZones(ctx, z.projectId).ActiveEq(true)))
3433
if err != nil {
3534
return nil, err
3635
}
@@ -41,8 +40,7 @@ func (z *zoneFetcher) zones(ctx context.Context) ([]stackitdnsclient.Zone, error
4140
var result []stackitdnsclient.Zone
4241
// send one request per filter
4342
for _, filter := range z.domainFilter.Filters {
44-
listRequest := z.apiClient.DefaultAPI.ListZones(ctx, z.projectId).ActiveEq(true).DnsNameLike(filter)
45-
zones, err := z.fetchZones(listRequest)
43+
zones, err := z.fetchZones(new(z.apiClient.DefaultAPI.ListZones(ctx, z.projectId).ActiveEq(true).DnsNameLike(filter)))
4644
if err != nil {
4745
return nil, err
4846
}
@@ -54,14 +52,14 @@ func (z *zoneFetcher) zones(ctx context.Context) ([]stackitdnsclient.Zone, error
5452

5553
// fetchZones fetches all []stackitdnsclient.Zone from STACKIT DNS API.
5654
func (z *zoneFetcher) fetchZones(
57-
listRequest stackitdnsclient.ApiListZonesRequest,
55+
listRequest *stackitdnsclient.ApiListZonesRequest,
5856
) ([]stackitdnsclient.Zone, error) {
5957
var result []stackitdnsclient.Zone
6058
var pager int32 = 1
6159

62-
listRequest = listRequest.Page(1).PageSize(10000)
60+
req := listRequest.Page(1).PageSize(10000)
6361

64-
zoneResponse, err := listRequest.Execute()
62+
zoneResponse, err := req.Execute()
6563
if err != nil {
6664
return nil, err
6765
}
@@ -72,7 +70,7 @@ func (z *zoneFetcher) fetchZones(
7270
// issue another API request for each one of them
7371
pager++
7472
for pager <= zoneResponse.TotalPages {
75-
zoneResponse, err := listRequest.Page(pager).Execute()
73+
zoneResponse, err := req.Page(pager).Execute()
7674
if err != nil {
7775
return nil, err
7876
}

‎pkg/api/adjust_endpoints_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"sigs.k8s.io/external-dns/endpoint"
1515

1616
"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
17-
mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
17+
mockprovider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
1818
)
1919

2020
func TestWebhook_AdjustEndpoints(t *testing.T) {
@@ -24,7 +24,7 @@ func TestWebhook_AdjustEndpoints(t *testing.T) {
2424
t.Cleanup(ctrl.Finish)
2525

2626
mockLogger := zap.NewNop()
27-
mockProvider := mock_provider.NewMockProvider(ctrl)
27+
mockProvider := mockprovider.NewMockProvider(ctrl)
2828
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
2929

3030
app := api.New(mockLogger, mockMetricsCollector, mockProvider)

‎pkg/api/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"syscall"
1010
"time"
1111

12-
json "github.com/goccy/go-json"
12+
"github.com/goccy/go-json"
1313
"github.com/gofiber/fiber/v2"
1414
"github.com/gofiber/fiber/v2/middleware/helmet"
1515
fiberlogger "github.com/gofiber/fiber/v2/middleware/logger"

‎pkg/api/api_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"go.uber.org/zap"
1111

1212
"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
13-
mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
13+
mockprovider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
1414
)
1515

1616
func TestApi(t *testing.T) {
@@ -20,7 +20,7 @@ func TestApi(t *testing.T) {
2020
t.Cleanup(ctrl.Finish)
2121

2222
mockLogger := zap.NewNop()
23-
mockProvider := mock_provider.NewMockProvider(ctrl)
23+
mockProvider := mockprovider.NewMockProvider(ctrl)
2424
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
2525

2626
app := api.New(mockLogger, mockMetricsCollector, mockProvider)

‎pkg/api/apply_changes_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"sigs.k8s.io/external-dns/plan"
1717

1818
"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
19-
mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
19+
mockprovider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
2020
)
2121

2222
func TestWebhook_ApplyChanges(t *testing.T) {
@@ -33,7 +33,7 @@ func TestWebhook_ApplyChanges(t *testing.T) {
3333
t.Parallel()
3434

3535
mockLogger := zap.NewNop()
36-
mockProvider := mock_provider.NewMockProvider(ctrl)
36+
mockProvider := mockprovider.NewMockProvider(ctrl)
3737
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
3838

3939
app := api.New(mockLogger, mockMetricsCollector, mockProvider)
@@ -51,7 +51,7 @@ func TestWebhook_ApplyChanges(t *testing.T) {
5151
t.Parallel()
5252

5353
mockLogger := zap.NewNop()
54-
mockProvider := mock_provider.NewMockProvider(ctrl)
54+
mockProvider := mockprovider.NewMockProvider(ctrl)
5555
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
5656

5757
app := api.New(mockLogger, mockMetricsCollector, mockProvider)
@@ -68,7 +68,7 @@ func TestWebhook_ApplyChanges(t *testing.T) {
6868
t.Parallel()
6969

7070
mockLogger := zap.NewNop()
71-
mockProvider := mock_provider.NewMockProvider(ctrl)
71+
mockProvider := mockprovider.NewMockProvider(ctrl)
7272
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
7373

7474
app := api.New(mockLogger, mockMetricsCollector, mockProvider)
@@ -86,7 +86,7 @@ func TestWebhook_ApplyChanges(t *testing.T) {
8686
t.Parallel()
8787

8888
mockLogger := zap.NewNop()
89-
mockProvider := mock_provider.NewMockProvider(ctrl)
89+
mockProvider := mockprovider.NewMockProvider(ctrl)
9090
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
9191

9292
app := api.New(mockLogger, mockMetricsCollector, mockProvider)

‎pkg/api/domain_filter_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"sigs.k8s.io/external-dns/endpoint"
1515

1616
"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
17-
mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
17+
mockprovider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
1818
)
1919

2020
func TestWebhook_DomainFilter(t *testing.T) {
@@ -24,7 +24,7 @@ func TestWebhook_DomainFilter(t *testing.T) {
2424
t.Cleanup(ctrl.Finish)
2525

2626
mockLogger := zap.NewNop()
27-
mockProvider := mock_provider.NewMockProvider(ctrl)
27+
mockProvider := mockprovider.NewMockProvider(ctrl)
2828
mockMetricsCollector := getTestMockMetricsCollector(ctrl)
2929
expectedDomainFilter := endpoint.DomainFilter{Filters: []string{"test"}}
3030

0 commit comments

Comments
 (0)