forked from grpc/grpc-go
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
internal: Move parseTarget function into internal package and export …
…it. (grpc#3368) This will be used by RLS LB policy to validate targets specified in the service config.
- Loading branch information
Showing
5 changed files
with
136 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * | ||
| * Copyright 2020 gRPC authors. | ||
| * | ||
| * 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 grpcutil provides a bunch of utility functions to be used across the | ||
| // gRPC codebase. | ||
| package grpcutil | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "google.golang.org/grpc/resolver" | ||
| ) | ||
|
|
||
| // split2 returns the values from strings.SplitN(s, sep, 2). | ||
| // If sep is not found, it returns ("", "", false) instead. | ||
| func split2(s, sep string) (string, string, bool) { | ||
| spl := strings.SplitN(s, sep, 2) | ||
| if len(spl) < 2 { | ||
| return "", "", false | ||
| } | ||
| return spl[0], spl[1], true | ||
| } | ||
|
|
||
| // ParseTarget splits target into a resolver.Target struct containing scheme, | ||
| // authority and endpoint. | ||
| // | ||
| // If target is not a valid scheme://authority/endpoint, it returns {Endpoint: | ||
| // target}. | ||
| func ParseTarget(target string) (ret resolver.Target) { | ||
| var ok bool | ||
| ret.Scheme, ret.Endpoint, ok = split2(target, "://") | ||
| if !ok { | ||
| return resolver.Target{Endpoint: target} | ||
| } | ||
| ret.Authority, ret.Endpoint, ok = split2(ret.Endpoint, "/") | ||
| if !ok { | ||
| return resolver.Target{Endpoint: target} | ||
| } | ||
| return ret | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * | ||
| * Copyright 2020 gRPC authors. | ||
| * | ||
| * 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 grpcutil | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "google.golang.org/grpc/resolver" | ||
| ) | ||
|
|
||
| func TestParseTarget(t *testing.T) { | ||
| for _, test := range []resolver.Target{ | ||
| {Scheme: "dns", Authority: "", Endpoint: "google.com"}, | ||
| {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}, | ||
| {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"}, | ||
| {Scheme: "passthrough", Authority: "", Endpoint: "/unix/socket/address"}, | ||
| } { | ||
| str := test.Scheme + "://" + test.Authority + "/" + test.Endpoint | ||
| got := ParseTarget(str) | ||
| if got != test { | ||
| t.Errorf("ParseTarget(%q) = %+v, want %+v", str, got, test) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestParseTargetString(t *testing.T) { | ||
| for _, test := range []struct { | ||
| targetStr string | ||
| want resolver.Target | ||
| }{ | ||
| {targetStr: "", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}}, | ||
| {targetStr: ":///", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}}, | ||
| {targetStr: "a:///", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: ""}}, | ||
| {targetStr: "://a/", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: ""}}, | ||
| {targetStr: ":///a", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a"}}, | ||
| {targetStr: "a://b/", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: ""}}, | ||
| {targetStr: "a:///b", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: "b"}}, | ||
| {targetStr: "://a/b", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: "b"}}, | ||
| {targetStr: "a://b/c", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: "c"}}, | ||
| {targetStr: "dns:///google.com", want: resolver.Target{Scheme: "dns", Authority: "", Endpoint: "google.com"}}, | ||
| {targetStr: "dns://a.server.com/google.com", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}}, | ||
| {targetStr: "dns://a.server.com/google.com/?a=b", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"}}, | ||
|
|
||
| {targetStr: "/", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/"}}, | ||
| {targetStr: "google.com", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com"}}, | ||
| {targetStr: "google.com/?a=b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com/?a=b"}}, | ||
| {targetStr: "/unix/socket/address", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/unix/socket/address"}}, | ||
|
|
||
| // If we can only parse part of the target. | ||
| {targetStr: "://", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "://"}}, | ||
| {targetStr: "unix://domain", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "unix://domain"}}, | ||
| {targetStr: "a:b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:b"}}, | ||
| {targetStr: "a/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a/b"}}, | ||
| {targetStr: "a:/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:/b"}}, | ||
| {targetStr: "a//b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a//b"}}, | ||
| {targetStr: "a://b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a://b"}}, | ||
| } { | ||
| got := ParseTarget(test.targetStr) | ||
| if got != test.want { | ||
| t.Errorf("ParseTarget(%q) = %+v, want %+v", test.targetStr, got, test.want) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters