Skip to content

Commit 1938eb7

Browse files
authored
ci: fix linting issues from staticheck (#117)
1 parent 80b3352 commit 1938eb7

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

cmd/bundle/verify/display.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ func displayAttestationMetadata(vr *verify.VerificationResult) string {
163163
}
164164

165165
// Build output
166-
sb.WriteString(fmt.Sprintf(" - Build repo:..... %s\n", buildRepo))
167-
sb.WriteString(fmt.Sprintf(" - Build workflow:. %s\n", buildWorkflow))
168-
sb.WriteString(fmt.Sprintf(" - Git commit:..... %s\n", gitCommit))
169-
sb.WriteString(fmt.Sprintf(" - Signer repo:.... %s\n", signerRepo))
170-
sb.WriteString(fmt.Sprintf(" - Signer workflow: %s\n", signerWorkflow))
166+
fmt.Fprintf(&sb, " - Build repo:..... %s\n", buildRepo)
167+
fmt.Fprintf(&sb, " - Build workflow:. %s\n", buildWorkflow)
168+
fmt.Fprintf(&sb, " - Git commit:..... %s\n", gitCommit)
169+
fmt.Fprintf(&sb, " - Signer repo:.... %s\n", signerRepo)
170+
fmt.Fprintf(&sb, " - Signer workflow: %s\n", signerWorkflow)
171171
if rekorTimestamp != "" {
172-
sb.WriteString(fmt.Sprintf(" - Rekor timestamp: %s\n", rekorTimestamp))
172+
fmt.Fprintf(&sb, " - Rekor timestamp: %s\n", rekorTimestamp)
173173
}
174174

175175
return sb.String()

internal/bundle/generator.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,16 @@ func buildCertificateHeader(cert *x509.Certificate, name string, vendorID string
234234

235235
var header strings.Builder
236236
header.WriteString("#\n")
237-
header.WriteString(fmt.Sprintf("# Certificate: %s\n", name))
238-
header.WriteString(fmt.Sprintf("# Owner: %s\n", vendorID))
237+
fmt.Fprintf(&header, "# Certificate: %s\n", name)
238+
fmt.Fprintf(&header, "# Owner: %s\n", vendorID)
239239
header.WriteString("#\n")
240-
header.WriteString(fmt.Sprintf("# Issuer: %s\n", cert.Issuer.String()))
241-
header.WriteString(fmt.Sprintf("# Serial Number: %d (%#x)\n", cert.SerialNumber, cert.SerialNumber))
242-
header.WriteString(fmt.Sprintf("# Subject: %s\n", cert.Subject.String()))
243-
header.WriteString(fmt.Sprintf("# Not Valid Before: %s\n", cert.NotBefore.Format("Mon Jan 02 15:04:05 2006")))
244-
header.WriteString(fmt.Sprintf("# Not Valid After : %s\n", cert.NotAfter.Format("Mon Jan 02 15:04:05 2006")))
245-
header.WriteString(fmt.Sprintf("# Fingerprint (SHA-256): %s\n", formatFingerprint(sha256Hash[:])))
246-
header.WriteString(fmt.Sprintf("# Fingerprint (SHA1): %s\n", formatFingerprint(sha1Hash[:])))
240+
fmt.Fprintf(&header, "# Issuer: %s\n", cert.Issuer.String())
241+
fmt.Fprintf(&header, "# Serial Number: %d (%#x)\n", cert.SerialNumber, cert.SerialNumber)
242+
fmt.Fprintf(&header, "# Subject: %s\n", cert.Subject.String())
243+
fmt.Fprintf(&header, "# Not Valid Before: %s\n", cert.NotBefore.Format("Mon Jan 02 15:04:05 2006"))
244+
fmt.Fprintf(&header, "# Not Valid After : %s\n", cert.NotAfter.Format("Mon Jan 02 15:04:05 2006"))
245+
fmt.Fprintf(&header, "# Fingerprint (SHA-256): %s\n", formatFingerprint(sha256Hash[:]))
246+
fmt.Fprintf(&header, "# Fingerprint (SHA1): %s\n", formatFingerprint(sha1Hash[:]))
247247

248248
return header.String()
249249
}
@@ -272,23 +272,23 @@ func buildBundleHeader(outputPath, date, commit string, bundleType BundleType) s
272272

273273
if outputPath != "" {
274274
filename := filepath.Base(outputPath)
275-
header.WriteString(fmt.Sprintf("## %s\n", filename))
275+
fmt.Fprintf(&header, "## %s\n", filename)
276276
} else {
277-
header.WriteString(fmt.Sprintf("## %s\n", bundleType.DefaultFilename()))
277+
fmt.Fprintf(&header, "## %s\n", bundleType.DefaultFilename())
278278
}
279279

280280
header.WriteString("##\n")
281281

282282
if date != "" {
283-
header.WriteString(fmt.Sprintf("## Date: %s\n", date))
283+
fmt.Fprintf(&header, "## Date: %s\n", date)
284284
}
285285
if commit != "" {
286-
header.WriteString(fmt.Sprintf("## Commit: %s\n", commit))
286+
fmt.Fprintf(&header, "## Commit: %s\n", commit)
287287
}
288288

289289
header.WriteString("##\n")
290290
header.WriteString("## This file has been auto-generated by tpmtb (TPM Trust Bundle)\n")
291-
header.WriteString(fmt.Sprintf("## and contains a list of verified %s.\n", bundleType.Description()))
291+
fmt.Fprintf(&header, "## and contains a list of verified %s.\n", bundleType.Description())
292292
header.WriteString("##\n")
293293
header.WriteString("\n")
294294
return header.String()

internal/config/sanity/sanity.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ type ValidationError struct {
2424

2525
func (e ValidationError) String() string {
2626
var b strings.Builder
27-
b.WriteString(fmt.Sprintf(" Vendor: %s (%s)\n", e.VendorName, e.VendorID))
28-
b.WriteString(fmt.Sprintf(" Certificate: %s\n", e.CertName))
29-
b.WriteString(fmt.Sprintf(" Error: %s\n", e.Error))
27+
fmt.Fprintf(&b, " Vendor: %s (%s)\n", e.VendorName, e.VendorID)
28+
fmt.Fprintf(&b, " Certificate: %s\n", e.CertName)
29+
fmt.Fprintf(&b, " Error: %s\n", e.Error)
3030
return b.String()
3131
}
3232

@@ -42,12 +42,12 @@ type ExpirationWarning struct {
4242

4343
func (w ExpirationWarning) String() string {
4444
var b strings.Builder
45-
b.WriteString(fmt.Sprintf(" Vendor: %s (%s)\n", w.VendorName, w.VendorID))
46-
b.WriteString(fmt.Sprintf(" Certificate: %s\n", w.CertName))
45+
fmt.Fprintf(&b, " Vendor: %s (%s)\n", w.VendorName, w.VendorID)
46+
fmt.Fprintf(&b, " Certificate: %s\n", w.CertName)
4747
if w.IsExpired {
48-
b.WriteString(fmt.Sprintf(" Status: Expired on %s\n", w.ExpiryDate.Format("2006-01-02")))
48+
fmt.Fprintf(&b, " Status: Expired on %s\n", w.ExpiryDate.Format("2006-01-02"))
4949
} else {
50-
b.WriteString(fmt.Sprintf(" Status: Expires in %d days (%s)\n", w.DaysLeft, w.ExpiryDate.Format("2006-01-02")))
50+
fmt.Fprintf(&b, " Status: Expires in %d days (%s)\n", w.DaysLeft, w.ExpiryDate.Format("2006-01-02"))
5151
}
5252
return b.String()
5353
}

0 commit comments

Comments
 (0)