New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
move port splitting to common place; add to node resource location #7073
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
Copyright 2015 Google Inc. All rights reserved. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"strings" | ||
) | ||
|
||
// Takes a string of the form "name:port" or "name". | ||
// * If id is of the form "name" or "name:", then return (name, "", true) | ||
// * If id is of the form "name:port", then return (name, port, true) | ||
// * Otherwise, return ("", "", false) | ||
// Additionally, name must be non-empty or valid will be returned false. | ||
// | ||
// Port is returned as a string, and it is not required to be numeric (could be | ||
// used for a named port, for example). | ||
func SplitPort(id string) (name, port string, valid bool) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. given that in all cases you test valid and then return an error, perhaps just return an error instead of the 'valid' bool? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The error is different in all three places, though... I also don't think util can return an api error (dependency goes the other direction), and if I return a regular error, then it has to get wrapped in all three places anyway. |
||
parts := strings.Split(id, ":") | ||
if len(parts) > 2 { | ||
return "", "", false | ||
} | ||
if len(parts) == 2 { | ||
return parts[0], parts[1], len(parts[0]) > 0 | ||
} | ||
return id, "", len(id) > 0 | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
Copyright 2015 Google Inc. All rights reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"testing" | ||
) | ||
|
||
func TestSplitPort(t *testing.T) { | ||
table := []struct { | ||
in string | ||
name, port string | ||
valid bool | ||
}{ | ||
{ | ||
in: "aoeu:asdf", | ||
name: "aoeu", | ||
port: "asdf", | ||
valid: true, | ||
}, { | ||
in: "aoeu:", | ||
name: "aoeu", | ||
valid: true, | ||
}, { | ||
in: ":asdf", | ||
name: "", | ||
port: "asdf", | ||
}, { | ||
in: "aoeu:asdf:htns", | ||
}, { | ||
in: "aoeu", | ||
name: "aoeu", | ||
valid: true, | ||
}, { | ||
in: "", | ||
}, | ||
} | ||
|
||
for _, item := range table { | ||
name, port, valid := SplitPort(item.in) | ||
if e, a := item.name, name; e != a { | ||
t.Errorf("%q: Wanted %q, got %q", item.in, e, a) | ||
} | ||
if e, a := item.port, port; e != a { | ||
t.Errorf("%q: Wanted %q, got %q", item.in, e, a) | ||
} | ||
if e, a := item.valid, valid; e != a { | ||
t.Errorf("%q: Wanted %q, got %q", item.in, e, a) | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is very similar to but different from http://golang.org/pkg/net/#SplitHostPort - is it worthwhile, really? or should we thunk down to that when we can?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, we can investigate whether we can just use that. I wanted to at least get these three cases consistent, though.