Merge pull request #22 from berty/dev/moul/bearer

feat: Configure Bearer

circleci.go

@@ -89,7 +89,7 @@ func fetchCircleci(ccc *circleci.Client, since time.Time, maxBuilds int, logger
 			newBuilds := make([]*circleci.Build, len(builds))
 			i := 0
 			for _, build := range builds {
-				if build.AuthorDate.After(since) {
+				if build.AuthorDate != nil && build.AuthorDate.After(since) {
 					newBuilds[i] = build
 					i++
 				}
@@ -115,6 +115,9 @@ func fetchCircleci(ccc *circleci.Client, since time.Time, maxBuilds int, logger
 func handleCircleciBuilds(ccc *circleci.Client, builds []*circleci.Build, logger *zap.Logger) (Batch, error) {
 	batch := Batch{Builds: []*Build{}}
 	for _, build := range builds {
+		if build == nil {
+			continue
+		}
 		b := circleciBuildToBatch(build)
 		batch.Builds = append(batch.Builds, &b)
 

cmd/yolo/main.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	yolo "berty.tech/yolo/v2"
+	bearer "github.com/Bearer/bearer-go"
 	"github.com/buildkite/go-buildkite/buildkite"
 	"github.com/cayleygraph/cayley"
 	"github.com/cayleygraph/cayley/graph"
@@ -31,6 +32,7 @@ func main() {
 	var (
 		verbose            bool
 		maxBuilds          int
+		bearerSecretKey    string
 		buildkiteToken     string
 		circleciToken      string
 		dbStorePath        string
@@ -60,6 +62,7 @@ func main() {
 	serverFlagSet.DurationVar(&shutdownTimeout, "shutdown-timeout", 6*time.Second, "server shutdown timeout")
 	serverFlagSet.StringVar(&basicAuth, "basic-auth-password", "", "if set, enables basic authentication")
 	serverFlagSet.StringVar(&realm, "realm", "Yolo", "authentication Realm")
+	serverFlagSet.StringVar(&bearerSecretKey, "bearer-secretkey", "", "optional Bearer.sh Secret Key")
 
 	server := &ffcli.Command{
 		Name:      `server`,
@@ -71,6 +74,9 @@ func main() {
 			if err != nil {
 				return err
 			}
+			if bearerSecretKey != "" {
+				bearer.ReplaceGlobals(bearer.Init(bearerSecretKey))
+			}
 			db, dbCleanup, err := dbFromArgs(dbStorePath, logger)
 			if err != nil {
 				return err