ceph: Fix how ceph CLI args are parsed #1098
Conversation
| return nil, exitStatus, goof.Newe(err) | ||
| } | ||
|
|
||
| // Search str arg for flags that can set a Ceph client id/name |
There was a problem hiding this comment.
comment on exported function StrContainsClient should be of the form "StrContainsClient ..."
b3e1d2d to
b5ca10d
Compare
|
Hi @mvollman, Unless the commits need to remain separate, do you mind please squashing them? Thanks! |
b5ca10d to
082806e
Compare
Codecov Report
@@ Coverage Diff @@
## master #1098 +/- ##
==========================================
- Coverage 34.19% 34.16% -0.04%
==========================================
Files 36 36
Lines 2901 2901
==========================================
- Hits 992 991 -1
- Misses 1806 1807 +1
Partials 103 103
Continue to review full report at Codecov.
|
| }, | ||
| { | ||
| args: "--cluster cluster2", | ||
| present: true, |
There was a problem hiding this comment.
This should be present: false. There is only a cluster flag in here, and therefore no client is detected. This should actually fail if you run the tests, e.g. :
go test -v github.com/thecodeteam/rexray/libstorage/drivers/storage/rbd/utils
Do you not see the tests fail?
I also had a 6th variation in the sample I pasted:
{
args: "--cluster cluster2 --id ceph",
present: true,
},
That was just to make sure we catch a mixed example.
The strContainsClient function is spliting characters instead of words and not correctly determining if a user has been defined. Moving strContainsClient to utils and adding tests.
082806e to
37ffdbf
Compare
|
@codenrhoden What is the one outstanding request? |
|
@mvollman Nothing! You took care of it in your most recent commit. Thank you! |
The
strContainsClientfunction is splitting characters instead of words and not correctly determining if a user has been defined.I mistakenly closed the original merge request #1083 while rebasing.