style(*): fix lint issues

This commit is contained in:
Nightapes
2019-06-15 23:16:30 +02:00
parent cf0431846b
commit efcea0fafd
8 changed files with 36 additions and 34 deletions

View File

@@ -5,7 +5,7 @@ linters-settings:
golint: golint:
min-confidence: 0 min-confidence: 0
issues: issues:
exclude-use-default: false exclude-use-default: true
linters: linters:
enable: enable:
- golint - golint

View File

@@ -3,7 +3,7 @@ dist: xenial
language: go language: go
go: go:
- 1.12.x - 1.12.x
gobuild_args: -x -ldflags
cache: cache:
directories: directories:
- $HOME/.cache/go-build - $HOME/.cache/go-build

View File

@@ -50,7 +50,7 @@ func New(format string, config config.ChangelogConfig) (*Analyzer, error) {
log.Debugf("Commit format set to angular") log.Debugf("Commit format set to angular")
analyzer.analyzeCommit = newAngular() analyzer.analyzeCommit = newAngular()
default: default:
return nil, fmt.Errorf("Invalid commit format: %s", format) return nil, fmt.Errorf("invalid commit format: %s", format)
} }
return analyzer, nil return analyzer, nil

View File

@@ -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) 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")
} }

View File

@@ -8,14 +8,14 @@ import (
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
// VersionFileContent struct // ReleaseVersion struct
type ReleaseVersion struct { type ReleaseVersion struct {
Last ReleaseVersionEntry `yaml:"last"` Last ReleaseVersionEntry `yaml:"last"`
Next ReleaseVersionEntry `yaml:"next"` Next ReleaseVersionEntry `yaml:"next"`
Branch string `yaml:"branch"` Branch string `yaml:"branch"`
} }
//VersionFileEntry struct //ReleaseVersionEntry struct
type ReleaseVersionEntry struct { type ReleaseVersionEntry struct {
Commit string `yaml:"commit"` Commit string `yaml:"commit"`
Version string `yaml:"version"` Version string `yaml:"version"`

View File

@@ -17,8 +17,8 @@ import (
// GITHUB identifer for github interface // GITHUB identifer for github interface
const GITHUB = "github" const GITHUB = "github"
// GitHubReleaser type struct // Client type struct
type GitHubReleaser struct { type Client struct {
config *config.GitHubProvider config *config.GitHubProvider
client *github.Client client *github.Client
context context.Context context context.Context
@@ -28,7 +28,7 @@ type GitHubReleaser struct {
} }
// New initialize a new GitHubRelease // New initialize a new GitHubRelease
func New(c *config.GitHubProvider) (*GitHubReleaser, error) { func New(c *config.GitHubProvider) (*Client, error) {
ctx := context.Background() ctx := context.Background()
httpClient := util.CreateBearerHTTPClient(ctx, c.AccessToken) 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) client, err = github.NewEnterpriseClient(c.CustomURL, c.CustomURL+"/api/v3/", httpClient)
baseURL = c.CustomURL baseURL = c.CustomURL
} }
return &GitHubReleaser{ return &Client{
config: c, config: c,
client: client, client: client,
context: ctx, context: ctx,
@@ -50,30 +50,30 @@ func New(c *config.GitHubProvider) (*GitHubReleaser, error) {
} }
//GetCommitURL for github //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) return fmt.Sprintf("%s/%s/%s/commit/{{hash}}", g.baseURL, g.config.User, g.config.Repo)
} }
//GetCompareURL for github //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) return fmt.Sprintf("%s/%s/%s/compare/%s...%s", g.baseURL, g.config.User, g.config.Repo, oldVersion, newVersion)
} }
//ValidateConfig for github //ValidateConfig for github
func (g GitHubReleaser) ValidateConfig() error { func (g Client) ValidateConfig() error {
if g.config.Repo == "" { if g.config.Repo == "" {
return fmt.Errorf("Github Repro is not set") return fmt.Errorf("github Repro is not set")
} }
if g.config.User == "" { 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)) envName := fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(GITHUB))
token, isSet := os.LookupEnv(envName) token, isSet := os.LookupEnv(envName)
if !isSet { 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 g.token = token
return nil return nil
@@ -81,7 +81,7 @@ func (g GitHubReleaser) ValidateConfig() error {
} }
// CreateRelease creates release on remote // 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() tag := releaseVersion.Next.Version.String()
prerelease := releaseVersion.Next.Version.Prerelease() != "" prerelease := releaseVersion.Next.Version.Prerelease() != ""
@@ -95,11 +95,11 @@ func (g GitHubReleaser) CreateRelease(releaseVersion *shared.ReleaseVersion, gen
}) })
if err != nil { 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 { 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 g.release = release
@@ -108,7 +108,7 @@ func (g GitHubReleaser) CreateRelease(releaseVersion *shared.ReleaseVersion, gen
} }
// UploadAssets uploads specified assets // UploadAssets uploads specified assets
func (g GitHubReleaser) UploadAssets(assets []config.Asset) error { func (g Client) UploadAssets(assets []config.Asset) error {
for _, asset := range assets { for _, asset := range assets {
file, err := os.Open(asset.Name) file, err := os.Open(asset.Name)
if err != nil { if err != nil {

View File

@@ -2,7 +2,6 @@ package releaser
import ( import (
"fmt" "fmt"
"os"
"github.com/Nightapes/go-semantic-release/internal/releaser/github" "github.com/Nightapes/go-semantic-release/internal/releaser/github"
"github.com/Nightapes/go-semantic-release/internal/shared" "github.com/Nightapes/go-semantic-release/internal/shared"
@@ -37,22 +36,22 @@ func (r *Releasers) GetReleaser() (Releaser, error) {
case github.GITHUB: case github.GITHUB:
return github.New(&r.config.GitHubProvider) 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 { // func checkIfAssetsExists(assets []config.Asset) error {
var missingAssets []string // var missingAssets []string
for _, asset := range assets { // for _, asset := range assets {
if _, err := os.Stat(asset.Name); err != nil { // if _, err := os.Stat(asset.Name); err != nil {
missingAssets = append(missingAssets, asset.Name) // missingAssets = append(missingAssets, asset.Name)
} // }
} // }
if len(missingAssets) != 0 { // if len(missingAssets) != 0 {
return fmt.Errorf("Could not find specified Asset: %+v ", assets) // return fmt.Errorf("could not find specified Asset: %+v ", assets)
} // }
return nil // return nil
} // }

View File

@@ -207,6 +207,9 @@ func (s *SemanticRelease) WriteChangeLog(changelogContent, file string) error {
// Release pusblish release to provider // Release pusblish release to provider
func (s *SemanticRelease) Release(force bool) error { func (s *SemanticRelease) Release(force bool) error {
currentBranch, err := s.gitutil.GetBranch() currentBranch, err := s.gitutil.GetBranch()
if err != nil {
return err
}
if _, ok := s.config.Branch[currentBranch]; !ok { 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) log.Debugf("Will not perform a new release. Current %s branch is not configured in release config", currentBranch)