Skip to content

Commit 429ad7f

Browse files
Extract remaining hardcoded values across PKI and cmd packages
PKI package: - Add error message constants for CA certificate parsing errors - Replace hardcoded error strings with named constants (errParseCACert, errParseCAKey, errUnexpectedKeyType) - Improve error handling consistency in certificate authority operations Authz cmd package: - Add default URL constants for service endpoints (defaultOPAURL, defaultInventoryURL) - Add default port constants (defaultAuthzPort, defaultGRPCPort) - Replace hardcoded service URLs with named constants - Improve configuration maintainability and consistency This addresses remaining goconst linter issues by extracting the last major hardcoded values into appropriately named constants. Co-authored-by: Amp <[email protected]> Amp-Thread-ID: https://ampcode.com/threads/T-5be4213f-26eb-400c-bb7b-d4c79b7ee6fe
1 parent 89268b4 commit 429ad7f

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

cmd/authz/main.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import (
1313
)
1414

1515
const (
16-
emptyString = ""
16+
emptyString = ""
17+
defaultAuthzPort = ":8443"
18+
defaultGRPCPort = ":8444"
19+
defaultOPAURL = "http://opa:8181"
20+
defaultInventoryURL = "http://inventory:8080"
1721
)
1822

1923
func main() {
@@ -27,8 +31,8 @@ func main() {
2731
// Load TLS configuration from secrets
2832
tlsConfig := secretHelper.LoadTLSConfig("AUTHZ")
2933

30-
addr := getenv("AUTHZ_LISTEN_ADDR", ":8443")
31-
grpcAddr := getenv("AUTHZ_GRPC_ADDR", ":8444")
34+
addr := getenv("AUTHZ_LISTEN_ADDR", defaultAuthzPort)
35+
grpcAddr := getenv("AUTHZ_GRPC_ADDR", defaultGRPCPort)
3236
certFile := secretHelper.GetOrDefault("AUTHZ_CERT_FILE", tlsConfig["AUTHZ_TLS_CERT"])
3337
rootCAPath := secretHelper.GetOrDefault("AUTHZ_ROOT_CA_CERT", "/data/certs/keep-root.pem")
3438
rootCAKeyPath := secretHelper.GetOrDefault("AUTHZ_ROOT_CA_KEY", "/data/certs/keep-root-key.pem")
@@ -45,8 +49,8 @@ func main() {
4549
TLSKeyPath: rootCAKeyPath,
4650
RootCAPath: rootCAPath,
4751
GoogleClientID: googleClientID,
48-
OPAURL: getenv("OPA_URL", "http://opa:8181"),
49-
InventoryAPI: getenv("INVENTORY_API", "http://inventory:8080"),
52+
OPAURL: getenv("OPA_URL", defaultOPAURL),
53+
InventoryAPI: getenv("INVENTORY_API", defaultInventoryURL),
5054
InventoryClientCert: secretHelper.GetOrDefault("AUTHZ_CLIENT_CERT", tlsConfig["AUTHZ_CLIENT_CERT"]),
5155
InventoryClientKey: secretHelper.GetOrDefault("AUTHZ_CLIENT_KEY", tlsConfig["AUTHZ_CLIENT_KEY"]),
5256
InventoryCA: secretHelper.GetOrDefault("AUTHZ_CA_CERT", tlsConfig["AUTHZ_CLIENT_CA"]),

pkg/pki/ca.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ const (
2727
maxSerialShift = 128
2828
initialCapacity = 0
2929
bigIntOne = 1
30+
31+
// Error messages
32+
errParseCACert = "failed to parse CA certificate PEM"
33+
errParseCAKey = "failed to parse CA key PEM"
34+
errUnexpectedKeyType = "unexpected CA private key type"
3035
)
3136

3237
// validatePath ensures the path is safe from directory traversal attacks
@@ -144,7 +149,7 @@ func LoadCA(certPath, keyPath string) (*CertificateAuthority, error) {
144149

145150
certBlock, _ := pem.Decode(certPEM)
146151
if certBlock == nil {
147-
return nil, errors.New("failed to parse CA certificate PEM")
152+
return nil, errors.New(errParseCACert)
148153
}
149154
cert, err := x509.ParseCertificate(certBlock.Bytes)
150155
if err != nil {
@@ -153,7 +158,7 @@ func LoadCA(certPath, keyPath string) (*CertificateAuthority, error) {
153158

154159
keyBlock, _ := pem.Decode(keyPEM)
155160
if keyBlock == nil {
156-
return nil, errors.New("failed to parse CA key PEM")
161+
return nil, errors.New(errParseCAKey)
157162
}
158163

159164
keyAny, err := x509.ParsePKCS8PrivateKey(keyBlock.Bytes)
@@ -162,7 +167,7 @@ func LoadCA(certPath, keyPath string) (*CertificateAuthority, error) {
162167
}
163168
priv, ok := keyAny.(*ecdsa.PrivateKey)
164169
if !ok {
165-
return nil, errors.New("unexpected CA private key type")
170+
return nil, errors.New(errUnexpectedKeyType)
166171
}
167172

168173
return &CertificateAuthority{cert: cert, key: priv, certPath: certPath, keyPath: keyPath}, nil

0 commit comments

Comments
 (0)