fix linter errors

Author: fsandel

.golangci.yaml

@@ -1,4 +1,4 @@
-GOLANGCI_VERSION = 1.64.8
+GOLANGCI_VERSION = 2.8.0
 LICENCES_IGNORE_LIST = $(shell cat licenses/licenses-ignore-list.txt)
 
 VERSION ?= 0.0.1

Makefile

@@ -53,7 +53,7 @@ var rootCmd = &cobra.Command{
 		stackitProvider, err := stackitprovider.NewStackitDNSProvider(
 			logger.With(zap.String("component", "stackitprovider")),
 			// ExternalDNS provider config
-			stackitprovider.Config{
+			&stackitprovider.Config{
 				ProjectId:    projectID,
 				DomainFilter: endpointDomainFilter,
 				DryRun:       dryRun,

cmd/webhook/cmd/root.go

@@ -13,12 +13,17 @@ import (
 
 // ApplyChanges applies a given set of changes in a given zone.
 func (d *StackitDNSProvider) ApplyChanges(ctx context.Context, changes *plan.Changes) error {
-	var tasks []changeTask
+	// Preallocate to avoid repeated growth (prealloc)
+	totalTasks := len(changes.Create) + len(changes.UpdateNew) + len(changes.Delete)
+	tasks := make([]changeTask, 0, totalTasks)
+
 	// create rr set. POST /v1/projects/{projectId}/zones/{zoneId}/rrsets
 	tasks = append(tasks, d.buildRRSetTasks(changes.Create, CREATE)...)
 	// update rr set. PATCH /v1/projects/{projectId}/zones/{zoneId}/rrsets/{rrSetId}
 	tasks = append(tasks, d.buildRRSetTasks(changes.UpdateNew, UPDATE)...)
+
 	d.logger.Info("records to delete", zap.String("records", fmt.Sprintf("%v", changes.Delete)))
+
 	// delete rr set. DELETE /v1/projects/{projectId}/zones/{zoneId}/rrsets/{rrSetId}
 	tasks = append(tasks, d.buildRRSetTasks(changes.Delete, DELETE)...)
 

internal/stackitprovider/apply_changes.go

@@ -48,7 +48,7 @@ func testApplyChanges(t *testing.T, changeType ChangeType) {
 	// Test cases
 	tests := getApplyChangesBasicTestCases(validZoneResponse, validRRSetResponse, invalidZoneResponse)
 
-	for _, tt := range tests {
+	for _, tt := range tests { //nolint: gocritic // we dont want to use pointers here to keep the test simple
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()

internal/stackitprovider/apply_changes_test.go

@@ -16,29 +16,38 @@ func findBestMatchingZone(
 	zones []stackitdnsclient.Zone,
 ) (*stackitdnsclient.Zone, bool) {
 	count := 0
-	var domainZone stackitdnsclient.Zone
-	for _, zone := range zones {
-		if len(*zone.DnsName) > count && strings.Contains(rrSetName, *zone.DnsName) {
-			count = len(*zone.DnsName)
+	var domainZone *stackitdnsclient.Zone
+
+	for i := range zones {
+		zone := &zones[i]
+		if zone.DnsName == nil {
+			continue
+		}
+		if l := len(*zone.DnsName); l > count && strings.Contains(rrSetName, *zone.DnsName) {
+			count = l
 			domainZone = zone
 		}
 	}
 
-	if count == 0 {
+	if domainZone == nil {
 		return nil, false
 	}
 
-	return &domainZone, true
+	return domainZone, true
 }
 
 // findRRSet finds a record set by name and type in a list of record sets.
 func findRRSet(
 	rrSetName, recordType string,
 	rrSets []stackitdnsclient.RecordSet,
 ) (*stackitdnsclient.RecordSet, bool) {
-	for _, rrSet := range rrSets {
+	for i := range rrSets {
+		rrSet := &rrSets[i]
+		if rrSet.Name == nil || rrSet.Type == nil {
+			continue
+		}
 		if *rrSet.Name == rrSetName && string(*rrSet.Type) == recordType {
-			return &rrSet, true
+			return rrSet, true
 		}
 	}
 

internal/stackitprovider/helper.go

@@ -23,7 +23,11 @@ func (d *StackitDNSProvider) Records(ctx context.Context) ([]*endpoint.Endpoint,
 		go d.fetchRecordsWorker(ctx, zoneIdsChannel, endpointsErrorChannel)
 	}
 
-	for _, zone := range zones {
+	for i := range zones {
+		zone := &zones[i]
+		if zone.Id == nil {
+			continue
+		}
 		zoneIdsChannel <- *zone.Id
 	}
 
@@ -84,21 +88,39 @@ func (d *StackitDNSProvider) collectEndPoints(
 	rrSets []stackitdnsclient.RecordSet,
 ) []*endpoint.Endpoint {
 	var endpoints []*endpoint.Endpoint
-	for _, r := range rrSets {
-		recordType := string(*r.Type)
-		if provider.SupportedRecordType(recordType) {
-			for _, _r := range *r.Records {
-				endpoints = append(
-					endpoints,
-					endpoint.NewEndpointWithTTL(
-						*r.Name,
-						recordType,
-						endpoint.TTL(*r.Ttl),
-						*_r.Content,
-					),
-				)
-			}
+
+	for i := range rrSets {
+		r := &rrSets[i]
+
+		name, recordType, ttl, records, ok := recordSetCoreFields(r)
+		if !ok || !provider.SupportedRecordType(recordType) {
+			continue
+		}
+
+		endpoints = append(endpoints, endpointsFromRecords(name, recordType, ttl, records)...)
+	}
+
+	return endpoints
+}
+
+func recordSetCoreFields(r *stackitdnsclient.RecordSet) (name string, recordType string, ttl endpoint.TTL, records []stackitdnsclient.Record, ok bool) {
+	if r == nil || r.Type == nil || r.Name == nil || r.Ttl == nil || r.Records == nil {
+		return "", "", 0, nil, false
+	}
+
+	return *r.Name, string(*r.Type), endpoint.TTL(*r.Ttl), *r.Records, true
+}
+
+func endpointsFromRecords(name, recordType string, ttl endpoint.TTL, records []stackitdnsclient.Record) []*endpoint.Endpoint {
+	endpoints := make([]*endpoint.Endpoint, 0, len(records))
+
+	for i := range records {
+		rec := &records[i]
+		if rec.Content == nil {
+			continue
 		}
+
+		endpoints = append(endpoints, endpoint.NewEndpointWithTTL(name, recordType, ttl, *rec.Content))
 	}
 
 	return endpoints

internal/stackitprovider/records.go

@@ -169,7 +169,7 @@ func TestZoneEndpoint403Records(t *testing.T) {
 
 	stackitDnsProvider, err := NewStackitDNSProvider(
 		zap.NewNop(),
-		Config{
+		&Config{
 			ProjectId:    "1234",
 			DomainFilter: endpoint.DomainFilter{},
 			DryRun:       false,
@@ -189,7 +189,7 @@ func TestZoneEndpoint403Records(t *testing.T) {
 func getDefaultTestProvider(server *httptest.Server) (*StackitDNSProvider, error) {
 	stackitDnsProvider, err := NewStackitDNSProvider(
 		zap.NewNop(),
-		Config{
+		&Config{
 			ProjectId:    "1234",
 			DomainFilter: endpoint.DomainFilter{},
 			DryRun:       false,
@@ -330,7 +330,8 @@ func getRrsetsResponseRecordsNonPaged(t *testing.T, w http.ResponseWriter, domai
 
 	var rrSets stackitdnsclient.ListRecordSetsResponse
 
-	if domain == "1234" {
+	switch domain {
+	case "1234":
 		rrSets = stackitdnsclient.ListRecordSetsResponse{
 			ItemsPerPage: pointerTo(int64(20)),
 			Message:      pointerTo("success"),
@@ -348,7 +349,7 @@ func getRrsetsResponseRecordsNonPaged(t *testing.T, w http.ResponseWriter, domai
 			TotalItems: pointerTo(int64(2)),
 			TotalPages: pointerTo(int64(1)),
 		}
-	} else if domain == "5678" {
+	case "5678":
 		rrSets = stackitdnsclient.ListRecordSetsResponse{
 			ItemsPerPage: pointerTo(int64(20)),
 			Message:      pointerTo("success"),

internal/stackitprovider/records_test.go

@@ -24,7 +24,7 @@ type StackitDNSProvider struct {
 // NewStackitDNSProvider creates a new STACKIT DNS stackitprovider.
 func NewStackitDNSProvider(
 	logger *zap.Logger,
-	providerConfig Config,
+	providerConfig *Config,
 	stackitConfig ...stackitconfig.ConfigurationOption,
 ) (*StackitDNSProvider, error) {
 	apiClient, err := stackitdnsclient.NewAPIClient(stackitConfig...)