mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
* add DateTime sans mgo * change all uses of strfmt.DateTime to common.DateTime, remove test strfmt usage * remove api tests, system-test dep on api test multiple reasons to remove the api tests: * awkward dependency with fn_go meant generating bindings on a branched fn to vendor those to test new stuff. this is at a minimum not at all intuitive, worth it, nor a fun way to spend the finite amount of time we have to live. * api tests only tested a subset of functionality that the server/ api tests already test, and we risk having tests where one tests some thing and the other doesn't. let's not. we have too many test suites as it is, and these pretty much only test that we updated the fn_go bindings, which is actually a hassle as noted above and the cli will pretty quickly figure out anyway. * fn_go relies on openapi, which relies on mgo, which is deprecated and we'd like to remove as a dependency. openapi is a _huge_ dep built in a NIH fashion, that cannot simply remove the mgo dep as users may be using it. we've now stolen their date time and otherwise killed usage of it in fn core, for fn_go it still exists but that's less of a problem. * update deps removals: * easyjson * mgo * go-openapi * mapstructure * fn_go * purell * go-validator also, had to lock docker. we shouldn't use docker on master anyway, they strongly advise against that. had no luck with latest version rev, so i locked it to what we were using before. until next time. the rest is just playing dep roulette, those end up removing a ton tho * fix exec test to work * account for john le cache
159 lines
4.0 KiB
Go
159 lines
4.0 KiB
Go
/*
|
|
*
|
|
* Copyright 2017 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 grpc
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"google.golang.org/grpc/grpclog"
|
|
"google.golang.org/grpc/resolver"
|
|
)
|
|
|
|
// ccResolverWrapper is a wrapper on top of cc for resolvers.
|
|
// It implements resolver.ClientConnection interface.
|
|
type ccResolverWrapper struct {
|
|
cc *ClientConn
|
|
resolver resolver.Resolver
|
|
addrCh chan []resolver.Address
|
|
scCh chan string
|
|
done chan struct{}
|
|
}
|
|
|
|
// split2 returns the values from strings.SplitN(s, sep, 2).
|
|
// If sep is not found, it returns ("", s, 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 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
|
|
}
|
|
|
|
// newCCResolverWrapper parses cc.target for scheme and gets the resolver
|
|
// builder for this scheme and builds the resolver. The monitoring goroutine
|
|
// for it is not started yet and can be created by calling start().
|
|
//
|
|
// If withResolverBuilder dial option is set, the specified resolver will be
|
|
// used instead.
|
|
func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) {
|
|
rb := cc.dopts.resolverBuilder
|
|
if rb == nil {
|
|
return nil, fmt.Errorf("could not get resolver for scheme: %q", cc.parsedTarget.Scheme)
|
|
}
|
|
|
|
ccr := &ccResolverWrapper{
|
|
cc: cc,
|
|
addrCh: make(chan []resolver.Address, 1),
|
|
scCh: make(chan string, 1),
|
|
done: make(chan struct{}),
|
|
}
|
|
|
|
var err error
|
|
ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, resolver.BuildOption{DisableServiceConfig: cc.dopts.disableServiceConfig})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ccr, nil
|
|
}
|
|
|
|
func (ccr *ccResolverWrapper) start() {
|
|
go ccr.watcher()
|
|
}
|
|
|
|
// watcher processes address updates and service config updates sequentially.
|
|
// Otherwise, we need to resolve possible races between address and service
|
|
// config (e.g. they specify different balancer types).
|
|
func (ccr *ccResolverWrapper) watcher() {
|
|
for {
|
|
select {
|
|
case <-ccr.done:
|
|
return
|
|
default:
|
|
}
|
|
|
|
select {
|
|
case addrs := <-ccr.addrCh:
|
|
select {
|
|
case <-ccr.done:
|
|
return
|
|
default:
|
|
}
|
|
grpclog.Infof("ccResolverWrapper: sending new addresses to cc: %v", addrs)
|
|
ccr.cc.handleResolvedAddrs(addrs, nil)
|
|
case sc := <-ccr.scCh:
|
|
select {
|
|
case <-ccr.done:
|
|
return
|
|
default:
|
|
}
|
|
grpclog.Infof("ccResolverWrapper: got new service config: %v", sc)
|
|
ccr.cc.handleServiceConfig(sc)
|
|
case <-ccr.done:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (ccr *ccResolverWrapper) resolveNow(o resolver.ResolveNowOption) {
|
|
ccr.resolver.ResolveNow(o)
|
|
}
|
|
|
|
func (ccr *ccResolverWrapper) close() {
|
|
ccr.resolver.Close()
|
|
close(ccr.done)
|
|
}
|
|
|
|
// NewAddress is called by the resolver implemenetion to send addresses to gRPC.
|
|
func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
|
|
select {
|
|
case <-ccr.addrCh:
|
|
default:
|
|
}
|
|
ccr.addrCh <- addrs
|
|
}
|
|
|
|
// NewServiceConfig is called by the resolver implemenetion to send service
|
|
// configs to gRPC.
|
|
func (ccr *ccResolverWrapper) NewServiceConfig(sc string) {
|
|
select {
|
|
case <-ccr.scCh:
|
|
default:
|
|
}
|
|
ccr.scCh <- sc
|
|
}
|