rkt/uuid: fix match when uuid is an empty string by alepuccetti · Pull Request #2807 · rkt/rkt

alepuccetti · 2016-06-16T11:04:50Z

After the patch, if the uuid is an empty string then matchUUID(uuid string)
returns no matches instead of all the pods.
This is done to avoid rkt rm or rkt enter to delete or enter pods
without intending to.

Fixes #2806

ghost · 2016-06-16T11:04:52Z

Can one of the admins verify this patch?

iaguis · 2016-06-16T11:10:58Z

ok to test

alban · 2016-06-16T13:07:59Z

How does it look like with this patch when users run rkt rm "" or rkt enter ""?

alepuccetti · 2016-06-16T13:09:39Z

How does it look like with this patch when users run rkt rm "" or rkt enter ""?

rkt rm ""

rm: unable to resolve UUID: no matches found for ""
rm: failed to remove one or more pods

rkt enter ""
enter: problem retrieving pod: no matches found for ""

alepuccetti · 2016-06-16T13:22:42Z

Maybe the second line of the error message can be avoided when there are no matches.

lucab · 2016-06-16T18:05:44Z

Two comments here:

this could benefit from using a ErrNoEmptyUUID
~~this is killing the (only?) way to act on all pods. I'm not sure if this feature has some real usecases. If so, should we introduce a special wildcard instead?~~ Edit: nevermind, I later realized that the only caller of this explicitly expects a single result.

alepuccetti · 2016-06-16T18:10:47Z

I agree on the wildcard, but before if you were running 'sudo rkt rm ""'
rkt was not going to delete all the pods anyway. It says 'ambiguous UUID'
this just catch a typing error.
That been said, I totally agree about the wildcard, but this should be a
RFE in a different PR. Which I can do it tomorrow.

On Thursday, June 16, 2016, Luca Bruno notifications@github.com wrote:

Two comments here:

this could benefit from using a typed error ErrNoEmptyUUID
https://github.com/appc/spec/blob/master/schema/types/uuid.go#L27

this is killing the (only?) way to act on all pods. I'm not sure if
this feature has some real usecases. If so, should we introduce a special
wildcard instead?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#2807 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AGRc7ydEaG2LSqcP6ShTLJJQEyrA5fyFks5qMZCFgaJpZM4I3RWH
.

alepuccetti · 2016-06-17T10:05:58Z

Patch updated.

@lucab I will open a specific an issue for wildcard

alepuccetti · 2016-06-17T10:11:13Z

New error output

sudo rkt enter ""
enter: problem retrieving pod: UUID cannot be empty

sudo rkt rm ""
rm: unable to resolve UUID: UUID cannot be empty
rm: failed to remove one or more pods

lucab · 2016-06-18T09:22:04Z

 // An array of matches is returned, which may be empty when nothing matches.
 func matchUUID(uuid string) ([]string, error) {
+	if uuid == "" {
+		return []string{}, types.ErrNoEmptyUUID


You can directly return nil, types.ErrNoEmptyUUID here.

lucab · 2016-06-18T09:23:54Z

One comment inline and some additional notes:

No need to specify the function in commit title, rkt/uuid should be enough.
Can you please also add a test for this?

alepuccetti · 2016-06-20T15:01:00Z

Patch updated. @lucab test added.

lucab · 2016-06-20T16:07:13Z

+	uuidFile := filepath.Join(tmpDir, "uuid-file")
+	if err := ioutil.WriteFile(uuidFile, []byte(nonexistentUUID), 0600); err != nil {
+		t.Fatalf("cannot write uuid-file: %v", err)
+	}


I'm not sure I understood why you are creating this nonexistentUUID file here. What's its purpose?

Yeah this can be deleted, I was not sure if it was necessary to have a some kind of data to be able to run rkt rm correctly, like the example before. I suppose that the creation of the uuid-file it is a precaution to avoid deleting an existing pod, isn't it?.

After the patch, if the uuid is an empty string then matchUUID(uuid string) returns `UUID cannot be empty` error message instead of all the pods. This is done to avoid `rkt rm` or `rkt enter` to delete or enter pods without intending to. Fixes rkt#2806

alepuccetti · 2016-06-21T07:11:26Z

patch updated. @lucab this should be cleaner

lucab · 2016-06-21T07:53:48Z

Yes, thanks! LGTM, mergeable once builders are done.

alepuccetti · 2016-06-21T08:19:02Z

TestRmEmptyUUID passed, fedora-23 failure seems unrelated.

lucab · 2016-06-21T09:03:10Z

@alepuccetti yes that's #2287. I'm merging this.

alban added this to the v1.9.0 milestone Jun 16, 2016

alban added component/stage0 needs/review priority/P1 area/security labels Jun 16, 2016

alepuccetti force-pushed the alessandro/resolve-uuid-fix branch from 70aafe9 to 4ef67fe Compare June 17, 2016 10:04

alepuccetti force-pushed the alessandro/resolve-uuid-fix branch from 4ef67fe to f83db18 Compare June 17, 2016 10:17

lucab reviewed Jun 18, 2016
View reviewed changes

lucab self-assigned this Jun 18, 2016

lucab added needs/some-changes needs/tests and removed needs/review labels Jun 18, 2016

alepuccetti force-pushed the alessandro/resolve-uuid-fix branch 3 times, most recently from 00f3b32 to 4a2a791 Compare June 20, 2016 13:01

lucab reviewed Jun 20, 2016
View reviewed changes

lucab added needs/more-information and removed needs/some-changes needs/tests labels Jun 20, 2016

alepuccetti force-pushed the alessandro/resolve-uuid-fix branch from 4a2a791 to 166b560 Compare June 21, 2016 07:10

lucab added reviewed/lgtm reviewed/merge-on-green and removed needs/more-information labels Jun 21, 2016

lucab removed the reviewed/merge-on-green label Jun 21, 2016

lucab changed the title ~~rkt/matchUUID: fix match when uuid is an empty string~~ rkt/uuid: fix match when uuid is an empty string Jun 21, 2016

lucab merged commit 578e59a into rkt:master Jun 21, 2016

jonboulle unassigned lucab Apr 6, 2017

Conversation

alepuccetti commented Jun 16, 2016

Uh oh!

ghost commented Jun 16, 2016

Uh oh!

iaguis commented Jun 16, 2016

Uh oh!

alban commented Jun 16, 2016

Uh oh!

alepuccetti commented Jun 16, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alepuccetti commented Jun 16, 2016

Uh oh!

lucab commented Jun 16, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alepuccetti commented Jun 16, 2016

Uh oh!

alepuccetti commented Jun 17, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alepuccetti commented Jun 17, 2016

Uh oh!

lucab Jun 18, 2016

Choose a reason for hiding this comment

Uh oh!

lucab commented Jun 18, 2016

Uh oh!

alepuccetti commented Jun 20, 2016

Uh oh!

lucab Jun 20, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alepuccetti Jun 20, 2016

Choose a reason for hiding this comment

Uh oh!

alepuccetti commented Jun 21, 2016

Uh oh!

lucab commented Jun 21, 2016

Uh oh!

alepuccetti commented Jun 21, 2016

Uh oh!

lucab commented Jun 21, 2016

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

alepuccetti commented Jun 16, 2016 •

edited

Loading

lucab commented Jun 16, 2016 •

edited

Loading

alepuccetti commented Jun 17, 2016 •

edited

Loading

lucab Jun 20, 2016 •

edited

Loading