Skip to content

refactor: scion-pki preparation for golangci-lint v2 #4771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romshark merged 4 commits into from
May 15, 2025
Merged

refactor: scion-pki preparation for golangci-lint v2 #4771

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01ede50
refactor: fix QF1012
romshark May 15, 2025
759b7f2
refactor: fix errcheck unchecked errors
romshark May 15, 2025
ee9cd4a
refactor: fix QF1008 and use Fprintf
romshark May 15, 2025
9daa6ae
doc: fix outdated comment
romshark May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions scion-pki/certs/certformat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type formatBuffer struct {

// Writef writes a string formated using fmt.Sprintf.
Copy link
Contributor

@katyatitkova katyatitkova May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is outdated now

Copy link
Contributor Author

@romshark romshark May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, done!

func (b *formatBuffer) Writef(format string, args ...any) (int, error) {
return b.Buffer.WriteString(fmt.Sprintf(format, args...))
return fmt.Fprintf(b, format, args...)
}

type certificateShort struct {
Expand Down Expand Up @@ -93,33 +93,33 @@ func newCertificateShort(cert *x509.Certificate) *certificateShort {
// String returns the certificateShort formated as a string.
func (c *certificateShort) String() string {
var buf formatBuffer
buf.Writef("X.509v3 %s Certificate (%s) [Serial: %s]\n", c.Type, c.PublicKeyAlgorithm, c.SerialNumber)
_, _ = buf.Writef("X.509v3 %s Certificate (%s) [Serial: %s]\n", c.Type, c.PublicKeyAlgorithm, c.SerialNumber)
sans := c.SANs
if len(c.Subject) > 0 {
sans = append([]string{c.Subject}, sans...)
}
if len(sans) == 0 {
buf.Writef(" Subject: \n")
_, _ = buf.Writef(" Subject: \n")
} else {
for i, s := range sans {
if i == 0 {
buf.Writef(" Subject: %s\n", s)
_, _ = buf.Writef(" Subject: %s\n", s)
} else {
buf.Writef(" %s\n", s)
_, _ = buf.Writef(" %s\n", s)
}
}
}
buf.Writef(" Issuer: %s\n", c.Issuer)
_, _ = buf.Writef(" Issuer: %s\n", c.Issuer)
if c.Provisioner != nil {
if len(c.Provisioner.ID) == 0 {
buf.Writef(" Provisioner: %s\n", c.Provisioner.Name)
_, _ = buf.Writef(" Provisioner: %s\n", c.Provisioner.Name)
} else {
buf.Writef(" Provisioner: %s [ID: %s]\n", c.Provisioner.Name, c.Provisioner.ID)
_, _ = buf.Writef(" Provisioner: %s [ID: %s]\n", c.Provisioner.Name, c.Provisioner.ID)
}

}
buf.Writef(" Valid from: %s\n", c.NotBefore.Format(time.RFC3339))
buf.Writef(" to: %s\n", c.NotAfter.Format(time.RFC3339))
_, _ = buf.Writef(" Valid from: %s\n", c.NotBefore.Format(time.RFC3339))
_, _ = buf.Writef(" to: %s\n", c.NotAfter.Format(time.RFC3339))
return buf.String()
}

Expand All @@ -140,19 +140,19 @@ func newCertificateRequestShort(cr *x509.CertificateRequest) *certificateRequest
// String returns the certificateShort formated as a string.
func (c *certificateRequestShort) String() string {
var buf formatBuffer
buf.Writef("X.509v3 Certificate Signing Request (%s)\n", c.PublicKeyAlgorithm)
_, _ = buf.Writef("X.509v3 Certificate Signing Request (%s)\n", c.PublicKeyAlgorithm)
sans := c.SANs
if len(c.Subject) > 0 {
sans = append([]string{c.Subject}, sans...)
}
if len(sans) == 0 {
buf.Writef(" Subject: \n")
_, _ = buf.Writef(" Subject: \n")
} else {
for i, s := range sans {
if i == 0 {
buf.Writef(" Subject: %s\n", s)
_, _ = buf.Writef(" Subject: %s\n", s)
} else {
buf.Writef(" %s\n", s)
_, _ = buf.Writef(" %s\n", s)
}
}
}
Expand Down
Loading
Loading