src: revert golobal dialer (#716)

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2021-12-10 17:12:29 +01:00 committed by GitHub
parent a13f897fbb
commit 6c67be0515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 18 deletions

View File

@ -3,6 +3,7 @@ package cloudevents
import ( import (
"context" "context"
"fmt" "fmt"
nethttp "net/http"
cloudevents "github.com/cloudevents/sdk-go/v2" cloudevents "github.com/cloudevents/sdk-go/v2"
"github.com/cloudevents/sdk-go/v2/client" "github.com/cloudevents/sdk-go/v2/client"
@ -24,6 +25,7 @@ type Emitter struct {
Id string Id string
Data string Data string
ContentType string ContentType string
Transport nethttp.RoundTripper
} }
func NewEmitter() *Emitter { func NewEmitter() *Emitter {
@ -33,14 +35,21 @@ func NewEmitter() *Emitter {
Id: uuid.NewString(), Id: uuid.NewString(),
Data: "", Data: "",
ContentType: event.TextPlain, ContentType: event.TextPlain,
Transport: nethttp.DefaultTransport,
} }
} }
func (e *Emitter) Emit(ctx context.Context, endpoint string) (err error) { func (e *Emitter) Emit(ctx context.Context, endpoint string) (err error) {
c, err := newClient(endpoint) p, err := http.New(http.WithTarget(endpoint), http.WithRoundTripper(e.Transport))
if err != nil { if err != nil {
return return err
} }
c, err := client.New(p)
if err != nil {
return err
}
evt := event.Event{ evt := event.Event{
Context: event.EventContextV1{ Context: event.EventContextV1{
Type: e.Type, Type: e.Type,
@ -60,11 +69,3 @@ func (e *Emitter) Emit(ctx context.Context, endpoint string) (err error) {
} }
return nil return nil
} }
func newClient(target string) (c client.Client, err error) {
p, err := http.New(http.WithTarget(target))
if err != nil {
return
}
return client.New(p)
}

View File

@ -4,12 +4,14 @@ import (
"context" "context"
"errors" "errors"
"io/ioutil" "io/ioutil"
"net/http"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/ory/viper" "github.com/ory/viper"
"github.com/spf13/cobra" "github.com/spf13/cobra"
fn "knative.dev/kn-plugin-func" fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/cloudevents" "knative.dev/kn-plugin-func/cloudevents"
fnhttp "knative.dev/kn-plugin-func/http"
"knative.dev/kn-plugin-func/knative" "knative.dev/kn-plugin-func/knative"
) )
@ -25,6 +27,9 @@ func newEmitClient(cfg emitConfig) (*fn.Client, error) {
e.Type = cfg.Type e.Type = cfg.Type
e.ContentType = cfg.ContentType e.ContentType = cfg.ContentType
e.Data = cfg.Data e.Data = cfg.Data
if e.Transport != nil {
e.Transport = cfg.Transport
}
if cfg.File != "" { if cfg.File != "" {
// See config.Validate for --Data and --file exclusivity enforcement // See config.Validate for --Data and --file exclusivity enforcement
b, err := ioutil.ReadFile(cfg.File) b, err := ioutil.ReadFile(cfg.File)
@ -106,6 +111,9 @@ func runEmit(cmd *cobra.Command, _ []string, clientFn emitClientFn) (err error)
} }
// Instantiate a client based on the final value of config // Instantiate a client based on the final value of config
transport := fnhttp.NewRoundTripper()
defer transport.Close()
config.Transport = transport
client, err := clientFn(config) client, err := clientFn(config)
if err != nil { if err != nil {
return err return err
@ -175,6 +183,7 @@ type emitConfig struct {
ContentType string ContentType string
Sink string Sink string
Verbose bool Verbose bool
Transport http.RoundTripper
} }
func newEmitConfig() emitConfig { func newEmitConfig() emitConfig {

View File

@ -2,13 +2,10 @@ package main
import ( import (
"context" "context"
"net/http"
"os" "os"
"os/signal" "os/signal"
"syscall" "syscall"
funcHttp "knative.dev/kn-plugin-func/http"
"knative.dev/kn-plugin-func/cmd" "knative.dev/kn-plugin-func/cmd"
) )
@ -17,11 +14,6 @@ import (
var date, vers, hash string var date, vers, hash string
func main() { func main() {
rt := funcHttp.NewRoundTripper()
http.DefaultTransport = rt
defer rt.Close()
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()