Add grpcClientFactory to http.NewAuthenticatorFromConfiguration

Author: moroten

cmd/bb_replicator/main.go

@@ -70,7 +70,7 @@ func main() {
 			return util.StatusWrap(err, "gRPC server failure")
 		}
 
-		lifecycleState.MarkReadyAndWait(siblingsGroup)
+		lifecycleState.MarkReadyAndWait(siblingsGroup, grpcClientFactory)
 		return nil
 	})
 }

cmd/bb_storage/main.go

@@ -216,7 +216,7 @@ func main() {
 			return util.StatusWrap(err, "gRPC server failure")
 		}
 
-		lifecycleState.MarkReadyAndWait(siblingsGroup)
+		lifecycleState.MarkReadyAndWait(siblingsGroup, grpcClientFactory)
 		return nil
 	})
 }

pkg/global/apply_configuration.go

@@ -58,7 +58,7 @@ type LifecycleState struct {
 // MarkReadyAndWait can be called to report that the program has started
 // successfully. The application should now be reported as being healthy
 // and ready, and receive incoming requests if applicable.
-func (ls *LifecycleState) MarkReadyAndWait(group program.Group) {
+func (ls *LifecycleState) MarkReadyAndWait(group program.Group, grpcClientFactory bb_grpc.ClientFactory) {
 	// Start a diagnostics web server that exposes Prometheus
 	// metrics and provides a health check endpoint.
 	if ls.config != nil {
@@ -77,7 +77,8 @@ func (ls *LifecycleState) MarkReadyAndWait(group program.Group) {
 		bb_http.NewServersFromConfigurationAndServe(
 			ls.config.HttpServers,
 			bb_http.NewMetricsHandler(router, "Diagnostics"),
-			group)
+			group,
+			grpcClientFactory)
 	}
 }
 

pkg/http/BUILD.bazel

@@ -23,6 +23,7 @@ go_library(
     deps = [
         "//pkg/auth",
         "//pkg/clock",
+        "//pkg/grpc",
         "//pkg/jwt",
         "//pkg/program",
         "//pkg/proto/configuration/http",

pkg/http/authenticator.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/buildbarn/bb-storage/pkg/auth"
 	"github.com/buildbarn/bb-storage/pkg/clock"
+	"github.com/buildbarn/bb-storage/pkg/grpc"
 	"github.com/buildbarn/bb-storage/pkg/jwt"
 	"github.com/buildbarn/bb-storage/pkg/program"
 	configuration "github.com/buildbarn/bb-storage/pkg/proto/configuration/http"
@@ -31,7 +32,7 @@ type Authenticator interface {
 
 // NewAuthenticatorFromConfiguration creates a tree of Authenticator
 // objects based on a configuration file.
-func NewAuthenticatorFromConfiguration(policy *configuration.AuthenticationPolicy, group program.Group) (Authenticator, error) {
+func NewAuthenticatorFromConfiguration(policy *configuration.AuthenticationPolicy, group program.Group, grpcClientFactory grpc.ClientFactory) (Authenticator, error) {
 	if policy == nil {
 		return nil, status.Error(codes.InvalidArgument, "Authentication policy not specified")
 	}
@@ -45,7 +46,7 @@ func NewAuthenticatorFromConfiguration(policy *configuration.AuthenticationPolic
 	case *configuration.AuthenticationPolicy_Any:
 		children := make([]Authenticator, 0, len(policyKind.Any.Policies))
 		for _, childConfiguration := range policyKind.Any.Policies {
-			child, err := NewAuthenticatorFromConfiguration(childConfiguration, group)
+			child, err := NewAuthenticatorFromConfiguration(childConfiguration, group, grpcClientFactory)
 			if err != nil {
 				return nil, err
 			}
@@ -119,7 +120,7 @@ func NewAuthenticatorFromConfiguration(policy *configuration.AuthenticationPolic
 			cookieAEAD,
 			clock.SystemClock)
 	case *configuration.AuthenticationPolicy_AcceptHeader:
-		base, err := NewAuthenticatorFromConfiguration(policyKind.AcceptHeader.Policy, group)
+		base, err := NewAuthenticatorFromConfiguration(policyKind.AcceptHeader.Policy, group, grpcClientFactory)
 		if err != nil {
 			return nil, err
 		}

pkg/http/server.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net/http"
 
+	"github.com/buildbarn/bb-storage/pkg/grpc"
 	"github.com/buildbarn/bb-storage/pkg/program"
 	configuration "github.com/buildbarn/bb-storage/pkg/proto/configuration/http"
 	"github.com/buildbarn/bb-storage/pkg/util"
@@ -13,10 +14,10 @@ import (
 // program.Group, based on a configuration message. The web servers are
 // automatically terminated if the context associated with the group is
 // canceled.
-func NewServersFromConfigurationAndServe(configurations []*configuration.ServerConfiguration, handler http.Handler, group program.Group) {
+func NewServersFromConfigurationAndServe(configurations []*configuration.ServerConfiguration, handler http.Handler, group program.Group, grpcClientFactory grpc.ClientFactory) {
 	group.Go(func(ctx context.Context, siblingsGroup, dependenciesGroup program.Group) error {
 		for _, configuration := range configurations {
-			authenticator, err := NewAuthenticatorFromConfiguration(configuration.AuthenticationPolicy, dependenciesGroup)
+			authenticator, err := NewAuthenticatorFromConfiguration(configuration.AuthenticationPolicy, dependenciesGroup, grpcClientFactory)
 			if err != nil {
 				return err
 			}