diff --git a/api/v1/webhook_suite_test.go b/api/v1/webhook_suite_test.go index 86195b1..d074fc5 100644 --- a/api/v1/webhook_suite_test.go +++ b/api/v1/webhook_suite_test.go @@ -43,10 +43,12 @@ import ( // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. // var cfg *rest.Config -var k8sClient client.Client -var testEnv *envtest.Environment -var ctx context.Context -var cancel context.CancelFunc +var ( + k8sClient client.Client + testEnv *envtest.Environment + ctx context.Context + cancel context.CancelFunc +) func TestAPIs(t *testing.T) { RegisterFailHandler(Fail) @@ -124,7 +126,6 @@ var _ = BeforeSuite(func() { conn.Close() return nil }).Should(Succeed()) - }, 60) var _ = AfterSuite(func() { diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 5dbe0a5..8823fa2 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -37,8 +37,10 @@ import ( // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. // var cfg *rest.Config -var k8sClient client.Client -var testEnv *envtest.Environment +var ( + k8sClient client.Client + testEnv *envtest.Environment +) func TestAPIs(t *testing.T) { RegisterFailHandler(Fail) @@ -69,7 +71,6 @@ var _ = BeforeSuite(func() { k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) Expect(err).NotTo(HaveOccurred()) Expect(k8sClient).NotTo(BeNil()) - }, 60) var _ = AfterSuite(func() { diff --git a/pkg/diskinfo/frpc.go b/pkg/diskinfo/frpc.go index 447fc9a..95949e7 100644 --- a/pkg/diskinfo/frpc.go +++ b/pkg/diskinfo/frpc.go @@ -40,7 +40,11 @@ func getProxy(name, namespace string) (string, error) { proxyPollLog.Error(err, "failed to call dashboard") return } - defer resp.Body.Close() + defer func() { + if err := resp.Body.Close(); err != nil { + proxyPollLog.Error(err, "failed to close body") + } + }() content, err := io.ReadAll(resp.Body) if err != nil { diff --git a/pkg/utils/semaphore.go b/pkg/utils/semaphore.go index 15390a0..cd56b23 100644 --- a/pkg/utils/semaphore.go +++ b/pkg/utils/semaphore.go @@ -11,7 +11,7 @@ type Semaphore func() (bool, func()) // CreateSemaphore creates a new semaphore to limit concurrency func CreateSemaphore(concurrency int, wait time.Duration) Semaphore { - var lock = make(chan bool, concurrency) + lock := make(chan bool, concurrency) return func() (bool, func()) { timer := time.NewTimer(wait)