Skip to content

Commit 54a4ce3

Browse files
authored
chore: migrate workerpool in its own package (#2444)
* chore: migrate workerpool in its own package * fix
1 parent be334e8 commit 54a4ce3

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

internal/workerpool.go renamed to internal/workerpool/workerpool.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
package internal
1+
package workerpool
22

3-
import (
4-
"sync"
5-
)
3+
import "sync"
64

7-
type WorkerPoolTask func() error
5+
type Task func() error
86

97
type WorkerPool struct {
10-
tasksToDispatch chan WorkerPoolTask
11-
tasksToRun chan WorkerPoolTask
8+
tasksToDispatch chan Task
9+
tasksToRun chan Task
1210
errors []error
1311
errorsMutex sync.Mutex
1412
tasksWaitingGroup sync.WaitGroup
1513
}
1614

1715
func NewWorkerPool(size int) *WorkerPool {
1816
p := &WorkerPool{
19-
tasksToDispatch: make(chan WorkerPoolTask),
20-
tasksToRun: make(chan WorkerPoolTask, size),
17+
tasksToDispatch: make(chan Task),
18+
tasksToRun: make(chan Task, size),
2119
}
2220

2321
for i := 0; i < size; i++ {
@@ -30,7 +28,7 @@ func NewWorkerPool(size int) *WorkerPool {
3028
}
3129

3230
func (p *WorkerPool) dispatcher() {
33-
var pendingTasks []WorkerPoolTask
31+
var pendingTasks []Task
3432

3533
for {
3634
if len(pendingTasks) > 0 {
@@ -75,7 +73,7 @@ func (p *WorkerPool) worker() {
7573
}
7674
}
7775

78-
func (p *WorkerPool) AddTask(task WorkerPoolTask) {
76+
func (p *WorkerPool) AddTask(task Task) {
7977
p.tasksWaitingGroup.Add(1)
8078
p.tasksToDispatch <- task
8179
}

internal/workerpool_test.go renamed to internal/workerpool/workerpool_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package internal
1+
package workerpool
22

33
import (
44
"errors"

scaleway/helpers_object.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
2626
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
2727
"github.com/scaleway/scaleway-sdk-go/scw"
28-
"github.com/scaleway/terraform-provider-scaleway/v2/internal"
28+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/workerpool"
2929
)
3030

3131
const (
@@ -375,7 +375,7 @@ func deleteS3ObjectVersions(ctx context.Context, conn *s3.S3, bucketName string,
375375
}
376376

377377
listErr := conn.ListObjectVersionsPagesWithContext(ctx, listInput, func(page *s3.ListObjectVersionsOutput, _ bool) bool {
378-
pool := internal.NewWorkerPool(deletionWorkers)
378+
pool := workerpool.NewWorkerPool(deletionWorkers)
379379

380380
for _, objectVersion := range page.Versions {
381381
objectVersion := objectVersion
@@ -420,7 +420,7 @@ func deleteS3ObjectVersions(ctx context.Context, conn *s3.S3, bucketName string,
420420
}
421421

422422
listErr = conn.ListObjectVersionsPagesWithContext(ctx, listInput, func(page *s3.ListObjectVersionsOutput, _ bool) bool {
423-
pool := internal.NewWorkerPool(deletionWorkers)
423+
pool := workerpool.NewWorkerPool(deletionWorkers)
424424

425425
for _, deleteMarkerEntry := range page.DeleteMarkers {
426426
deleteMarkerEntry := deleteMarkerEntry

0 commit comments

Comments
 (0)