From e664639e98f26b5cbecd310bc7c5592d36aee3a5 Mon Sep 17 00:00:00 2001 From: Mario Constanti Date: Thu, 22 Feb 2024 08:54:12 +0100 Subject: [PATCH] fix: var-declaration linter findings Signed-off-by: Mario Constanti --- cmd/garm/main.go | 2 +- params/params.go | 2 +- test/integration/e2e/instances.go | 6 +++--- test/integration/e2e/jobs.go | 4 ++-- test/integration/e2e/pools.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/garm/main.go b/cmd/garm/main.go index e50c9123..1a11ca9c 100644 --- a/cmd/garm/main.go +++ b/cmd/garm/main.go @@ -98,7 +98,7 @@ func setupLogging(ctx context.Context, logCfg config.Logging, hub *websocket.Hub } }() - var writers []io.Writer = []io.Writer{ + var writers = []io.Writer{ logWriter, } diff --git a/params/params.go b/params/params.go index af48bd1c..352bba89 100644 --- a/params/params.go +++ b/params/params.go @@ -436,7 +436,7 @@ func (g GithubCredentials) RootCertificateBundle() (CertificateBundle, error) { ret := map[string][]byte{} var block *pem.Block - var rest []byte = g.CABundle + var rest = g.CABundle for { block, rest = pem.Decode(rest) if block == nil { diff --git a/test/integration/e2e/instances.go b/test/integration/e2e/instances.go index 569edba7..91207c95 100644 --- a/test/integration/e2e/instances.go +++ b/test/integration/e2e/instances.go @@ -10,7 +10,7 @@ import ( ) func waitInstanceStatus(name string, status commonParams.InstanceStatus, runnerStatus params.RunnerStatus, timeout time.Duration) (*params.Instance, error) { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 var instance *params.Instance slog.Info("Waiting for instance to reach desired status", "instance", name, "desired_status", status, "desired_runner_status", runnerStatus) @@ -41,7 +41,7 @@ func DeleteInstance(name string, forceRemove bool) { } func WaitInstanceToBeRemoved(name string, timeout time.Duration) error { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 var instance *params.Instance slog.Info("Waiting for instance to be removed", "instance_name", name) @@ -75,7 +75,7 @@ func WaitInstanceToBeRemoved(name string, timeout time.Duration) error { } func WaitPoolInstances(poolID string, status commonParams.InstanceStatus, runnerStatus params.RunnerStatus, timeout time.Duration) error { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 pool, err := getPool(cli, authToken, poolID) if err != nil { diff --git a/test/integration/e2e/jobs.go b/test/integration/e2e/jobs.go index 179cf495..25b5317d 100644 --- a/test/integration/e2e/jobs.go +++ b/test/integration/e2e/jobs.go @@ -54,7 +54,7 @@ func ValidateJobLifecycle(label string) { } func waitLabelledJob(label string, timeout time.Duration) (*params.Job, error) { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 var jobs params.Jobs var err error @@ -82,7 +82,7 @@ func waitLabelledJob(label string, timeout time.Duration) (*params.Job, error) { } func waitJobStatus(id int64, status params.JobStatus, timeout time.Duration) (*params.Job, error) { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 var job *params.Job slog.Info("Waiting for job to reach status", "job_id", id, "status", status) diff --git a/test/integration/e2e/pools.go b/test/integration/e2e/pools.go index 2ebc0165..b4371e29 100644 --- a/test/integration/e2e/pools.go +++ b/test/integration/e2e/pools.go @@ -9,7 +9,7 @@ import ( ) func waitPoolNoInstances(id string, timeout time.Duration) error { - var timeWaited time.Duration = 0 + var timeWaited time.Duration // default is 0 var pool *params.Pool var err error