Skip to content

Commit f6d499e

Browse files
selzocxtreme-nitin-ravindran
authored andcommitted
Fix lint errors
Fixes the following errors: cmd/certificate_info_table.go:29:40: printf: non-constant format string in call to (*github.com/fatih/color.Color).Sprintf (govet) Title: color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION")), ^ cmd/certificate_info_table_test.go:33:66: printf: non-constant format string in call to (*github.com/fatih/color.Color).Sprintf (govet) Expect(ui.Table.Title).To(Equal(color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION")))) ^ cmd/environment_test.go:181:43: printf: non-constant format string in call to (*github.com/fatih/color.Color).Sprintf (govet) Title: color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION")), ^ deployment/vm/vm.go:27:1: SA9009: ineffectual compiler directive due to extraneous space: "// go:generate counterfeiter . VM" (staticcheck) // go:generate counterfeiter . VM ^ director/config_diff.go:51:34: printf: non-constant format string in call to github.com/cloudfoundry/bosh-utils/errors.Errorf (govet) return resp, bosherr.Errorf(errorDescription[1]) ^ director/config_diff.go:53:34: printf: non-constant format string in call to github.com/cloudfoundry/bosh-utils/errors.Errorf (govet) return resp, bosherr.Errorf(err.Error()) ^ ssh/host.go:66:6: S1009: should omit nil check; len() for []string is defined as zero (gosimple) if targetVM.IPs == nil || len(targetVM.IPs) == 0 { ^ ui/table/writer.go:140:32: printf: non-constant format string in call to fmt.Fprintf (govet) _, err := fmt.Fprintf(w.w, w.borderStr) ^ ui/table/writer.go:145:32: printf: non-constant format string in call to fmt.Fprintf (govet) _, err := fmt.Fprintf(w.w, strings.Repeat(w.bgStr, paddingSize)+w.borderStr) Signed-off-by: Nitin Ravindran <nitin.ravindran@broadcom.com>
1 parent 73b4202 commit f6d499e

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

cmd/certificate_info_table.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (t CertificateInfoTable) Print() {
2626
}
2727

2828
table := boshtbl.Table{
29-
Title: color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION")),
29+
Title: color.New(color.Bold, color.FgYellow).Sprint("CERTIFICATE EXPIRY DATE INFORMATION"),
3030
Header: []boshtbl.Header{
3131
boshtbl.NewHeader("Certificate"),
3232
boshtbl.NewHeader("Expiry Date (UTC)"),

cmd/certificate_info_table_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = Describe("CertificateInfoTable", func() {
3030

3131
cmd.CertificateInfoTable{Certificates: certsInfo, UI: ui}.Print()
3232

33-
Expect(ui.Table.Title).To(Equal(color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION"))))
33+
Expect(ui.Table.Title).To(Equal(color.New(color.Bold, color.FgYellow).Sprint("CERTIFICATE EXPIRY DATE INFORMATION")))
3434
Expect(ui.Table.Header).To(Equal([]boshtbl.Header{
3535
boshtbl.NewHeader("Certificate"),
3636
boshtbl.NewHeader("Expiry Date (UTC)"),

cmd/environment_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ var _ = Describe("EnvironmentCmd", func() {
178178
err := act()
179179
Expect(err).ToNot(HaveOccurred())
180180
Expect(ui.Table).To(Equal(boshtbl.Table{
181-
Title: color.New(color.Bold).Sprintf(color.YellowString("CERTIFICATE EXPIRY DATE INFORMATION")),
181+
Title: color.New(color.Bold, color.FgYellow).Sprint("CERTIFICATE EXPIRY DATE INFORMATION"),
182182
Header: []boshtbl.Header{
183183
boshtbl.NewHeader("Certificate"),
184184
boshtbl.NewHeader("Expiry Date (UTC)"),

deployment/vm/vm.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ type Clock interface {
2424
Now() time.Time
2525
}
2626

27-
// go:generate counterfeiter . VM
27+
// You only need **one** of these per package!
28+
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
2829

2930
type VM interface {
3031
CID() string

director/config_diff.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func (c Client) postConfigDiff(path string, manifest []byte, setHeaders func(*ht
4848
var descriptionExp = regexp.MustCompile(`description":"(.+?)"`)
4949
errorDescription := descriptionExp.FindStringSubmatch(err.Error())
5050
if len(errorDescription) > 0 {
51-
return resp, bosherr.Errorf(errorDescription[1])
51+
return resp, bosherr.Error(errorDescription[1])
5252
} else {
53-
return resp, bosherr.Errorf(err.Error())
53+
return resp, bosherr.Error(err.Error())
5454
}
5555
} else {
5656
// endpoint couldn't be found => return empty diff, just for compatibility with directors which don't have the endpoint

ssh/host.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (h *hostBuilder) BuildHost(slug boshdir.AllOrInstanceGroupOrInstanceSlug, u
6363
if targetVM.JobName == "" {
6464
return boshdir.Host{}, bosherr.Errorf("Instance %s has no active VM", slug)
6565
}
66-
if targetVM.IPs == nil || len(targetVM.IPs) == 0 {
66+
if len(targetVM.IPs) == 0 {
6767
return boshdir.Host{}, bosherr.Errorf("VM %s has no IP address", targetVM.VMID)
6868
}
6969
targetHost = targetVM.IPs[0]

ui/table/writer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ func (w *Writer) Flush() error {
137137

138138
paddingSize := w.widths[colIdx] - len(col.String)
139139
if colIdx == lastColIdx {
140-
_, err := fmt.Fprintf(w.w, w.borderStr)
140+
_, err := fmt.Fprint(w.w, w.borderStr)
141141
if err != nil {
142142
return err
143143
}
144144
} else {
145-
_, err := fmt.Fprintf(w.w, strings.Repeat(w.bgStr, paddingSize)+w.borderStr)
145+
_, err := fmt.Fprint(w.w, strings.Repeat(w.bgStr, paddingSize)+w.borderStr)
146146
if err != nil {
147147
return err
148148
}

0 commit comments

Comments
 (0)