Skip to content

Commit

Permalink
pki health-check fails to read in int config values (#19265)
Browse files Browse the repository at this point in the history
* pki health-check fails to read in int config values

 - Go's default behavior when decoding numbers to an interface{} is to use a float64 type which parseutil.SafeParseIntRange does not handle.
 - Switch to having the JSON decoder use json.Number which our parseutil library
  properly handles.

* Add cl
  • Loading branch information
stevendpclark authored Feb 21, 2023
1 parent d189ebf commit 4ea5c58
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions changelog/19265.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
cli/pki: Decode integer values properly in health-check configuration file
```
7 changes: 5 additions & 2 deletions command/pki_health_check.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,16 @@ func (c *PKIHealthCheckCommand) Run(args []string) int {
// Handle config merging.
external_config := map[string]interface{}{}
if c.flagConfig != "" {
contents, err := os.ReadFile(c.flagConfig)
contents, err := os.Open(c.flagConfig)
if err != nil {
c.UI.Error(fmt.Sprintf("Failed to read configuration file %v: %v", c.flagConfig, err))
return pkiRetUsage
}

if err := json.Unmarshal(contents, &external_config); err != nil {
decoder := json.NewDecoder(contents)
decoder.UseNumber() // Use json.Number instead of float64 values as we are decoding to an interface{}.

if err := decoder.Decode(&external_config); err != nil {
c.UI.Error(fmt.Sprintf("Failed to parse configuration file %v: %v", c.flagConfig, err))
return pkiRetUsage
}
Expand Down

0 comments on commit 4ea5c58

Please sign in to comment.