client rebuilding in progress

pkg/filecli/client.go

@@ -11,13 +11,17 @@ type Client struct {
 	userAgent  string
 }
 
-func NewClient(transport http.RoundTripper, mwFunc ...MiddlewareFunc) *Client {
+func NewClient(transport http.RoundTripper, mwFuncs ...MiddlewareFunc) *Client {
 	if transport == nil {
 		transport = NewDefaultTransport()
 	}
+        for _, mwFunc := range mwFuncs {
+                transport = mwFunc(transport)
+        }
 	httpClient := &http.Client{
 		Transport: transport,
 	}
+
 	return &Client{
 		httpClient: httpClient,
 		userAgent:  "ociClient/1.0",
@@ -34,26 +38,6 @@ func (cli *Client) UseMiddleware(mwFunc MiddlewareFunc) {
 	cli.httpClient.Transport = mwFunc(cli.httpClient.Transport)
 }
 
-// ExampleMiddleware
-func NewExampleMiddleware() MiddlewareFunc {
-	return func(next http.RoundTripper) http.RoundTripper {
-		return newExampleTransport(next)
-	}
-}
-
-type ExampleTransport struct {
-	next http.RoundTripper
-}
-
-func newExampleTransport(next http.RoundTripper) *ExampleTransport {
-	return &ExampleTransport{
-		next: next,
-	}
-}
-
-func (tran ExampleTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	return tran.next.RoundTrip(req)
-}
 
 // BasicAuthMiddleware
 func NewBasicAuthMiddleware(user, pass string) MiddlewareFunc {
@@ -76,8 +60,10 @@ func newBasicAuthMW(next http.RoundTripper, user, pass string) *BasicAuthMW {
 }
 
 func (tran BasicAuthMW) RoundTrip(req *http.Request) (*http.Response, error) {
-	pair := base64.StdEncoding.EncodeToString([]byte(tran.user + ":" + tran.pass))
-	req.Header.Set("Authorization", "Basic "+pair)
+        if tran.user != "" && tran.pass != "" {
+                pair := base64.StdEncoding.EncodeToString([]byte(tran.user + ":" + tran.pass))
+                req.Header.Set("Authorization", "Basic "+pair)
+        }
 	return tran.next.RoundTrip(req)
 }
 
@@ -123,3 +109,25 @@ func NewDefaultTransport() *DefaultTransport {
 func (wrap *DefaultTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	return wrap.transport.RoundTrip(req)
 }
+
+
+// ExampleMiddleware
+func NewExampleMiddleware() MiddlewareFunc {
+	return func(next http.RoundTripper) http.RoundTripper {
+		return newExampleTransport(next)
+	}
+}
+
+type ExampleTransport struct {
+	next http.RoundTripper
+}
+
+func newExampleTransport(next http.RoundTripper) *ExampleTransport {
+	return &ExampleTransport{
+		next: next,
+	}
+}
+
+func (tran ExampleTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	return tran.next.RoundTrip(req)
+}