Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/chipingress/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var _ credentials.PerRPCCredentials = basicAuthCredentials{}
var _ credentials.PerRPCCredentials = tokenAuthCredentials{}

type HeaderProvider interface {
Headers(ctx context.Context) map[string]string
Headers(ctx context.Context) (map[string]string, error)
}

// Basic-Auth authentication for Chip Ingress
Expand Down Expand Up @@ -50,7 +50,7 @@ func (c tokenAuthCredentials) GetRequestMetadata(ctx context.Context, _ ...strin
if c.authTokenProvider == nil {
return nil, nil
}
return c.authTokenProvider.Headers(ctx), nil
return c.authTokenProvider.Headers(ctx)
}

func (c tokenAuthCredentials) RequireTransportSecurity() bool {
Expand Down
4 changes: 2 additions & 2 deletions pkg/chipingress/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ type testHeaderProvider struct {
headers map[string]string
}

func (p *testHeaderProvider) Headers(ctx context.Context) map[string]string {
return p.headers
func (p *testHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
return p.headers, nil
}

func TestTokenAuth(t *testing.T) {
Expand Down
8 changes: 7 additions & 1 deletion pkg/chipingress/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,13 @@ 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.Headers(ctx) {

headers, err := provider.Headers(ctx)
if err != nil {
return fmt.Errorf("failed to get headers: %w", err)
}

for k, v := range headers {
ctx = metadata.AppendToOutgoingContext(ctx, k, v)
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/chipingress/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,8 @@ type mockHeaderProvider struct {
headers map[string]string
}

func (m *mockHeaderProvider) Headers(ctx context.Context) map[string]string {
return m.headers
func (m *mockHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
return m.headers, nil
}

func TestWithTLS(t *testing.T) {
Expand Down
Loading