reorder code in apply_changes.go

Author: MichaelEischer

internal/stackitprovider/apply_changes.go

@@ -51,6 +51,105 @@ func (d *StackitDNSProvider) createRRSets(
 	return d.handleRRSetWithWorkers(ctx, endpoints, zones, CREATE)
 }
 
+// updateRRSets patches (overrides) contents in the record sets in the stackitprovider for the given
+// endpoints that are in the update new field.
+func (d *StackitDNSProvider) updateRRSets(
+	ctx context.Context,
+	endpoints []*endpoint.Endpoint,
+) error {
+	if len(endpoints) == 0 {
+		return nil
+	}
+
+	zones, err := d.zoneFetcherClient.zones(ctx)
+	if err != nil {
+		return err
+	}
+
+	return d.handleRRSetWithWorkers(ctx, endpoints, zones, UPDATE)
+}
+
+// deleteRRSets deletes record sets in the stackitprovider for the given endpoints that are in the
+// deletion field.
+func (d *StackitDNSProvider) deleteRRSets(
+	ctx context.Context,
+	endpoints []*endpoint.Endpoint,
+) error {
+	if len(endpoints) == 0 {
+		d.logger.Debug("no endpoints to delete")
+
+		return nil
+	}
+
+	d.logger.Info("records to delete", zap.String("records", fmt.Sprintf("%v", endpoints)))
+
+	zones, err := d.zoneFetcherClient.zones(ctx)
+	if err != nil {
+		return err
+	}
+
+	return d.handleRRSetWithWorkers(ctx, endpoints, zones, DELETE)
+}
+
+// handleRRSetWithWorkers handles the given endpoints with workers to optimize speed.
+func (d *StackitDNSProvider) handleRRSetWithWorkers(
+	ctx context.Context,
+	endpoints []*endpoint.Endpoint,
+	zones []stackitdnsclient.Zone,
+	action string,
+) error {
+	workerChannel := make(chan changeTask, len(endpoints))
+	errorChannel := make(chan error, len(endpoints))
+
+	for i := 0; i < d.workers; i++ {
+		go d.changeWorker(ctx, workerChannel, errorChannel, zones)
+	}
+
+	for _, change := range endpoints {
+		workerChannel <- changeTask{
+			action: action,
+			change: change,
+		}
+	}
+
+	for i := 0; i < len(endpoints); i++ {
+		err := <-errorChannel
+		if err != nil {
+			close(workerChannel)
+
+			return err
+		}
+	}
+
+	close(workerChannel)
+
+	return nil
+}
+
+// changeWorker is a worker that handles changes passed by a channel.
+func (d *StackitDNSProvider) changeWorker(
+	ctx context.Context,
+	changes chan changeTask,
+	errorChannel chan error,
+	zones []stackitdnsclient.Zone,
+) {
+	for change := range changes {
+		switch change.action {
+		case CREATE:
+			err := d.createRRSet(ctx, change.change, zones)
+			errorChannel <- err
+		case UPDATE:
+			err := d.updateRRSet(ctx, change.change, zones)
+			errorChannel <- err
+		case DELETE:
+			err := d.deleteRRSet(ctx, change.change, zones)
+			errorChannel <- err
+		}
+	}
+
+	d.logger.Debug("change worker finished")
+}
+
 // createRRSet creates a new record set in the stackitprovider for the given endpoint.
 func (d *StackitDNSProvider) createRRSet(
 	ctx context.Context,
@@ -88,24 +187,6 @@ func (d *StackitDNSProvider) createRRSet(
 	return nil
 }
 
-// updateRRSets patches (overrides) contents in the record sets in the stackitprovider for the given
-// endpoints that are in the update new field.
-func (d *StackitDNSProvider) updateRRSets(
-	ctx context.Context,
-	endpoints []*endpoint.Endpoint,
-) error {
-	if len(endpoints) == 0 {
-		return nil
-	}
-
-	zones, err := d.zoneFetcherClient.zones(ctx)
-	if err != nil {
-		return err
-	}
-
-	return d.handleRRSetWithWorkers(ctx, endpoints, zones, UPDATE)
-}
-
 // updateRRSet patches (overrides) contents in the record set in the stackitprovider.
 func (d *StackitDNSProvider) updateRRSet(
 	ctx context.Context,
@@ -142,28 +223,6 @@ func (d *StackitDNSProvider) updateRRSet(
 	return nil
 }
 
-// deleteRRSets deletes record sets in the stackitprovider for the given endpoints that are in the
-// deletion field.
-func (d *StackitDNSProvider) deleteRRSets(
-	ctx context.Context,
-	endpoints []*endpoint.Endpoint,
-) error {
-	if len(endpoints) == 0 {
-		d.logger.Debug("no endpoints to delete")
-
-		return nil
-	}
-
-	d.logger.Info("records to delete", zap.String("records", fmt.Sprintf("%v", endpoints)))
-
-	zones, err := d.zoneFetcherClient.zones(ctx)
-	if err != nil {
-		return err
-	}
-
-	return d.handleRRSetWithWorkers(ctx, endpoints, zones, DELETE)
-}
-
 // deleteRRSet deletes a record set in the stackitprovider for the given endpoint.
 func (d *StackitDNSProvider) deleteRRSet(
 	ctx context.Context,
@@ -197,62 +256,3 @@ func (d *StackitDNSProvider) deleteRRSet(
 
 	return nil
 }
-
-// handleRRSetWithWorkers handles the given endpoints with workers to optimize speed.
-func (d *StackitDNSProvider) handleRRSetWithWorkers(
-	ctx context.Context,
-	endpoints []*endpoint.Endpoint,
-	zones []stackitdnsclient.Zone,
-	action string,
-) error {
-	workerChannel := make(chan changeTask, len(endpoints))
-	errorChannel := make(chan error, len(endpoints))
-
-	for i := 0; i < d.workers; i++ {
-		go d.changeWorker(ctx, workerChannel, errorChannel, zones)
-	}
-
-	for _, change := range endpoints {
-		workerChannel <- changeTask{
-			action: action,
-			change: change,
-		}
-	}
-
-	for i := 0; i < len(endpoints); i++ {
-		err := <-errorChannel
-		if err != nil {
-			close(workerChannel)
-
-			return err
-		}
-	}
-
-	close(workerChannel)
-
-	return nil
-}
-
-// changeWorker is a worker that handles changes passed by a channel.
-func (d *StackitDNSProvider) changeWorker(
-	ctx context.Context,
-	changes chan changeTask,
-	errorChannel chan error,
-	zones []stackitdnsclient.Zone,
-) {
-	for change := range changes {
-		switch change.action {
-		case CREATE:
-			err := d.createRRSet(ctx, change.change, zones)
-			errorChannel <- err
-		case UPDATE:
-			err := d.updateRRSet(ctx, change.change, zones)
-			errorChannel <- err
-		case DELETE:
-			err := d.deleteRRSet(ctx, change.change, zones)
-			errorChannel <- err
-		}
-	}
-
-	d.logger.Debug("change worker finished")
-}