Merge pull request #662 from openziti/fix-http-client-example

tweak NewSdkCollectionFromEnv and fix the http-client example

example/http-client/main.go

@@ -10,9 +10,12 @@ import (
 )
 
 func newZitiClient() *http.Client {
+	ziti.DefaultCollection.ForAll(func(ctx ziti.Context) {
+		ctx.Authenticate()
+	})
 	zitiTransport := http.DefaultTransport.(*http.Transport).Clone() // copy default transport
 	zitiTransport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-		dialer := ziti.NewDialerWithFallback(ctx, nil)
+		dialer := ziti.DefaultCollection.NewDialer()
 		return dialer.Dial(network, addr)
 	}
 	zitiTransport.TLSClientConfig.InsecureSkipVerify = true

ziti/collection.go

@@ -62,7 +62,7 @@ func NewSdkCollection() *CtxCollection {
 
 // NewSdkCollectionFromEnv will create an empty CtxCollection and then attempt to populate it from configuration files
 // provided in a semicolon separate list of file paths retrieved from an environment variable.
-func NewSdkCollectionFromEnv(envVariable string) *CtxCollection {
+func NewSdkCollectionFromEnv(envVariable string, configTypes ...string) *CtxCollection {
 	collection := NewSdkCollection()
 
 	envValue := os.Getenv(envVariable)
@@ -74,13 +74,16 @@ func NewSdkCollectionFromEnv(envVariable string) *CtxCollection {
 		if identityFile == "" {
 			continue
 		}
+
 		cfg, err := NewConfigFromFile(identityFile)
 
 		if err != nil {
 			pfxlog.Logger().Errorf("failed to load config from file '%s'", identityFile)
 			continue
 		}
 
+		cfg.ConfigTypes = append(cfg.ConfigTypes, configTypes...)
+
 		//collection.NewContext stores the new ctx in its internal collection
 		_, err = collection.NewContext(cfg)
 

ziti/default_collection.go

@@ -26,8 +26,7 @@ var DefaultCollection *CtxCollection
 const IdentitiesEnv = "ZITI_IDENTITIES"
 
 func init() {
-	DefaultCollection = NewSdkCollectionFromEnv(IdentitiesEnv)
-	DefaultCollection.ConfigTypes = []string{InterceptV1, ClientConfigV1}
+	DefaultCollection = NewSdkCollectionFromEnv(IdentitiesEnv, InterceptV1, ClientConfigV1)
 }
 
 // Deprecated: ForAllContexts iterates over all Context instances in the DefaultCollection and call the provided function `f`.