Skip to content

Commit 84901fa

Browse files
sp-yducksp-yduck
committed
introduce goimports for formatting
1 parent 54c15dc commit 84901fa

File tree

5 files changed

+213
-207
lines changed

5 files changed

+213
-207
lines changed

‎Makefile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
5757
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
5858

5959
.PHONY: fmt
60-
fmt: ## Run go fmt against code.
60+
fmt: goimports ## Run go fmt against code.
6161
go fmt ./...
62+
$(GOIMPORTS) -w ./
6263

6364
.PHONY: vet
6465
vet: ## Run go vet against code.
@@ -232,6 +233,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
232233
ENVSUBST ?= $(LOCALBIN)/envsubst
233234
KUBECTL ?= $(LOCALBIN)/kubectl
234235
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
236+
GOIMPORTS ?= $(LOCALBIN)/goimports
235237

236238
## Tool Versions
237239
KUSTOMIZE_VERSION ?= v5.0.0
@@ -280,3 +282,8 @@ $(SETUP_ENVTEST): go.mod # Build setup-envtest from tools folder.
280282
golangci-lint: $(GOLANGCI_LINT)
281283
$(GOLANGCI_LINT): $(LOCALBIN)
282284
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(LOCALBIN) v1.54.0
285+
286+
.PHONY: goimports
287+
goimports: $(GOIMPORTS)
288+
$(GOIMPORTS): $(LOCALBIN)
289+
GOBIN=$(LOCALBIN) go install golang.org/x/tools/cmd/goimports@latest

‎cloud/scheduler/plugins/registry.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/plugins/nodename"
77
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/plugins/noderesource"
88
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/plugins/overcommit"
9-
// "github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/plugins/random"
109
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/plugins/regex"
1110
)
1211

‎cloud/scheduler/queue/queue_test.go‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
package queue_test
2-
3-
import (
4-
"context"
5-
"testing"
6-
"time"
7-
8-
. "github.com/onsi/ginkgo/v2"
9-
. "github.com/onsi/gomega"
10-
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/queue"
11-
"github.com/sp-yduck/proxmox-go/api"
12-
)
13-
14-
func TestQueue(t *testing.T) {
15-
RegisterFailHandler(Fail)
16-
RunSpecs(t, "Queue Suite")
17-
}
18-
19-
var _ = Describe("New", Label("unit", "queue"), func() {
20-
It("shoud not error", func() {
21-
q := queue.New()
22-
Expect(q).ToNot(BeNil())
23-
})
24-
})
25-
26-
var _ = Describe("Add", Label("unit", "queue"), func() {
27-
q := queue.New()
28-
29-
It("should not error", func() {
30-
q.Add(context.Background(), &api.VirtualMachineCreateOptions{Name: "foo"})
31-
})
32-
})
33-
34-
var _ = Describe("Get", Label("unit", "queue"), func() {
35-
var q *queue.SchedulingQueue
36-
37-
BeforeEach(func() {
38-
q = queue.New()
39-
})
40-
41-
Context("normal", func() {
42-
It("should run properly", func() {
43-
c := &api.VirtualMachineCreateOptions{Name: "foo"}
44-
q.Add(context.Background(), c)
45-
qemu, shutdown := q.Get()
46-
Expect(qemu.Config()).To(Equal(c))
47-
Expect(shutdown).To(BeFalse())
48-
})
49-
})
50-
51-
Context("shutdown empty queue after 1 sec", func() {
52-
It("should get nil", func() {
53-
go func() {
54-
time.Sleep(1 * time.Second)
55-
q.ShutDown()
56-
}()
57-
qemu, shutdown := q.Get()
58-
Expect(qemu).To(BeNil())
59-
Expect(shutdown).To(BeTrue())
60-
})
61-
})
62-
})
1+
package queue_test
2+
3+
import (
4+
"context"
5+
"testing"
6+
"time"
7+
8+
. "github.com/onsi/ginkgo/v2"
9+
. "github.com/onsi/gomega"
10+
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/queue"
11+
"github.com/sp-yduck/proxmox-go/api"
12+
)
13+
14+
func TestQueue(t *testing.T) {
15+
RegisterFailHandler(Fail)
16+
RunSpecs(t, "Queue Suite")
17+
}
18+
19+
var _ = Describe("New", Label("unit", "queue"), func() {
20+
It("shoud not error", func() {
21+
q := queue.New()
22+
Expect(q).ToNot(BeNil())
23+
})
24+
})
25+
26+
var _ = Describe("Add", Label("unit", "queue"), func() {
27+
q := queue.New()
28+
29+
It("should not error", func() {
30+
q.Add(context.Background(), &api.VirtualMachineCreateOptions{Name: "foo"})
31+
})
32+
})
33+
34+
var _ = Describe("Get", Label("unit", "queue"), func() {
35+
var q *queue.SchedulingQueue
36+
37+
BeforeEach(func() {
38+
q = queue.New()
39+
})
40+
41+
Context("normal", func() {
42+
It("should run properly", func() {
43+
c := &api.VirtualMachineCreateOptions{Name: "foo"}
44+
q.Add(context.Background(), c)
45+
qemu, shutdown := q.Get()
46+
Expect(qemu.Config()).To(Equal(c))
47+
Expect(shutdown).To(BeFalse())
48+
})
49+
})
50+
51+
Context("shutdown empty queue after 1 sec", func() {
52+
It("should get nil", func() {
53+
go func() {
54+
time.Sleep(1 * time.Second)
55+
q.ShutDown()
56+
}()
57+
qemu, shutdown := q.Get()
58+
Expect(qemu).To(BeNil())
59+
Expect(shutdown).To(BeTrue())
60+
})
61+
})
62+
})

