Improved handling of incomplete configs array

arduino · May 3, 2024 · ce829e4 · ce829e4
1 parent 8b8895c
commit ce829e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/internal/go-configmap/configuration.go b/internal/go-configmap/configuration.go
@@ -97,7 +97,7 @@ func tryConversion(current any, desiredType reflect.Type) (any, error) {
 		}
 	case reflect.Array, reflect.Slice:
 		currentArray, ok := current.([]any)
-		if !ok {
+		if !ok && current != nil {
 			break
 		}
 		for i, elem := range currentArray {

diff --git a/internal/integrationtest/config/config_test.go b/internal/integrationtest/config/config_test.go
@@ -893,4 +893,12 @@ build.unk: 123
 	out, _, err = cli.Run("config", "get", "locale", "--config-file", invalidConfig.String())
 	require.NoError(t, err)
 	require.Equal(t, "en", strings.TrimSpace(string(out)))
+
+	// Run "config get" with a configuration contatinng a null array
+	nullArrayConfig := paths.New(filepath.Join(tmp, "null_array.yaml"))
+	nullArrayConfig.WriteFile([]byte(`board_manager.additional_urls:`))
+	t.Cleanup(func() { nullArrayConfig.Remove() })
+	out, _, err = cli.Run("config", "get", "locale", "--config-file", invalidConfig.String())
+	require.NoError(t, err)
+	require.Equal(t, "en", strings.TrimSpace(string(out)))
 }