add nop info lookup token

Author: engnke

pkg/chipingress/auth.go

@@ -14,6 +14,12 @@ type HeaderProvider interface {
 	Headers(ctx context.Context) (map[string]string, error)
 }
 
+type HeaderProviderFunc func(ctx context.Context) (map[string]string, error)
+
+func (f HeaderProviderFunc) Headers(ctx context.Context) (map[string]string, error) {
+	return f(ctx)
+}
+
 // Basic-Auth authentication for Chip Ingress
 type basicAuthCredentials struct {
 	authHeader map[string]string

pkg/chipingress/client.go

@@ -44,13 +44,14 @@ type Opt func(*clientConfig)
 
 // clientConfig is the configuration for the ChipIngressClient.
 type clientConfig struct {
-	transportCredentials credentials.TransportCredentials
-	perRPCCredentials    credentials.PerRPCCredentials
-	headerProvider       HeaderProvider
-	insecureConnection   bool
-	host                 string
-	meterProvider        metric.MeterProvider
-	tracerProvider       trace.TracerProvider
+	transportCredentials  credentials.TransportCredentials
+	perRPCCredentials     credentials.PerRPCCredentials
+	headerProvider        HeaderProvider
+	insecureConnection    bool
+	host                  string
+	meterProvider         metric.MeterProvider
+	tracerProvider        trace.TracerProvider
+	nopInfoHeaderProvider HeaderProvider
 }
 
 func newClientConfig(host string) *clientConfig {
@@ -59,8 +60,9 @@ func newClientConfig(host string) *clientConfig {
 		perRPCCredentials: nil,
 		host:              host,
 		// Default to insecure connection
-		insecureConnection:   true,
-		transportCredentials: insecure.NewCredentials(),
+		insecureConnection:    true,
+		transportCredentials:  insecure.NewCredentials(),
+		nopInfoHeaderProvider: nil,
 	}
 	return cfg
 }
@@ -116,6 +118,10 @@ func NewClient(address string, opts ...Opt) (Client, error) {
 		// NOTE: not supporting streaming interceptors
 	}
 
+	if cfg.nopInfoHeaderProvider != nil {
+		grpcOpts = append(grpcOpts, grpc.WithUnaryInterceptor(newHeaderInterceptor(cfg.nopInfoHeaderProvider)))
+	}
+
 	conn, err := grpc.NewClient(address, grpcOpts...)
 	if err != nil {
 		return nil, err
@@ -226,6 +232,16 @@ func WithTracerProvider(provider trace.TracerProvider) Opt {
 	return func(c *clientConfig) { c.tracerProvider = provider }
 }
 
+func WithNOPLookup() Opt {
+	return func(c *clientConfig) {
+		c.nopInfoHeaderProvider = HeaderProviderFunc(func(ctx context.Context) (map[string]string, error) {
+			return map[string]string{
+				"x-include-nop-info": "true",
+			}, nil
+		})
+	}
+}
+
 // newHeaderInterceptor creates a unary interceptor that adds headers from a HeaderProvider
 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 {

pkg/chipingress/client_test.go

@@ -568,6 +568,20 @@ func TestOptions(t *testing.T) {
 		WithTokenAuth(mockProvider)(&config)
 		assert.NotNil(t, config.perRPCCredentials)
 	})
+
+	t.Run("WithNopLookup", func(t *testing.T) {
+		mockProvider := &mockHeaderProvider{
+			headers: map[string]string{"x-include-nop-info": "true"},
+		}
+		config := defaultCfg
+		WithNOPLookup()(&config)
+		assert.NotNil(t, config.nopInfoHeaderProvider)
+
+		headers, err := config.nopInfoHeaderProvider.Headers(t.Context())
+		assert.NoError(t, err)
+		assert.Equal(t, mockProvider.headers, headers)
+
+	})
 }
 
 func TestHeaderInterceptor(t *testing.T) {