Skip to content

Commit 12abc75

Browse files
author
Vincent Hou
committed
Fixed the linting issues
1 parent a91daac commit 12abc75

15 files changed

Lines changed: 82 additions & 86 deletions

File tree

cmd/fetcher/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func ensureRepo(ctx context.Context, known map[string][]packages.Release, client
122122
}
123123
if src.GitHub != (packages.GitHubSource{}) {
124124
if client == nil {
125-
return fmt.Errorf("must set $GITHUB_TOKEN to use github sources.")
125+
return fmt.Errorf("must set $GITHUB_TOKEN to use github sources")
126126
}
127127
owner, repo := src.OrgRepo()
128128
releases, err := github.GetReleases(ctx, client, owner, repo)
@@ -140,5 +140,5 @@ func ensureRepo(ctx context.Context, known map[string][]packages.Release, client
140140
known[src.String()] = releases
141141
return nil
142142
}
143-
return errors.New("Must specify one of S3 or GitHub")
143+
return errors.New("must specify one of S3 or GitHub")
144144
}

pkg/blob/fetchers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func GetReleases(ctx context.Context, client *http.Client, cfg packages.S3Source
7979
commonRepo = fields[0]
8080
}
8181
if fields[0] != commonRepo {
82-
return nil, fmt.Errorf("Multiple repos listed in a single release source (%q and %q) in %s", fields[0], commonRepo, cfg)
82+
return nil, fmt.Errorf("multiple repos listed in a single release source (%q and %q) in %s", fields[0], commonRepo, cfg)
8383
}
8484
rk := releaseKey{
8585
repo: fields[0],

pkg/github/fetchers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func GetReleases(ctx context.Context, client *github.Client, org string, repo st
3434
releases, resp, err := client.Repositories.ListReleases(ctx, org, repo, opt)
3535
if err != nil || resp.StatusCode != 200 {
3636
if err == nil {
37-
err = fmt.Errorf("Got HTTP %d: %s", resp.StatusCode, resp.Status)
37+
err = fmt.Errorf("got HTTP %d: %s", resp.StatusCode, resp.Status)
3838
}
3939
return nil, err
4040
}

pkg/packages/release.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@ func handlePrimary(ctx context.Context, base string, client *http.Client, p Pack
214214
fileName := fmt.Sprintf("%d-%s", i+1, asset.Name)
215215
file, err := os.OpenFile(filepath.Join(path, fileName), os.O_CREATE|os.O_WRONLY, 0644)
216216
if err != nil {
217-
return fmt.Errorf("Unable to open %s: %w", fileName, err)
217+
return fmt.Errorf("unable to open %s: %w", fileName, err)
218218
}
219219
defer file.Close()
220220
log.Print(asset.URL)
221221
fetch, err := client.Get(asset.URL)
222222
if err != nil {
223-
return fmt.Errorf("Unable to fetch %s: %w", asset.URL, err)
223+
return fmt.Errorf("unable to fetch %s: %w", asset.URL, err)
224224
}
225225
defer fetch.Body.Close()
226226
_, err = io.Copy(file, fetch.Body)
227227
if err != nil {
228-
return fmt.Errorf("Unable to write to %s: %w", fileName, err)
228+
return fmt.Errorf("unable to write to %s: %w", fileName, err)
229229
}
230230
}
231231
return nil
@@ -269,18 +269,18 @@ func handleAlternatives(ctx context.Context, base string, client *http.Client, p
269269
fileName := filepath.Join(resourcePath, a.Name)
270270
file, err := os.OpenFile(fileName, os.O_CREATE|os.O_WRONLY, 0644)
271271
if err != nil {
272-
return fmt.Errorf("Unable to open %s: %w", fileName, err)
272+
return fmt.Errorf("unable to open %s: %w", fileName, err)
273273
}
274274
defer file.Close()
275275
log.Print(a.URL)
276276
fetch, err := client.Get(a.URL)
277277
if err != nil {
278-
return fmt.Errorf("Unable to fetch %s: %w", a.URL, err)
278+
return fmt.Errorf("unable to fetch %s: %w", a.URL, err)
279279
}
280280
defer fetch.Body.Close()
281281
_, err = io.Copy(file, fetch.Body)
282282
if err != nil {
283-
return fmt.Errorf("Unable to write to %s: %w", fileName, err)
283+
return fmt.Errorf("unable to write to %s: %w", fileName, err)
284284
}
285285
}
286286
}

pkg/packages/release_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func Test_assetList_FilterAssets(t *testing.T) {
185185
{
186186
name: "Rename bad",
187187
f: func(s string) string {
188-
return strings.Replace(s, "bad", "okay", -1)
188+
return strings.ReplaceAll(s, "bad", "okay")
189189
},
190190
want: []Asset{
191191
{Name: "test.yaml"},

pkg/reconciler/common/releases.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ func IsVersionValidMigrationEligible(instance base.KComponent) error {
115115
}
116116
target := SanitizeSemver(targetVersion)
117117
if !semver.IsValid(target) {
118-
return fmt.Errorf("target version %v is not in a valid semantic versioning format.", target)
118+
return fmt.Errorf("target version %v is not in a valid semantic versioning format", target)
119119
}
120120

121121
if len(strings.Split(target, ".")) < 2 {
122-
return fmt.Errorf("target version %v should at least include the major and minor numbers.", target)
122+
return fmt.Errorf("target version %v should at least include the major and minor numbers", target)
123123
}
124124

125125
current := instance.GetStatus().GetVersion()
@@ -135,11 +135,11 @@ func IsVersionValidMigrationEligible(instance base.KComponent) error {
135135

136136
currentMinor, err := strconv.Atoi(strings.Split(current, ".")[1])
137137
if err != nil {
138-
return fmt.Errorf("minor number of the current version %v should be an integer.", current)
138+
return fmt.Errorf("minor number of the current version %v should be an integer", current)
139139
}
140140
targetMinor, err := strconv.Atoi(strings.Split(target, ".")[1])
141141
if err != nil {
142-
return fmt.Errorf("minor number of the target version %v should be an integer.", target)
142+
return fmt.Errorf("minor number of the target version %v should be an integer", target)
143143
}
144144

145145
if currentMajor != targetMajor {
@@ -157,7 +157,7 @@ func IsVersionValidMigrationEligible(instance base.KComponent) error {
157157
}
158158

159159
return fmt.Errorf("not supported to upgrade or downgrade across the MAJOR version. The "+
160-
"installed KnativeServing version is %v.", current)
160+
"installed KnativeServing version is %v", current)
161161
}
162162

163163
// If the diff between minor versions are less than 2, return nil.
@@ -166,7 +166,7 @@ func IsVersionValidMigrationEligible(instance base.KComponent) error {
166166
}
167167

168168
return fmt.Errorf("not supported to upgrade or downgrade across multiple MINOR versions. The "+
169-
"installed KnativeServing version is %v.", current)
169+
"installed KnativeServing version is %v", current)
170170
}
171171

172172
type manifestFetcher func(string) (mf.Manifest, error)

pkg/reconciler/common/workload_override.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
appsv1 "k8s.io/api/apps/v1"
2323
batchv1 "k8s.io/api/batch/v1"
2424
corev1 "k8s.io/api/core/v1"
25-
v1 "k8s.io/api/core/v1"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2827
"k8s.io/client-go/kubernetes/scheme"
@@ -187,15 +186,15 @@ func replaceProbes(override *base.WorkloadOverride, ps *corev1.PodTemplateSpec)
187186
for i := range containers {
188187
override := findProbeOverride(override.ReadinessProbes, containers[i].Name)
189188
if override != nil {
190-
overrideProbe := &v1.Probe{
189+
overrideProbe := &corev1.Probe{
191190
InitialDelaySeconds: override.InitialDelaySeconds,
192191
TimeoutSeconds: override.TimeoutSeconds,
193192
PeriodSeconds: override.PeriodSeconds,
194193
SuccessThreshold: override.SuccessThreshold,
195194
FailureThreshold: override.FailureThreshold,
196195
TerminationGracePeriodSeconds: override.TerminationGracePeriodSeconds,
197196
}
198-
if *overrideProbe == (v1.Probe{}) {
197+
if *overrideProbe == (corev1.Probe{}) {
199198
// Disable probe when users explicitly set the empty overrideProbe.
200199
containers[i].ReadinessProbe = nil
201200
continue
@@ -213,15 +212,15 @@ func replaceProbes(override *base.WorkloadOverride, ps *corev1.PodTemplateSpec)
213212
containers := ps.Spec.Containers
214213
for i := range containers {
215214
if override := findProbeOverride(override.LivenessProbes, containers[i].Name); override != nil {
216-
overrideProbe := &v1.Probe{
215+
overrideProbe := &corev1.Probe{
217216
InitialDelaySeconds: override.InitialDelaySeconds,
218217
TimeoutSeconds: override.TimeoutSeconds,
219218
PeriodSeconds: override.PeriodSeconds,
220219
SuccessThreshold: override.SuccessThreshold,
221220
FailureThreshold: override.FailureThreshold,
222221
TerminationGracePeriodSeconds: override.TerminationGracePeriodSeconds,
223222
}
224-
if *overrideProbe == (v1.Probe{}) {
223+
if *overrideProbe == (corev1.Probe{}) {
225224
// Disable probe when users explicitly set the empty overrideProbe.
226225
containers[i].LivenessProbe = nil
227226
continue

0 commit comments

Comments
 (0)