From 0270117e8d0d3ced40e47e748c6498fb02c8e163 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Wed, 14 May 2025 22:01:11 +0000 Subject: [PATCH] Fix lint errors Signed-off-by: Gabriel Adrian Samfira --- cache/credentials_cache.go | 6 ++++-- database/sql/gitea.go | 5 +++-- workers/cache/gitea_tools.go | 23 +++++++++++------------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cache/credentials_cache.go b/cache/credentials_cache.go index d5626f40..6dbef775 100644 --- a/cache/credentials_cache.go +++ b/cache/credentials_cache.go @@ -6,8 +6,10 @@ import ( "github.com/cloudbase/garm/params" ) -var credentialsCache *CredentialCache -var giteaCredentialsCache *CredentialCache +var ( + credentialsCache *CredentialCache + giteaCredentialsCache *CredentialCache +) func init() { ghCredentialsCache := &CredentialCache{ diff --git a/database/sql/gitea.go b/database/sql/gitea.go index 5ce46663..8d89b82d 100644 --- a/database/sql/gitea.go +++ b/database/sql/gitea.go @@ -4,12 +4,13 @@ import ( "context" "log/slog" + "github.com/pkg/errors" + "gorm.io/gorm" + runnerErrors "github.com/cloudbase/garm-provider-common/errors" "github.com/cloudbase/garm/auth" "github.com/cloudbase/garm/database/common" "github.com/cloudbase/garm/params" - "github.com/pkg/errors" - "gorm.io/gorm" ) func (s *sqlDatabase) CreateGiteaEndpoint(_ context.Context, param params.CreateGiteaEndpointParams) (ghEndpoint params.ForgeEndpoint, err error) { diff --git a/workers/cache/gitea_tools.go b/workers/cache/gitea_tools.go index 9d6b2307..4474f7df 100644 --- a/workers/cache/gitea_tools.go +++ b/workers/cache/gitea_tools.go @@ -8,8 +8,9 @@ import ( "strings" "time" - commonParams "github.com/cloudbase/garm-provider-common/params" "golang.org/x/mod/semver" + + commonParams "github.com/cloudbase/garm-provider-common/params" ) const ( @@ -20,17 +21,15 @@ const ( GiteaRunnerMinimumVersion = "v0.2.12" ) -var ( - githubArchMapping map[string]string = map[string]string{ - "x86_64": "x64", - "amd64": "x64", - "armv7l": "arm", - "aarch64": "arm64", - "x64": "x64", - "arm": "arm", - "arm64": "arm64", - } -) +var githubArchMapping = map[string]string{ + "x86_64": "x64", + "amd64": "x64", + "armv7l": "arm", + "aarch64": "arm64", + "x64": "x64", + "arm": "arm", + "arm64": "arm64", +} var nightlyActRunner = GiteaEntityTool{ TagName: "nightly",