From 98e4b04ec5999b5b9d6de0dfde741f1673850216 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 15 Oct 2024 16:20:24 -0700 Subject: [PATCH] Fix caps --- cmd/spiffe-helper/config/config.go | 4 ++-- pkg/sidecar/config.go | 2 +- pkg/sidecar/sidecar.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/spiffe-helper/config/config.go b/cmd/spiffe-helper/config/config.go index 29aa14a9..c8b1c34e 100644 --- a/cmd/spiffe-helper/config/config.go +++ b/cmd/spiffe-helper/config/config.go @@ -26,7 +26,7 @@ type Config struct { AgentAddressDeprecated string `hcl:"agentAddress"` Cmd string `hcl:"cmd"` CmdArgs string `hcl:"cmd_args"` - PidFileName string `hcl:"pid_file_name"` + PIDFileName string `hcl:"pid_file_name"` CmdArgsDeprecated string `hcl:"cmdArgs"` CertDir string `hcl:"cert_dir"` CertDirDeprecated string `hcl:"certDir"` @@ -204,7 +204,7 @@ func NewSidecarConfig(config *Config, log logrus.FieldLogger) *sidecar.Config { AgentAddress: config.AgentAddress, Cmd: config.Cmd, CmdArgs: config.CmdArgs, - PidFileName: config.PidFileName, + PIDFileName: config.PIDFileName, CertDir: config.CertDir, CertFileMode: fs.FileMode(config.CertFileMode), //nolint:gosec,G115 KeyFileMode: fs.FileMode(config.KeyFileMode), //nolint:gosec,G115 diff --git a/pkg/sidecar/config.go b/pkg/sidecar/config.go index 1000716b..8bb2c980 100644 --- a/pkg/sidecar/config.go +++ b/pkg/sidecar/config.go @@ -21,7 +21,7 @@ type Config struct { CmdArgs string // Signal external process via PID file - PidFileName string + PIDFileName string // The directory name to store the x509s and/or JWTs. CertDir string diff --git a/pkg/sidecar/sidecar.go b/pkg/sidecar/sidecar.go index 1159cfdc..c04ca6ef 100644 --- a/pkg/sidecar/sidecar.go +++ b/pkg/sidecar/sidecar.go @@ -185,14 +185,14 @@ func (s *Sidecar) updateCertificates(svidResponse *workloadapi.X509Context) { // signalProcess sends the configured Renew signal to the process running the proxy // to reload itself so that the proxy uses the new SVID func (s *Sidecar) signalProcess() (err error) { - if s.config.PidFileName != "" { - byts, err := os.ReadFile(s.config.PidFileName) + if s.config.PIDFileName != "" { + byts, err := os.ReadFile(s.config.PIDFileName) if err != nil { - return fmt.Errorf("failed to read pid file: %s\n%w", s.config.PidFileName, err) + return fmt.Errorf("failed to read pid file: %s\n%w", s.config.PIDFileName, err) } pid, err := strconv.Atoi(string(bytes.TrimSpace(byts))) if err != nil { - return fmt.Errorf("failed to parse pid file: %s\n%w", s.config.PidFileName, err) + return fmt.Errorf("failed to parse pid file: %s\n%w", s.config.PIDFileName, err) } s.process, err = os.FindProcess(pid) if err != nil {