From efcea0fafd4188887a401f419bdc8c677e9ce187 Mon Sep 17 00:00:00 2001 From: Nightapes Date: Sat, 15 Jun 2019 23:16:30 +0200 Subject: [PATCH] style(*): fix lint issues --- .golangci.yml | 2 +- .travis.yml | 2 +- internal/analyzer/analyzer.go | 2 +- internal/analyzer/angular.go | 2 +- internal/cache/cache.go | 4 ++-- internal/releaser/github/github.go | 28 ++++++++++++------------- internal/releaser/releaser.go | 27 ++++++++++++------------ pkg/semanticrelease/semantic-release.go | 3 +++ 8 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 0e24022..51f24bf 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,7 +5,7 @@ linters-settings: golint: min-confidence: 0 issues: - exclude-use-default: false + exclude-use-default: true linters: enable: - golint \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d078e60..9e5af48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: xenial language: go go: - 1.12.x - +gobuild_args: -x -ldflags cache: directories: - $HOME/.cache/go-build diff --git a/internal/analyzer/analyzer.go b/internal/analyzer/analyzer.go index 60e7e56..7f1f21f 100644 --- a/internal/analyzer/analyzer.go +++ b/internal/analyzer/analyzer.go @@ -50,7 +50,7 @@ func New(format string, config config.ChangelogConfig) (*Analyzer, error) { log.Debugf("Commit format set to angular") analyzer.analyzeCommit = newAngular() default: - return nil, fmt.Errorf("Invalid commit format: %s", format) + return nil, fmt.Errorf("invalid commit format: %s", format) } return analyzer, nil diff --git a/internal/analyzer/angular.go b/internal/analyzer/angular.go index d05cff5..e36499a 100644 --- a/internal/analyzer/angular.go +++ b/internal/analyzer/angular.go @@ -107,6 +107,6 @@ func (a *angular) analyze(commit gitutil.Commit, rule Rule) (AnalyzedCommit, boo } } log.Tracef("%s does not match %s, skip", commit.Message, rule.Tag) - return analyzed, false, fmt.Errorf("Not found") + return analyzed, false, fmt.Errorf("not found") } diff --git a/internal/cache/cache.go b/internal/cache/cache.go index cb03426..7bc027d 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -8,14 +8,14 @@ import ( "gopkg.in/yaml.v2" ) -// VersionFileContent struct +// ReleaseVersion struct type ReleaseVersion struct { Last ReleaseVersionEntry `yaml:"last"` Next ReleaseVersionEntry `yaml:"next"` Branch string `yaml:"branch"` } -//VersionFileEntry struct +//ReleaseVersionEntry struct type ReleaseVersionEntry struct { Commit string `yaml:"commit"` Version string `yaml:"version"` diff --git a/internal/releaser/github/github.go b/internal/releaser/github/github.go index f9b9484..66a7043 100644 --- a/internal/releaser/github/github.go +++ b/internal/releaser/github/github.go @@ -17,8 +17,8 @@ import ( // GITHUB identifer for github interface const GITHUB = "github" -// GitHubReleaser type struct -type GitHubReleaser struct { +// Client type struct +type Client struct { config *config.GitHubProvider client *github.Client context context.Context @@ -28,7 +28,7 @@ type GitHubReleaser struct { } // New initialize a new GitHubRelease -func New(c *config.GitHubProvider) (*GitHubReleaser, error) { +func New(c *config.GitHubProvider) (*Client, error) { ctx := context.Background() httpClient := util.CreateBearerHTTPClient(ctx, c.AccessToken) @@ -41,7 +41,7 @@ func New(c *config.GitHubProvider) (*GitHubReleaser, error) { client, err = github.NewEnterpriseClient(c.CustomURL, c.CustomURL+"/api/v3/", httpClient) baseURL = c.CustomURL } - return &GitHubReleaser{ + return &Client{ config: c, client: client, context: ctx, @@ -50,30 +50,30 @@ func New(c *config.GitHubProvider) (*GitHubReleaser, error) { } //GetCommitURL for github -func (g GitHubReleaser) GetCommitURL() string { +func (g Client) GetCommitURL() string { return fmt.Sprintf("%s/%s/%s/commit/{{hash}}", g.baseURL, g.config.User, g.config.Repo) } //GetCompareURL for github -func (g GitHubReleaser) GetCompareURL(oldVersion, newVersion string) string { +func (g Client) GetCompareURL(oldVersion, newVersion string) string { return fmt.Sprintf("%s/%s/%s/compare/%s...%s", g.baseURL, g.config.User, g.config.Repo, oldVersion, newVersion) } //ValidateConfig for github -func (g GitHubReleaser) ValidateConfig() error { +func (g Client) ValidateConfig() error { if g.config.Repo == "" { - return fmt.Errorf("Github Repro is not set") + return fmt.Errorf("github Repro is not set") } if g.config.User == "" { - return fmt.Errorf("Github User is not set") + return fmt.Errorf("github User is not set") } envName := fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(GITHUB)) token, isSet := os.LookupEnv(envName) if !isSet { - return fmt.Errorf("Can not find environment variable %s", envName) + return fmt.Errorf("can not find environment variable %s", envName) } g.token = token return nil @@ -81,7 +81,7 @@ func (g GitHubReleaser) ValidateConfig() error { } // CreateRelease creates release on remote -func (g GitHubReleaser) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error { +func (g Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error { tag := releaseVersion.Next.Version.String() prerelease := releaseVersion.Next.Version.Prerelease() != "" @@ -95,11 +95,11 @@ func (g GitHubReleaser) CreateRelease(releaseVersion *shared.ReleaseVersion, gen }) if err != nil { - return fmt.Errorf("Could not create release: %v", err) + return fmt.Errorf("could not create release: %v", err) } if resp.StatusCode >= http.StatusBadRequest { - return fmt.Errorf("Could not create release: response statuscode: %s", resp.Status) + return fmt.Errorf("could not create release: response statuscode: %s", resp.Status) } g.release = release @@ -108,7 +108,7 @@ func (g GitHubReleaser) CreateRelease(releaseVersion *shared.ReleaseVersion, gen } // UploadAssets uploads specified assets -func (g GitHubReleaser) UploadAssets(assets []config.Asset) error { +func (g Client) UploadAssets(assets []config.Asset) error { for _, asset := range assets { file, err := os.Open(asset.Name) if err != nil { diff --git a/internal/releaser/releaser.go b/internal/releaser/releaser.go index 6970fe2..e57c461 100644 --- a/internal/releaser/releaser.go +++ b/internal/releaser/releaser.go @@ -2,7 +2,6 @@ package releaser import ( "fmt" - "os" "github.com/Nightapes/go-semantic-release/internal/releaser/github" "github.com/Nightapes/go-semantic-release/internal/shared" @@ -37,22 +36,22 @@ func (r *Releasers) GetReleaser() (Releaser, error) { case github.GITHUB: return github.New(&r.config.GitHubProvider) } - return nil, fmt.Errorf("Could not initialize a releaser from this type: %s", r.config.Release) + return nil, fmt.Errorf("could not initialize a releaser from this type: %s", r.config.Release) } -func checkIfAssetsExists(assets []config.Asset) error { - var missingAssets []string - for _, asset := range assets { +// func checkIfAssetsExists(assets []config.Asset) error { +// var missingAssets []string +// for _, asset := range assets { - if _, err := os.Stat(asset.Name); err != nil { - missingAssets = append(missingAssets, asset.Name) - } - } +// if _, err := os.Stat(asset.Name); err != nil { +// missingAssets = append(missingAssets, asset.Name) +// } +// } - if len(missingAssets) != 0 { - return fmt.Errorf("Could not find specified Asset: %+v ", assets) - } +// if len(missingAssets) != 0 { +// return fmt.Errorf("could not find specified Asset: %+v ", assets) +// } - return nil +// return nil -} +// } diff --git a/pkg/semanticrelease/semantic-release.go b/pkg/semanticrelease/semantic-release.go index 61fca64..52c6f25 100644 --- a/pkg/semanticrelease/semantic-release.go +++ b/pkg/semanticrelease/semantic-release.go @@ -207,6 +207,9 @@ func (s *SemanticRelease) WriteChangeLog(changelogContent, file string) error { // Release pusblish release to provider func (s *SemanticRelease) Release(force bool) error { currentBranch, err := s.gitutil.GetBranch() + if err != nil { + return err + } if _, ok := s.config.Branch[currentBranch]; !ok { log.Debugf("Will not perform a new release. Current %s branch is not configured in release config", currentBranch)