Browse Source

Improved regex for double equals arguments (#4505)

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/4521/head
Derek Nola 3 years ago committed by GitHub
parent
commit
ef263bd2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      pkg/configfilearg/defaultparser_test.go
  2. 2
      pkg/configfilearg/parser.go
  3. 3
      pkg/configfilearg/testdata/defaultdata.yaml

4
pkg/configfilearg/defaultparser_test.go

@ -29,7 +29,7 @@ func Test_UnitMustParse(t *testing.T) {
args: []string{"k3s", "server", "--write-kubeconfig-mode 644"},
config: "./testdata/defaultdata.yaml",
want: []string{"k3s", "server", "--token=12345", "--node-label=DEAFBEEF",
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--write-kubeconfig-mode 644"},
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--kubelet-arg=max-pods=999", "--write-kubeconfig-mode 644"},
},
{
name: "Basic etcd-snapshot",
@ -60,7 +60,7 @@ func Test_UnitMustParse(t *testing.T) {
args: []string{"k3s", "agent"},
config: "./testdata/defaultdata.yaml",
want: []string{"k3s", "agent", "--token=12345", "--node-label=DEAFBEEF",
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--notaflag=true"},
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--notaflag=true", "--kubelet-arg=max-pods=999"},
},
}
for _, tt := range tests {

2
pkg/configfilearg/parser.go

@ -78,7 +78,7 @@ func (p *Parser) stripInvalidFlags(command string, args []string) ([]string, err
}
}
re, err := regexp.Compile("^-+(.+)=")
re, err := regexp.Compile("^-+([^=]*)=")
if err != nil {
return args, err
}

3
pkg/configfilearg/testdata/defaultdata.yaml vendored

@ -2,4 +2,5 @@ token: 12345
node-label: DEAFBEEF
etcd-s3: true
etcd-s3-bucket: my-backup
notaflag : true
notaflag : true
kubelet-arg: "max-pods=999"
Loading…
Cancel
Save