-
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use URL instead of deprecated Scheme/Authority/Path fields.
- Loading branch information
1 parent
7058676
commit 6da4e14
Showing
4 changed files
with
29 additions
and
53 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
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 |
|---|---|---|
| @@ -1,54 +1,23 @@ | ||
| // This file was blatantly stolen from https://github.com/grpc/grpc-go/blob/e38032e927812bb354297adcab933bedeff6c177/internal/grpcutil/target.go | ||
| /* | ||
| * | ||
| * 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 multiresolver | ||
|
|
||
| import ( | ||
| "strings" | ||
| "net/url" | ||
|
|
||
| "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. | ||
| // ParseTarget parses target into resolver.Target URL | ||
| // | ||
| // If target is not a valid scheme://authority/endpoint, it returns {Endpoint: | ||
| // target}. | ||
| // If target is not a valid URL, it returns {Endpoint: URL: {Path: 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} | ||
| u, err := url.Parse(target) | ||
| if err != nil { | ||
| return resolver.Target{URL: url.URL{Path: target}} | ||
| } | ||
| ret.Authority, ret.Endpoint, ok = split2(ret.Endpoint, "/") | ||
| if !ok { | ||
| return resolver.Target{Endpoint: target} | ||
|
|
||
| return resolver.Target{ | ||
| Scheme: u.Scheme, | ||
| Authority: u.Host, | ||
| URL: *u, | ||
| } | ||
| return ret | ||
| } |