‎cloud/scheduler/scheduler_test.go‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
1-
package scheduler_test
2-
3-
import (
4-
"context"
5-
"time"
6-
7-
. "github.com/onsi/ginkgo/v2"
8-
. "github.com/onsi/gomega"
9-
"github.com/sp-yduck/proxmox-go/api"
10-
"sigs.k8s.io/controller-runtime/pkg/log/zap"
11-
12-
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler"
13-
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/framework"
14-
)
15-
16-
var _ = Describe("NewManager", Label("unit", "scheduler"), func() {
17-
It("should not error", func() {
18-
params := scheduler.SchedulerParams{}
19-
manager := scheduler.NewManager(params)
20-
Expect(manager).NotTo(BeNil())
21-
})
22-
})
23-
24-
var _ = Describe("NewScheduler", Label("unit", "scheduler"), func() {
25-
manager := scheduler.NewManager(scheduler.SchedulerParams{})
26-
27-
It("should not error", func() {
28-
sched := manager.NewScheduler(proxmoxSvc)
29-
Expect(sched).NotTo(BeNil())
30-
})
31-
})
32-
33-
var _ = Describe("GetOrCreateScheduler", Label("integration", "scheduler"), func() {
34-
manager := scheduler.NewManager(scheduler.SchedulerParams{})
35-
36-
It("should not error", func() {
37-
sched := manager.GetOrCreateScheduler(proxmoxSvc)
38-
Expect(sched).NotTo(BeNil())
39-
})
40-
})
41-
42-
var _ = Describe("Run (RunAsync) / IsRunning / Stop", Label("unit", "scheduler"), func() {
43-
manager := scheduler.NewManager(scheduler.SchedulerParams{zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))})
44-
45-
Context("with minimal scheduler", func() {
46-
It("should not error", func() {
47-
sched := manager.NewScheduler(proxmoxSvc)
48-
sched.RunAsync()
49-
time.Sleep(1 * time.Second)
50-
Expect(sched.IsRunning()).To(BeTrue())
51-
sched.Stop()
52-
time.Sleep(1 * time.Second)
53-
Expect(sched.IsRunning()).To(BeFalse())
54-
})
55-
})
56-
})
57-
58-
var _ = Describe("WithTimeout", Label("integration", "scheduler"), func() {
59-
manager := scheduler.NewManager(scheduler.SchedulerParams{})
60-
61-
It("should not error", func() {
62-
sched := manager.NewScheduler(proxmoxSvc, scheduler.WithTimeout(2*time.Second))
63-
Expect(sched).NotTo(BeNil())
64-
sched.RunAsync()
65-
time.Sleep(1 * time.Second)
66-
Expect(sched.IsRunning()).To(BeTrue())
67-
time.Sleep(2 * time.Second)
68-
Expect(sched.IsRunning()).To(BeFalse())
69-
})
70-
})
71-
72-
var _ = Describe("CreateQEMU", Label("integration"), func() {
73-
manager := scheduler.NewManager(scheduler.SchedulerParams{zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))})
74-
var result framework.SchedulerResult
75-
76-
AfterEach(func() {
77-
vm, err := proxmoxSvc.VirtualMachine(context.Background(), result.VMID())
78-
if err == nil {
79-
err := vm.Delete(context.Background())
80-
Expect(err).NotTo(HaveOccurred())
81-
}
82-
})
83-
84-
Context("with minimal scheduler", func() {
85-
It("should not error", func() {
86-
sched := manager.NewScheduler(proxmoxSvc)
87-
sched.RunAsync()
88-
var err error
89-
result, err = sched.CreateQEMU(context.Background(), &api.VirtualMachineCreateOptions{
90-
Name: "qemu-scheduler-test-createqemu",
91-
})
92-
Expect(err).ToNot(HaveOccurred())
93-
Expect(result).ToNot(BeNil())
94-
Expect(result.Node()).To(Equal(result.Instance().Node))
95-
Expect(result.VMID()).To(Equal(result.Instance().VM.VMID))
96-
})
97-
})
98-
})
1+
package scheduler_test
2+
3+
import (
4+
"context"
5+
"time"
6+
7+
. "github.com/onsi/ginkgo/v2"
8+
. "github.com/onsi/gomega"
9+
"github.com/sp-yduck/proxmox-go/api"
10+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
11+
12+
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler"
13+
"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler/framework"
14+
)
15+
16+
var _ = Describe("NewManager", Label("unit", "scheduler"), func() {
17+
It("should not error", func() {
18+
params := scheduler.SchedulerParams{}
19+
manager := scheduler.NewManager(params)
20+
Expect(manager).NotTo(BeNil())
21+
})
22+
})
23+
24+
var _ = Describe("NewScheduler", Label("unit", "scheduler"), func() {
25+
manager := scheduler.NewManager(scheduler.SchedulerParams{})
26+
27+
It("should not error", func() {
28+
sched := manager.NewScheduler(proxmoxSvc)
29+
Expect(sched).NotTo(BeNil())
30+
})
31+
})
32+
33+
var _ = Describe("GetOrCreateScheduler", Label("integration", "scheduler"), func() {
34+
manager := scheduler.NewManager(scheduler.SchedulerParams{})
35+
36+
It("should not error", func() {
37+
sched := manager.GetOrCreateScheduler(proxmoxSvc)
38+
Expect(sched).NotTo(BeNil())
39+
})
40+
})
41+
42+
var _ = Describe("Run (RunAsync) / IsRunning / Stop", Label("unit", "scheduler"), func() {
43+
manager := scheduler.NewManager(scheduler.SchedulerParams{zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))})
44+
45+
Context("with minimal scheduler", func() {
46+
It("should not error", func() {
47+
sched := manager.NewScheduler(proxmoxSvc)
48+
sched.RunAsync()
49+
time.Sleep(1 * time.Second)
50+
Expect(sched.IsRunning()).To(BeTrue())
51+
sched.Stop()
52+
time.Sleep(1 * time.Second)
53+
Expect(sched.IsRunning()).To(BeFalse())
54+
})
55+
})
56+
})
57+
58+
var _ = Describe("WithTimeout", Label("integration", "scheduler"), func() {
59+
manager := scheduler.NewManager(scheduler.SchedulerParams{})
60+
61+
It("should not error", func() {
62+
sched := manager.NewScheduler(proxmoxSvc, scheduler.WithTimeout(2*time.Second))
63+
Expect(sched).NotTo(BeNil())
64+
sched.RunAsync()
65+
time.Sleep(1 * time.Second)
66+
Expect(sched.IsRunning()).To(BeTrue())
67+
time.Sleep(2 * time.Second)
68+
Expect(sched.IsRunning()).To(BeFalse())
69+
})
70+
})
71+
72+
var _ = Describe("CreateQEMU", Label("integration"), func() {
73+
manager := scheduler.NewManager(scheduler.SchedulerParams{zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))})
74+
var result framework.SchedulerResult
75+
76+
AfterEach(func() {
77+
vm, err := proxmoxSvc.VirtualMachine(context.Background(), result.VMID())
78+
if err == nil {
79+
err := vm.Delete(context.Background())
80+
Expect(err).NotTo(HaveOccurred())
81+
}
82+
})
83+
84+
Context("with minimal scheduler", func() {
85+
It("should not error", func() {
86+
sched := manager.NewScheduler(proxmoxSvc)
87+
sched.RunAsync()
88+
var err error
89+
result, err = sched.CreateQEMU(context.Background(), &api.VirtualMachineCreateOptions{
90+
Name: "qemu-scheduler-test-createqemu",
91+
})
92+
Expect(err).ToNot(HaveOccurred())
93+
Expect(result).ToNot(BeNil())
94+
Expect(result.Node()).To(Equal(result.Instance().Node))
95+
Expect(result.VMID()).To(Equal(result.Instance().VM.VMID))
96+
})
97+
})
98+
})

0 commit comments

Comments
 (0)