Skip to content

Commit 1c8a3de

Browse files
committed
code cleanup
1 parent 5154b18 commit 1c8a3de

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/snclient/listen_web_admin.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (l *HandlerWebAdmin) ServeHTTP(res http.ResponseWriter, req *http.Request)
135135
case "/api/v1/admin/certs/replace":
136136
l.serveCertsReplace(res, req)
137137
case "/api/v1/admin/csr":
138-
l.serveCertsRequest(res, req)
138+
l.serveCertsCSR(res, req)
139139
case "/api/v1/admin/updates/install":
140140
l.serveUpdate(res, req)
141141
default:
@@ -144,7 +144,7 @@ func (l *HandlerWebAdmin) ServeHTTP(res http.ResponseWriter, req *http.Request)
144144
}
145145
}
146146

147-
func (l *HandlerWebAdmin) serveCertsRequest(res http.ResponseWriter, req *http.Request) {
147+
func (l *HandlerWebAdmin) serveCertsCSR(res http.ResponseWriter, req *http.Request) {
148148
if !l.requirePostMethod(res, req) {
149149
return
150150
}
@@ -239,7 +239,7 @@ func (l *HandlerWebAdmin) createCSR(data *csrRequestJSON, privateKey *rsa.Privat
239239
// create certificate signing request
240240
csrDER, err := x509.CreateCertificateRequest(rand.Reader, &csrTemplate, privateKey)
241241
if err != nil {
242-
return nil, fmt.Errorf("could not create x509 certificate erro was: %s", err.Error())
242+
return nil, fmt.Errorf("could not create x509 certificate error was: %s", err.Error())
243243
}
244244
// Marshall to pem format
245245
csrPEM := &pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csrDER}
@@ -254,12 +254,12 @@ func (l *HandlerWebAdmin) readPrivateKey() (*rsa.PrivateKey, error) {
254254
if !ok {
255255
return nil, fmt.Errorf("could not read certificate location from config")
256256
}
257-
pemdata, err := os.ReadFile(keyFile)
257+
pemData, err := os.ReadFile(keyFile)
258258
if err != nil {
259259
return nil, fmt.Errorf("could not read file: %s", err.Error())
260260
}
261261

262-
block, _ := pem.Decode(pemdata)
262+
block, _ := pem.Decode(pemData)
263263
if block.Type == "RSA PRIVATE KEY" {
264264
return x509.ParsePKCS1PrivateKey(block.Bytes) //nolint:wrapcheck // Error is checked in calling method to avoid double checking
265265
}

0 commit comments

Comments
 (0)