backport of commit 4ea5c58

hashicorp · Feb 21, 2023 · ce46a92 · ce46a92
1 parent e53ac26
commit ce46a92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/changelog/19265.txt b/changelog/19265.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli/pki: Decode integer values properly in health-check configuration file
+```
diff --git a/command/pki_health_check.go b/command/pki_health_check.go
@@ -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
 		}