From 0b7aa8b64b8d6d16b1283973c2057c5829ed2e28 Mon Sep 17 00:00:00 2001
From: Ryan Thorn <rthorn@newrelic.com>
Date: Tue, 18 Apr 2023 13:17:59 -0700
Subject: [PATCH] chore(install): Extract mergeStringJSON, test

---
 .../execution/go_task_recipe_executor.go      | 20 ++++--
 .../execution/go_task_recipe_executor_test.go | 68 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/internal/install/execution/go_task_recipe_executor.go b/internal/install/execution/go_task_recipe_executor.go
index 294251307..ccb6be99f 100644
--- a/internal/install/execution/go_task_recipe_executor.go
+++ b/internal/install/execution/go_task_recipe_executor.go
@@ -195,12 +195,8 @@ func (re *GoTaskRecipeExecutor) setOutput(outputFileName string) {
 	for s.Scan() {
 		bs := s.Bytes()
 		if json.Valid(bs) {
-			var jsonFromString map[string]interface{}
-			if err = json.Unmarshal(bs, &jsonFromString); err != nil {
-				log.Debugf("error unmarshaling JSON output: %s", err.Error())
-			}
-			if err = mergo.Merge(&output, jsonFromString, mergo.WithOverride); err != nil {
-				log.Debugf("error merging JSON output: %s", err.Error())
+			if err = mergeStringJSON(&output, bs); err != nil {
+				log.Debug(err.Error())
 			}
 		} else {
 			log.Debugf("Invalid JSON string found in output file, skipping: %s", s.Text())
@@ -213,6 +209,18 @@ func (re *GoTaskRecipeExecutor) setOutput(outputFileName string) {
 	re.Output = NewOutputParser(output)
 }
 
+func mergeStringJSON(output *map[string]interface{}, bs []byte) error {
+	var jsonFromString map[string]interface{}
+	var err error
+	if err = json.Unmarshal(bs, &jsonFromString); err != nil {
+		return fmt.Errorf("error unmarshaling JSON output: %w", err)
+	}
+	if err = mergo.Merge(output, jsonFromString, mergo.WithOverride); err != nil {
+		return fmt.Errorf("error merging JSON output: %w", err)
+	}
+	return nil
+}
+
 func (re *GoTaskRecipeExecutor) GetOutput() *OutputParser {
 	return re.Output
 }
diff --git a/internal/install/execution/go_task_recipe_executor_test.go b/internal/install/execution/go_task_recipe_executor_test.go
index d64cf454c..fdce616d3 100644
--- a/internal/install/execution/go_task_recipe_executor_test.go
+++ b/internal/install/execution/go_task_recipe_executor_test.go
@@ -9,11 +9,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/newrelic/newrelic-cli/internal/install/types"
 	"github.com/stretchr/testify/assert"
-
 	"github.com/stretchr/testify/require"
-
-	"github.com/newrelic/newrelic-cli/internal/install/types"
 )
 
 func TestExecute_SystemVariableInterpolation(t *testing.T) {
@@ -486,3 +484,67 @@ tasks:
 	assert.Empty(t, e.GetOutput().Metadata()["something"])
 	assert.Equal(t, "very", e.GetOutput().Metadata()["clean"])
 }
+
+func Test_mergeStringJSON(t *testing.T) {
+	type args struct {
+		output *map[string]interface{}
+		bs     []byte
+	}
+	outputNewMap := map[string]interface{}{}
+	argsNewMap := args{
+		output: &outputNewMap,
+		bs:     []byte("{\"Metadata\":{\"some\":\"thing\"}}\n"),
+	}
+	outputExistingMap := map[string]interface{}{
+		"Metadata": map[string]interface{}{"some": "thing"},
+	}
+	argsExistingMap := args{
+		output: &outputExistingMap,
+		bs:     []byte("{\"Metadata\":{\"another\":\"thing\"}}\n"),
+	}
+	outputInvalidJson := map[string]interface{}{}
+	argsInvalidJson := args{
+		output: &outputInvalidJson,
+		bs:     []byte("Invalid JSON"),
+	}
+	outputEmptyString := map[string]interface{}{}
+	argsEmptyString := args{
+		output: &outputEmptyString,
+		bs:     []byte(""),
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+		wantLen int
+	}{
+		{"new map", argsNewMap, false, 1},
+		{"existing map", argsExistingMap, false, 2},
+		{"invalid JSON", argsInvalidJson, true, 0},
+		{"empty string", argsEmptyString, true, 0},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := mergeStringJSON(tt.args.output, tt.args.bs); (err != nil) != tt.wantErr {
+				t.Errorf("mergeStringJSON() error = %v, wantErr %v", err, tt.wantErr)
+			}
+			output := *tt.args.output
+			if output == nil {
+				t.Errorf("expected output map, got nil")
+			}
+			if tt.wantLen == 0 {
+				if len(output) > 0 {
+					t.Errorf("unexpected number of results -- expected 0, got %d", len(output))
+				}
+			} else {
+				metadata := output["Metadata"].(map[string]interface{})
+				if metadata == nil {
+					t.Errorf("expected 'Metadata' field in output map, got nil")
+				}
+				if len(metadata) != tt.wantLen {
+					t.Errorf("unexpected number of results -- expected %d, got %d\n results: %v", tt.wantLen, len(metadata), tt.args.output)
+				}
+			}
+		})
+	}
+}