Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
felipemadero committed Nov 16, 2023
1 parent 0d2a4d2 commit 8784acc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions utils/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func SetJSONKey(jsonBody string, k string, v string) (string, error) {
return string(updatedJSON), nil
}

func CombineJSONs(baseJson string, addedJson string) (string, error) {
func CombineJSONs(baseJSON string, addedJSON string) (string, error) {
var baseConfig map[string]interface{}
if err := json.Unmarshal([]byte(baseJson), &baseConfig); err != nil {
if err := json.Unmarshal([]byte(baseJSON), &baseConfig); err != nil {
return "", err
}
var addedConfig map[string]interface{}
if err := json.Unmarshal([]byte(addedJson), &addedConfig); err != nil {
if err := json.Unmarshal([]byte(addedJSON), &addedConfig); err != nil {
return "", err
}
for k, v := range addedConfig {
Expand Down

0 comments on commit 8784acc

Please sign in to comment.