From acbde30c3b0edc6e81d108f6fc7623401de2b9e4 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 6 Jan 2022 07:44:14 +0100 Subject: [PATCH] Lint code with gofumpt (#664) --- .golangci.yml | 4 ++++ server/api/repo.go | 6 ++++-- server/store/store.go | 40 +++++++++++++++------------------------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9bdfc1cb9..0c7f6afdc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,6 +3,9 @@ linters-settings: simplify: true misspell: locale: US + gofumpt: + lang-version: "1.16" + extra-rules: true linters: disable-all: true @@ -23,6 +26,7 @@ linters: - unused - varcheck - whitespace + - gofumpt run: timeout: 5m diff --git a/server/api/repo.go b/server/api/repo.go index ba1bbdb07..e0e3b0c84 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -32,8 +32,10 @@ import ( ) // TODO: make it set system wide via environment variables -const defaultTimeout = 60 // 1 hour default build time -const maxTimeout = defaultTimeout * 2 +const ( + defaultTimeout int64 = 60 // 1 hour default build time + maxTimeout int64 = defaultTimeout * 2 +) func PostRepo(c *gin.Context) { remote := server.Config.Services.Remote diff --git a/server/store/store.go b/server/store/store.go index 46e4863a6..fa309a7aa 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -23,103 +23,86 @@ import ( // TODO: CreateX func should return new object to not indirect let storage change an existing object (alter ID etc...) type Store interface { + // Users // GetUser gets a user by unique ID. GetUser(int64) (*model.User, error) - // GetUserLogin gets a user by unique Login name. GetUserLogin(string) (*model.User, error) - // GetUserList gets a list of all users in the system. // TODO: paginate GetUserList() ([]*model.User, error) - // GetUserCount gets a count of all users in the system. GetUserCount() (int64, error) - // CreateUser creates a new user account. CreateUser(*model.User) error - // UpdateUser updates a user account. UpdateUser(*model.User) error - // DeleteUser deletes a user account. DeleteUser(*model.User) error + // Repos // GetRepo gets a repo by unique ID. GetRepo(int64) (*model.Repo, error) - // GetRepoName gets a repo by its full name. GetRepoName(string) (*model.Repo, error) - // GetRepoCount gets a count of all repositories in the system. GetRepoCount() (int64, error) - // CreateRepo creates a new repository. CreateRepo(*model.Repo) error - // UpdateRepo updates a user repository. UpdateRepo(*model.Repo) error - // DeleteRepo deletes a user repository. DeleteRepo(*model.Repo) error + // Builds // GetBuild gets a build by unique ID. GetBuild(int64) (*model.Build, error) - // GetBuildNumber gets a build by number. GetBuildNumber(*model.Repo, int64) (*model.Build, error) - // GetBuildRef gets a build by its ref. GetBuildRef(*model.Repo, string) (*model.Build, error) - // GetBuildCommit gets a build by its commit sha. GetBuildCommit(*model.Repo, string, string) (*model.Build, error) - // GetBuildLast gets the last build for the branch. GetBuildLast(*model.Repo, string) (*model.Build, error) - // GetBuildLastBefore gets the last build before build number N. GetBuildLastBefore(*model.Repo, string, int64) (*model.Build, error) - // GetBuildList gets a list of builds for the repository // TODO: paginate GetBuildList(*model.Repo, int) ([]*model.Build, error) - // GetBuildQueue gets a list of build in queue. GetBuildQueue() ([]*model.Feed, error) - // GetBuildCount gets a count of all builds in the system. GetBuildCount() (int64, error) - // CreateBuild creates a new build and jobs. CreateBuild(*model.Build, ...*model.Proc) error - // UpdateBuild updates a build. UpdateBuild(*model.Build) error - // - // new functions - // - + // Feeds UserFeed(*model.User) ([]*model.Feed, error) + // Repositorys // RepoList TODO: paginate RepoList(user *model.User, owned bool) ([]*model.Repo, error) RepoListLatest(*model.User) ([]*model.Feed, error) // RepoBatch Sync batch of repos from SCM (with permissions) to store (create if not exist else update) RepoBatch([]*model.Repo) error + // Permissions PermFind(user *model.User, repo *model.Repo) (*model.Perm, error) PermUpsert(perm *model.Perm) error PermDelete(perm *model.Perm) error PermFlush(user *model.User, before int64) error + // Configs ConfigsForBuild(buildID int64) ([]*model.Config, error) ConfigFindIdentical(repoID int64, hash string) (*model.Config, error) ConfigFindApproved(*model.Config) (bool, error) ConfigCreate(*model.Config) error BuildConfigCreate(*model.BuildConfig) error + // Sender SenderFind(*model.Repo, string) (*model.Sender, error) // SenderList TODO: paginate SenderList(*model.Repo) ([]*model.Sender, error) @@ -127,18 +110,21 @@ type Store interface { SenderUpdate(*model.Sender) error SenderDelete(*model.Sender) error + // Secrets SecretFind(*model.Repo, string) (*model.Secret, error) SecretList(*model.Repo) ([]*model.Secret, error) SecretCreate(*model.Secret) error SecretUpdate(*model.Secret) error SecretDelete(*model.Secret) error + // Registrys RegistryFind(*model.Repo, string) (*model.Registry, error) RegistryList(*model.Repo) ([]*model.Registry, error) RegistryCreate(*model.Registry) error RegistryUpdate(*model.Registry) error RegistryDelete(repo *model.Repo, addr string) error + // Procs ProcLoad(int64) (*model.Proc, error) ProcFind(*model.Build, int) (*model.Proc, error) ProcChild(*model.Build, int, string) (*model.Proc, error) @@ -147,21 +133,25 @@ type Store interface { ProcUpdate(*model.Proc) error ProcClear(*model.Build) error + // Logs LogFind(*model.Proc) (io.ReadCloser, error) // TODO: since we do ReadAll in any case a ioReader is not the best idear // so either find a way to write log in chunks by xorm ... LogSave(*model.Proc, io.Reader) error + // Files FileList(*model.Build) ([]*model.File, error) FileFind(*model.Proc, string) (*model.File, error) FileRead(*model.Proc, string) (io.ReadCloser, error) FileCreate(*model.File, io.Reader) error + // Tasks // TaskList TODO: paginate & opt filter TaskList() ([]*model.Task, error) TaskInsert(*model.Task) error TaskDelete(string) error + // Store operations Ping() error Close() error Migrate() error