Skip to content

Commit c6f07f6

Browse files
committed
Applied changes from code review
1 parent 47a9993 commit c6f07f6

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

Diff for: internal/go-configmap/cli.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,19 @@ func (c *Map) InjectEnvVars(env []string, prefix string) []error {
8383
envKeyToConfigKey := map[string]string{}
8484
for _, k := range c.AllKeys() {
8585
normalizedKey := prefix + strings.ToUpper(k)
86-
normalizedKey = strings.Replace(normalizedKey, ".", "_", -1)
86+
normalizedKey = strings.ReplaceAll(normalizedKey, ".", "_")
8787
envKeyToConfigKey[normalizedKey] = k
8888
}
8989

9090
for _, e := range env {
9191
// Extract key and value from env
92-
parts := strings.SplitN(e, "=", 2)
93-
if len(parts) != 2 {
92+
envKey, envValue, ok := strings.Cut(e, "=")
93+
if !ok {
9494
continue
9595
}
96-
envKey := strings.ToUpper(parts[0])
97-
envValue := parts[1]
9896

9997
// Check if the configuration has a matching key
100-
key, ok := envKeyToConfigKey[envKey]
98+
key, ok := envKeyToConfigKey[strings.ToUpper(envKey)]
10199
if !ok {
102100
continue
103101
}

Diff for: internal/go-configmap/configuration_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package configmap_test
1717

1818
import (
1919
"encoding/json"
20-
"fmt"
2120
"testing"
2221

2322
"github.com/arduino/arduino-cli/internal/go-configmap"
@@ -36,7 +35,6 @@ func TestConfiguration(t *testing.T) {
3635

3736
yml, err := yaml.Marshal(c)
3837
require.NoError(t, err)
39-
fmt.Println(string(yml))
4038

4139
d := configmap.New()
4240
err = yaml.Unmarshal(yml, &d)
@@ -109,13 +107,11 @@ func TestMerge(t *testing.T) {
109107

110108
f := configmap.New()
111109
f.Set("fooz.bar", 10)
112-
require.Error(t, c.Merge(f))
113-
fmt.Println(c.Merge(f))
110+
require.EqualError(t, c.Merge(f), "invalid types for key 'bar': got string but want int")
114111

115112
g := configmap.New()
116113
g.Set("fooz.bart", "baz")
117-
require.Error(t, c.Merge(g))
118-
fmt.Println(c.Merge(g))
114+
require.EqualError(t, c.Merge(g), "target key do not exist: 'bart'")
119115
}
120116

121117
func TestAllKeys(t *testing.T) {

0 commit comments

Comments
 (0)