fix suggestions of linter

kobtea · Jan 2, 2023 · 2adcc18 · 2adcc18
1 parent 7150e95
commit 2adcc18
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ setup:
 	go get golang.org/x/tools/cmd/goimports
 
 lint:
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint golangci-lint run -E gofmt,goimports
+	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint golangci-lint run -E gofmt,goimports --timeout 5m
 
 fmt:
 	go fmt ./...

diff --git a/check/check.go b/check/check.go
@@ -43,7 +43,7 @@ func Check(ctx context.Context, cfg *config.Config) error {
 					Combine:       ConftestConfig.Combine,
 					Policy:        ConftestConfig.Policies,
 				}
-				logger.Debugw(fmt.Sprintf("conftest"), "policy", ConftestConfig.Policies, "input", files)
+				logger.Debugw("conftest", "policy", ConftestConfig.Policies, "input", files)
 				res, err := r.Run(ctx, files)
 				if err != nil {
 					return err
@@ -74,7 +74,7 @@ func Check(ctx context.Context, cfg *config.Config) error {
 					Combine:       ConftestConfig.Combine,
 					Policy:        ConftestConfig.Policies,
 				}
-				logger.Debugw(fmt.Sprintf("conftest"), "policy", ConftestConfig.Policies, "input", files)
+				logger.Debugw("conftest", "policy", ConftestConfig.Policies, "input", files)
 				res, err := r.Run(ctx, files)
 				if err != nil {
 					return err

diff --git a/cmd/check.go b/cmd/check.go
@@ -11,9 +11,9 @@ import (
 var checkCmd = &cobra.Command{
 	Use:   "check",
 	Short: "Test policies",
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := context.Background()
-		check.Check(ctx, cfg)
+		return check.Check(ctx, cfg)
 	},
 }
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -55,10 +55,14 @@ func initConfig() {
 	loggerConfig.Level = lv
 	loggerConfig.EncoderConfig.EncodeTime = zapcore.TimeEncoderOfLayout(time.RFC3339)
 	logger, err := loggerConfig.Build()
-	defer logger.Sync()
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+	defer func() {
+		if er := logger.Sync(); er != nil {
+			fmt.Println(er)
+		}
+	}()
 	zap.ReplaceGlobals(logger)
 }
diff --git a/fetch/fetch.go b/fetch/fetch.go
@@ -52,7 +52,9 @@ func Fetch(ctx context.Context, cfg *config.Config) error {
 			}
 		}
 	}
-	storage.DoGc()
+	if err := storage.DoGc(); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/storage/storage.go b/storage/storage.go
@@ -86,7 +86,7 @@ func (s *Storage) UpdateSource(domain, name, repo, cloneUrl, tokenEnvvarName str
 	path := s.RepoPath(SourceDirname, domain, name, repo)
 	gitRepo, err := git.PlainOpen(path)
 	if errors.Is(err, git.ErrRepositoryNotExists) {
-		gitRepo, err = git.PlainClone(path, false, &git.CloneOptions{
+		_, err = git.PlainClone(path, false, &git.CloneOptions{
 			URL:   cloneUrl,
 			Depth: 1,
 			Auth:  &http.BasicAuth{Username: "username", Password: token},