Adds context to HeaderProvider.Headers(ctx) (#1562)

Author: hendoxc

pkg/chipingress/auth.go

@@ -10,6 +10,10 @@ import (
 var _ credentials.PerRPCCredentials = basicAuthCredentials{}
 var _ credentials.PerRPCCredentials = tokenAuthCredentials{}
 
+type HeaderProvider interface {
+	Headers(ctx context.Context) map[string]string
+}
+
 // Basic-Auth authentication for Chip Ingress
 type basicAuthCredentials struct {
 	authHeader map[string]string
@@ -42,11 +46,11 @@ type tokenAuthCredentials struct {
 }
 
 // implement PerRPCCredentials interface
-func (c tokenAuthCredentials) GetRequestMetadata(_ context.Context, _ ...string) (map[string]string, error) {
+func (c tokenAuthCredentials) GetRequestMetadata(ctx context.Context, _ ...string) (map[string]string, error) {
 	if c.authTokenProvider == nil {
 		return nil, nil
 	}
-	return c.authTokenProvider.GetHeaders(), nil
+	return c.authTokenProvider.Headers(ctx), nil
 }
 
 func (c tokenAuthCredentials) RequireTransportSecurity() bool {

pkg/chipingress/auth_test.go

@@ -49,13 +49,11 @@ func TestBasicAuth(t *testing.T) {
 	})
 }
 
-var authHeaderKey = "X-Auth-Token"
-
 type testHeaderProvider struct {
 	headers map[string]string
 }
 
-func (p *testHeaderProvider) GetHeaders() map[string]string {
+func (p *testHeaderProvider) Headers(ctx context.Context) map[string]string {
 	return p.headers
 }
 

pkg/chipingress/client.go

@@ -20,9 +20,6 @@ import (
 )
 
 // HeaderProvider defines an interface for providing headers
-type HeaderProvider interface {
-	GetHeaders() map[string]string
-}
 
 type Client interface {
 	pb.ChipIngressClient
@@ -51,8 +48,10 @@ func newClientConfig(host string) *clientConfig {
 		headerProvider:    nil,
 		perRPCCredentials: nil,
 		host:              host,
+		// Default to insecure connection
+		insecureConnection:   true,
+		transportCredentials: insecure.NewCredentials(),
 	}
-	WithInsecureConnection()(cfg) // Default to insecure connection
 	return cfg
 }
 
@@ -168,7 +167,7 @@ func newHeaderInterceptor(provider HeaderProvider) grpc.UnaryClientInterceptor {
 	return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
 		// Add dynamic headers from provider if available
 		if provider != nil {
-			for k, v := range provider.GetHeaders() {
+			for k, v := range provider.Headers(ctx) {
 				ctx = metadata.AppendToOutgoingContext(ctx, k, v)
 			}
 		}

pkg/chipingress/client_test.go

@@ -584,7 +584,7 @@ type mockHeaderProvider struct {
 	headers map[string]string
 }
 
-func (m *mockHeaderProvider) GetHeaders() map[string]string {
+func (m *mockHeaderProvider) Headers(ctx context.Context) map[string]string {
 	return m.headers
 }