Allow setting map[string]string from the command line

This commit is contained in:
Ciprian Hacman 2023-10-03 10:45:28 +03:00
parent fcb3a85422
commit 781fe0c418
3 changed files with 43 additions and 2 deletions

View File

@ -134,6 +134,23 @@ func setType(v reflect.Value, newValue string) error {
t := v.Type().String() t := v.Type().String()
if v.Type().Kind() == reflect.Map {
if v.IsNil() {
v.Set(reflect.MakeMap(v.Type()))
}
switch t {
case "map[string]string":
name, value, _ := strings.Cut(newValue, "=")
v.SetMapIndex(reflect.ValueOf(name), reflect.ValueOf(value))
default:
return fmt.Errorf("unhandled type %q", t)
}
return nil
}
var newV reflect.Value var newV reflect.Value
switch t { switch t {
@ -168,6 +185,7 @@ func setType(v reflect.Value, newValue string) error {
default: default:
panic("missing case in int switch") panic("missing case in int switch")
} }
case "uint64", "uint32", "uint16", "uint": case "uint64", "uint32", "uint16", "uint":
v, err := strconv.Atoi(newValue) v, err := strconv.Atoi(newValue)
if err != nil { if err != nil {
@ -189,6 +207,7 @@ func setType(v reflect.Value, newValue string) error {
default: default:
panic("missing case in uint switch") panic("missing case in uint switch")
} }
case "intstr.IntOrString": case "intstr.IntOrString":
newV = reflect.ValueOf(intstr.Parse(newValue)) newV = reflect.ValueOf(intstr.Parse(newValue))

View File

@ -65,6 +65,8 @@ type fakeObjectContainers struct {
Enum fakeEnum `json:"enum"` Enum fakeEnum `json:"enum"`
EnumSlice []fakeEnum `json:"enumSlice"` EnumSlice []fakeEnum `json:"enumSlice"`
StringMap map[string]string `json:"stringMap"`
} }
type fakeObjectPolicy struct { type fakeObjectPolicy struct {
@ -197,6 +199,27 @@ func TestSet(t *testing.T) {
Path: "spec.containers[0].duration", Path: "spec.containers[0].duration",
Value: "500ms", Value: "500ms",
}, },
{
Name: "set new map key",
Input: "{ 'spec': { 'containers': [ {} ] } }",
Expected: "{ 'spec': { 'containers': [ { 'stringMap': { 'ABC': '' } } ] } }",
Path: "spec.containers[0].stringMap",
Value: "ABC",
},
{
Name: "set new map key with val",
Input: "{ 'spec': { 'containers': [ {} ] } }",
Expected: "{ 'spec': { 'containers': [ { 'stringMap': { 'ABC': 'DEF' } } ] } }",
Path: "spec.containers[0].stringMap",
Value: "ABC=DEF",
},
{
Name: "set existing map key with val",
Input: "{ 'spec': { 'containers': [ { 'stringMap': { 'ABC': 'DEF' } } ] } }",
Expected: "{ 'spec': { 'containers': [ { 'stringMap': { 'ABC': 'DEF', 'GHI': 'JKL' } } ] } }",
Path: "spec.containers[0].stringMap",
Value: "GHI=JKL",
},
// Not sure if we should do this... // Not sure if we should do this...
// { // {
// Name: "creating missing array elements", // Name: "creating missing array elements",

View File

@ -95,8 +95,7 @@ func ParseFieldPath(s string) (*FieldPath, error) {
token: field, token: field,
}) })
case '.': case '.', '/':
// TODO: Validate that we don't have two dots?
// Skip // Skip
case '[': case '[':