Skip to content

Commit 8316650

Browse files
jaredallardjaredallard
committed
chore: appease the linter
1 parent 7d5d540 commit 8316650

File tree

5 files changed

+58
-58
lines changed

5 files changed

+58
-58
lines changed

‎internal/execerr/execerr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
//
3636
// Otherwise, a new error is returned with details about the command
3737
// that was executed and it's output as present on the exec.ExitError.
38-
func From(cmd cmdexec.Cmd, err error) error {
38+
func From(_ cmdexec.Cmd, err error) error {
3939
if err == nil {
4040
return nil
4141
}

‎releases/github/github.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -57,69 +57,69 @@ func assetToFileInfo(a *gogithub.ReleaseAsset) os.FileInfo {
5757
// getOrgRepoFromURL returns the org and repo from a URL:
5858
//
5959
// Example: https://github.com/rgst-io/stencil
60-
func getOrgRepoFromURL(URL string) (string, string, error) {
61-
u, err := url.Parse(URL)
60+
func getOrgRepoFromURL(urlStr string) (owner, repo string, err error) {
61+
u, err := url.Parse(urlStr)
6262
if err != nil {
6363
return "", "", err
6464
}
6565

6666
// /rgst-io/stencil -> ["", "rgst-io", "stencil"]
6767
spl := strings.Split(u.Path, "/")
6868
if len(spl) != 3 {
69-
return "", "", fmt.Errorf("invalid Github URL: %s", URL)
69+
return "", "", fmt.Errorf("invalid Github URL: %s", urlStr)
7070
}
7171
return spl[1], spl[2], nil
7272
}
7373

7474
// createClient creates a Github client
75-
func (f *Fetcher) createClient(ctx context.Context, token *token.Token) *gogithub.Client {
75+
func (f *Fetcher) createClient(ctx context.Context, t *token.Token) *gogithub.Client {
7676
httpClient := http.DefaultClient
77-
if !token.IsUnauthenticated() {
78-
httpClient = oauth2.NewClient(ctx, oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token.Value}))
77+
if !t.IsUnauthenticated() {
78+
httpClient = oauth2.NewClient(ctx, oauth2.StaticTokenSource(&oauth2.Token{AccessToken: t.Value}))
7979
}
8080
return gogithub.NewClient(httpClient)
8181
}
8282

8383
// GetReleaseNotes returns the release notes for a given tag
84-
func (f *Fetcher) GetReleaseNotes(ctx context.Context, token *token.Token, opts *opts.GetReleaseNoteOptions) (string, error) {
85-
gh := f.createClient(ctx, token)
86-
friendlyRepo := strings.TrimPrefix(opts.RepoURL, "https://")
84+
func (f *Fetcher) GetReleaseNotes(ctx context.Context, t *token.Token, opt *opts.GetReleaseNoteOptions) (string, error) {
85+
gh := f.createClient(ctx, t)
86+
friendlyRepo := strings.TrimPrefix(opt.RepoURL, "https://")
8787

88-
org, repo, err := getOrgRepoFromURL(opts.RepoURL)
88+
org, repo, err := getOrgRepoFromURL(opt.RepoURL)
8989
if err != nil {
9090
return "", err
9191
}
9292

93-
rel, _, err := gh.Repositories.GetReleaseByTag(ctx, org, repo, opts.Tag)
93+
rel, _, err := gh.Repositories.GetReleaseByTag(ctx, org, repo, opt.Tag)
9494
if err != nil {
95-
return "", fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opts.Tag, err)
95+
return "", fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opt.Tag, err)
9696
}
9797

9898
return rel.GetBody(), nil
9999
}
100100

101101
// Fetch fetches a release from a github repository and the underlying
102102
// release asset.
103-
func (f *Fetcher) Fetch(ctx context.Context, token *token.Token, opts *opts.FetchOptions) (io.ReadCloser, os.FileInfo, error) {
104-
gh := f.createClient(ctx, token)
103+
func (f *Fetcher) Fetch(ctx context.Context, t *token.Token, opt *opts.FetchOptions) (io.ReadCloser, os.FileInfo, error) {
104+
gh := f.createClient(ctx, t)
105105

106-
friendlyRepo := strings.TrimPrefix(opts.RepoURL, "https://")
106+
friendlyRepo := strings.TrimPrefix(opt.RepoURL, "https://")
107107

108-
org, repo, err := getOrgRepoFromURL(opts.RepoURL)
108+
org, repo, err := getOrgRepoFromURL(opt.RepoURL)
109109
if err != nil {
110110
return nil, nil, err
111111
}
112112

113-
rel, _, err := gh.Repositories.GetReleaseByTag(ctx, org, repo, opts.Tag)
113+
rel, _, err := gh.Repositories.GetReleaseByTag(ctx, org, repo, opt.Tag)
114114
if err != nil {
115-
return nil, nil, fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opts.Tag, err)
115+
return nil, nil, fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opt.Tag, err)
116116
}
117117

118118
// copy the assetNames slice, and append the assetName if it is not
119119
// empty
120-
validAssets := append([]string{}, opts.AssetNames...)
121-
if opts.AssetName != "" {
122-
validAssets = append(validAssets, opts.AssetName)
120+
validAssets := append([]string{}, opt.AssetNames...)
121+
if opt.AssetName != "" {
122+
validAssets = append(validAssets, opt.AssetName)
123123
}
124124

125125
// Find an asset that matches the provided asset names
@@ -144,15 +144,15 @@ func (f *Fetcher) Fetch(ctx context.Context, token *token.Token, opts *opts.Fetc
144144
}
145145
if a == nil {
146146
return nil, nil,
147-
fmt.Errorf("failed to find asset %v in release %s@%s", validAssets, friendlyRepo, opts.Tag)
147+
fmt.Errorf("failed to find asset %v in release %s@%s", validAssets, friendlyRepo, opt.Tag)
148148
}
149149

150150
// The second return value is a redirectURL, but by passing
151151
// http.DefaultClient we shouldn't have to handle it.
152152
rc, _, err := gh.Repositories.DownloadReleaseAsset(ctx, org, repo, a.GetID(), http.DefaultClient)
153153
if err != nil {
154154
return nil, nil,
155-
fmt.Errorf("failed to download asset %s from release %s@%s: %w", a.GetName(), friendlyRepo, opts.Tag, err)
155+
fmt.Errorf("failed to download asset %s from release %s@%s: %w", a.GetName(), friendlyRepo, opt.Tag, err)
156156
}
157157

158158
return rc, assetToFileInfo(a), nil

‎releases/gitlab/gitlab.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ func assetToFileInfo(rl *gogitlab.ReleaseLink) os.FileInfo {
5050
}
5151

5252
// createClient creates a Gitlab client
53-
func (f *Fetcher) createClient(token *token.Token) (*gogitlab.Client, error) {
54-
if token.IsUnauthenticated() {
53+
func (f *Fetcher) createClient(t *token.Token) (*gogitlab.Client, error) {
54+
if t.IsUnauthenticated() {
5555
return gogitlab.NewClient("")
5656
}
5757

5858
var client *gogitlab.Client
5959
var err error
60-
switch token.Type {
60+
switch t.Type {
6161
case "pat", "": // Default is PAT.
62-
client, err = gogitlab.NewClient(token.Value)
62+
client, err = gogitlab.NewClient(t.Value)
6363
case "job":
64-
client, err = gogitlab.NewJobClient(token.Value)
64+
client, err = gogitlab.NewJobClient(t.Value)
6565
default:
66-
return nil, fmt.Errorf("unknown token type %s", token.Type)
66+
return nil, fmt.Errorf("unknown token type %s", t.Type)
6767
}
6868
return client, err
6969
}
@@ -84,49 +84,49 @@ func (f *Fetcher) getPIDFromRepoURL(repoURL string, glab *gogitlab.Client) (int,
8484
}
8585

8686
// GetReleaseNotes returns the release notes for a given tag
87-
func (f *Fetcher) GetReleaseNotes(ctx context.Context, token *token.Token, opts *opts.GetReleaseNoteOptions) (string, error) {
88-
glab, err := f.createClient(token)
87+
func (f *Fetcher) GetReleaseNotes(_ context.Context, t *token.Token, opt *opts.GetReleaseNoteOptions) (string, error) {
88+
glab, err := f.createClient(t)
8989
if err != nil {
9090
return "", err
9191
}
9292

93-
friendlyRepo := strings.TrimPrefix(opts.RepoURL, "https://")
94-
pid, err := f.getPIDFromRepoURL(opts.RepoURL, glab)
93+
friendlyRepo := strings.TrimPrefix(opt.RepoURL, "https://")
94+
pid, err := f.getPIDFromRepoURL(opt.RepoURL, glab)
9595
if err != nil {
9696
return "", err
9797
}
9898

99-
rel, _, err := glab.Releases.GetRelease(pid, opts.Tag)
99+
rel, _, err := glab.Releases.GetRelease(pid, opt.Tag)
100100
if err != nil {
101-
return "", fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opts.Tag, err)
101+
return "", fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opt.Tag, err)
102102
}
103103
return rel.Description, nil
104104
}
105105

106106
// Fetch fetches a release from a github repository and the underlying
107107
// release asset.
108-
func (f *Fetcher) Fetch(ctx context.Context, token *token.Token, opts *opts.FetchOptions) (io.ReadCloser, os.FileInfo, error) {
109-
glab, err := f.createClient(token)
108+
func (f *Fetcher) Fetch(_ context.Context, t *token.Token, opt *opts.FetchOptions) (io.ReadCloser, os.FileInfo, error) {
109+
glab, err := f.createClient(t)
110110
if err != nil {
111111
return nil, nil, err
112112
}
113113

114-
friendlyRepo := strings.TrimPrefix(opts.RepoURL, "https://")
115-
pid, err := f.getPIDFromRepoURL(opts.RepoURL, glab)
114+
friendlyRepo := strings.TrimPrefix(opt.RepoURL, "https://")
115+
pid, err := f.getPIDFromRepoURL(opt.RepoURL, glab)
116116
if err != nil {
117117
return nil, nil, err
118118
}
119119

120-
rel, _, err := glab.Releases.GetRelease(pid, opts.Tag)
120+
rel, _, err := glab.Releases.GetRelease(pid, opt.Tag)
121121
if err != nil {
122-
return nil, nil, fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opts.Tag, err)
122+
return nil, nil, fmt.Errorf("failed to get release for %s@%s: %w", friendlyRepo, opt.Tag, err)
123123
}
124124

125125
// copy the assetNames slice, and append the assetName if it is not
126126
// empty
127-
validAssets := append([]string{}, opts.AssetNames...)
128-
if opts.AssetName != "" {
129-
validAssets = append(validAssets, opts.AssetName)
127+
validAssets := append([]string{}, opt.AssetNames...)
128+
if opt.AssetName != "" {
129+
validAssets = append(validAssets, opt.AssetName)
130130
}
131131

132132
// Find an asset that matches the provided asset names
@@ -151,7 +151,7 @@ func (f *Fetcher) Fetch(ctx context.Context, token *token.Token, opts *opts.Fetc
151151
}
152152
if rl == nil {
153153
return nil, nil,
154-
fmt.Errorf("failed to find asset %v in release %s@%s", validAssets, friendlyRepo, opts.Tag)
154+
fmt.Errorf("failed to find asset %v in release %s@%s", validAssets, friendlyRepo, opt.Tag)
155155
}
156156

157157
// Download the asset
@@ -161,12 +161,12 @@ func (f *Fetcher) Fetch(ctx context.Context, token *token.Token, opts *opts.Fetc
161161
}
162162
// TODO(jaredallard): Gitlab's auth system is awful, so job token
163163
// won't _just work_. We'll eventually need to support it.
164-
req.Header.Set("PRIVATE-TOKEN", token.Value)
164+
req.Header.Set("PRIVATE-TOKEN", t.Value)
165165

166166
resp, err := http.DefaultClient.Do(req)
167167
if err != nil {
168168
return nil, nil,
169-
fmt.Errorf("failed to download asset %s from release %s@%s: %w", rl.Name, friendlyRepo, opts.Tag, err)
169+
fmt.Errorf("failed to download asset %s from release %s@%s: %w", rl.Name, friendlyRepo, opt.Tag, err)
170170
}
171171
return resp.Body, assetToFileInfo(rl), nil
172172
}

‎releases/releases.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,31 @@ func Fetch(ctx context.Context, opts *FetchOptions) (io.ReadCloser, fs.FileInfo,
8787
}
8888

8989
// GetReleaseNotes fetches the release notes of a release from a VCS provider.
90-
func GetReleaseNotes(ctx context.Context, opts *GetReleaseNoteOptions) (string, error) {
91-
if opts == nil {
90+
func GetReleaseNotes(ctx context.Context, opt *GetReleaseNoteOptions) (string, error) {
91+
if opt == nil {
9292
return "", fmt.Errorf("opts is nil")
9393
}
9494

95-
if opts.RepoURL == "" {
95+
if opt.RepoURL == "" {
9696
return "", fmt.Errorf("repo url is required")
9797
}
9898

99-
if opts.Tag == "" {
99+
if opt.Tag == "" {
100100
return "", fmt.Errorf("tag is required")
101101
}
102102

103-
vcsp, err := vcs.ProviderFromURL(opts.RepoURL, opts.Overrides)
103+
vcsp, err := vcs.ProviderFromURL(opt.RepoURL, opt.Overrides)
104104
if err != nil {
105105
return "", fmt.Errorf("failed to get VCS provider from URL: %w", err)
106106
}
107107

108-
token, err := token.Fetch(ctx, vcsp, true)
108+
t, err := token.Fetch(ctx, vcsp, true)
109109
if err != nil {
110110
return "", fmt.Errorf("failed to fetch token: %w", err)
111111
}
112112

113113
if fetcher, ok := fetchers[vcsp]; ok {
114-
return fetcher.GetReleaseNotes(ctx, token, opts)
114+
return fetcher.GetReleaseNotes(ctx, t, opt)
115115
}
116116

117117
return "", fmt.Errorf("unknown VCS provider %s", vcsp)

‎token/token.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ func Fetch(_ context.Context, vcsp vcs.Provider, allowUnauthenticated bool) (*sh
6767
}
6868

6969
var token *shared.Token
70-
errors := []error{}
70+
errs := []error{}
7171
for _, p := range defaultProviders[vcsp] {
7272
var err error
7373

7474
token, err = p.Token()
7575
if err != nil {
76-
errors = append(errors, err)
76+
errs = append(errs, err)
7777
continue
7878
}
7979

@@ -87,7 +87,7 @@ func Fetch(_ context.Context, vcsp vcs.Provider, allowUnauthenticated bool) (*sh
8787
return &shared.Token{}, nil
8888
}
8989

90-
return nil, ErrNoToken(errors)
90+
return nil, ErrNoToken(errs)
9191
}
9292
return token, nil
9393
}

0 commit comments

Comments
 (0)