chore: update common to fad7388 (#36)

Gopkg.toml

@@ -95,4 +95,4 @@ required = [
 
 [[constraint]]
   name = "github.com/fabric8-services/fabric8-common"
-  revision = "9830c6e8180475290fef242884f088e9c7ce16c0"
+  revision = "fad7388b32f4fed868290b465b3c81dbf83cfba1"

configuration/configuration.go

@@ -38,14 +38,15 @@ const (
 	// default values as well as to get each value
 
 	// General
-	varHTTPAddress          = "http.address"
-	varMetricsHTTPAddress   = "metrics.http.address"
-	varDeveloperModeEnabled = "developer.mode.enabled"
-	varCleanTestDataEnabled = "clean.test.data"
-	varDBLogsEnabled        = "enable.db.logs"
-	defaultConfigFile       = "config.yaml"
-	varLogLevel             = "log.level"
-	varLogJSON              = "log.json"
+	varHTTPAddress                         = "http.address"
+	varMetricsHTTPAddress                  = "metrics.http.address"
+	varDeveloperModeEnabled                = "developer.mode.enabled"
+	varCleanTestDataEnabled                = "clean.test.data"
+	varCleanTestDataErrorReportingRequired = "error.reporting.required"
+	varDBLogsEnabled                       = "enable.db.logs"
+	defaultConfigFile                      = "config.yaml"
+	varLogLevel                            = "log.level"
+	varLogJSON                             = "log.json"
 
 	// Postgres
 	varPostgresHost                 = "postgres.host"
@@ -462,6 +463,8 @@ func (c *ConfigurationData) setConfigDefaults() {
 
 	// By default, test data should be cleaned from DB, unless explicitly said otherwise.
 	c.v.SetDefault(varCleanTestDataEnabled, true)
+	// By default, error should be reported while cleaning test data from DB.
+	c.v.SetDefault(varCleanTestDataErrorReportingRequired, true)
 	// By default, DB logs are not output in the console
 	c.v.SetDefault(varDBLogsEnabled, false)
 
@@ -565,6 +568,11 @@ func (c *ConfigurationData) IsCleanTestDataEnabled() bool {
 	return c.v.GetBool(varCleanTestDataEnabled)
 }
 
+// IsCleanTestDataErrorReportingRequired returns `true` if there is any error while cleaning test data after each test. (default: true)
+func (c *ConfigurationData) IsCleanTestDataErrorReportingRequired() bool {
+	return c.v.GetBool(varCleanTestDataErrorReportingRequired)
+}
+
 // IsDBLogsEnabled returns `true` if the DB logs (ie, SQL queries) should be output in the console. (default: false)
 func (c *ConfigurationData) IsDBLogsEnabled() bool {
 	return c.v.GetBool(varDBLogsEnabled)

controller/clusters.go

@@ -3,10 +3,10 @@ package controller
 import (
 	"github.com/fabric8-services/fabric8-cluster/app"
 	"github.com/fabric8-services/fabric8-cluster/configuration"
+	"github.com/fabric8-services/fabric8-common/auth"
 	"github.com/fabric8-services/fabric8-common/errors"
 	"github.com/fabric8-services/fabric8-common/httpsupport"
 	"github.com/fabric8-services/fabric8-common/log"
-	"github.com/fabric8-services/fabric8-common/token"
 
 	"github.com/goadesign/goa"
 )
@@ -31,7 +31,7 @@ func NewClustersController(service *goa.Service, config clusterConfiguration) *C
 
 // Show returns the list of available OSO clusters.
 func (c *ClustersController) Show(ctx *app.ShowClustersContext) error {
-	if !token.IsSpecificServiceAccount(ctx, token.OsoProxy, token.Tenant, token.JenkinsIdler, token.JenkinsProxy, token.Auth) {
+	if !auth.IsSpecificServiceAccount(ctx, auth.OsoProxy, auth.Tenant, auth.JenkinsIdler, auth.JenkinsProxy, auth.Auth) {
 		log.Error(ctx, nil, "unauthorized access to cluster info")
 		return app.JSONErrorResponse(ctx, errors.NewUnauthorizedError("unauthorized access to cluster info"))
 	}
@@ -58,7 +58,7 @@ func (c *ClustersController) Show(ctx *app.ShowClustersContext) error {
 // ShowAuthClient returns the list of available OSO clusters with full configuration including Auth client data.
 // To be used by Auth service only
 func (c *ClustersController) ShowAuthClient(ctx *app.ShowAuthClientClustersContext) error {
-	if !token.IsSpecificServiceAccount(ctx, token.Auth) {
+	if !auth.IsSpecificServiceAccount(ctx, auth.Auth) {
 		log.Error(ctx, nil, "unauthorized access to cluster info")
 		return app.JSONErrorResponse(ctx, errors.NewUnauthorizedError("unauthorized access to cluster info"))
 	}

main.go

@@ -8,18 +8,17 @@ import (
 	"runtime"
 	"time"
 
+	"context"
 	"github.com/fabric8-services/fabric8-cluster/app"
 	"github.com/fabric8-services/fabric8-cluster/application/transaction"
 	"github.com/fabric8-services/fabric8-cluster/configuration"
 	"github.com/fabric8-services/fabric8-cluster/controller"
+	"github.com/fabric8-services/fabric8-cluster/gormapplication"
 	"github.com/fabric8-services/fabric8-cluster/migration"
 	"github.com/fabric8-services/fabric8-cluster/sentry"
+	"github.com/fabric8-services/fabric8-common/auth"
 	"github.com/fabric8-services/fabric8-common/goamiddleware"
 	"github.com/fabric8-services/fabric8-common/log"
-	"github.com/fabric8-services/fabric8-common/token"
-
-	"context"
-	"github.com/fabric8-services/fabric8-cluster/gormapplication"
 	"github.com/goadesign/goa"
 	"github.com/goadesign/goa/logging/logrus"
 	"github.com/goadesign/goa/middleware"
@@ -156,7 +155,7 @@ func main() {
 	defer haltWatcher()
 
 	// Setup Security
-	tokenManager, err := token.DefaultManager(config)
+	tokenManager, err := auth.DefaultManager(config)
 	if err != nil {
 		log.Panic(nil, map[string]interface{}{
 			"err": err,
@@ -166,7 +165,7 @@ func main() {
 	jwtMiddlewareTokenContext := goamiddleware.TokenContext(tokenManager, app.NewJWTSecurity())
 	service.Use(jwtMiddlewareTokenContext)
 
-	service.Use(token.InjectTokenManager(tokenManager))
+	service.Use(auth.InjectTokenManager(tokenManager))
 	service.Use(log.LogRequest(config.DeveloperModeEnabled()))
 	app.UseJWTMiddleware(service, jwt.New(tokenManager.PublicKeys(), nil, app.NewJWTSecurity()))
 

sentry/sentry.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fabric8-services/fabric8-common/auth"
 	"github.com/fabric8-services/fabric8-common/sentry"
-	"github.com/fabric8-services/fabric8-common/token"
 
 	"github.com/getsentry/raven-go"
 	"github.com/goadesign/goa/middleware/security/jwt"
@@ -29,7 +29,7 @@ func Initialize(config configuration, commit string) (func(), error) {
 
 func extractUserInfo() func(ctx context.Context) (*raven.User, error) {
 	return func(ctx context.Context) (*raven.User, error) {
-		m, err := token.ReadManagerFromContext(ctx)
+		m, err := auth.ReadManagerFromContext(ctx)
 		if err != nil {
 			return nil, err
 		}

sentry/sentry_whitebox_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	testsuite "github.com/fabric8-services/fabric8-cluster/test/suite"
-	"github.com/fabric8-services/fabric8-common/test/auth"
-	"github.com/fabric8-services/fabric8-common/token"
+	"github.com/fabric8-services/fabric8-common/auth"
+	testauth "github.com/fabric8-services/fabric8-common/test/auth"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/getsentry/raven-go"
@@ -24,7 +24,7 @@ type TestWhiteboxSentry struct {
 }
 
 func failOnNoToken(t *testing.T) context.Context {
-	return token.ContextWithTokenManager(context.Background(), auth.TokenManager)
+	return auth.ContextWithTokenManager(context.Background(), testauth.TokenManager)
 }
 
 func failOnParsingToken(t *testing.T) context.Context {
@@ -37,7 +37,7 @@ func failOnParsingToken(t *testing.T) context.Context {
 
 func (s *TestWhiteboxSentry) TestExtractUserInfo() {
 	f := extractUserInfo()
-	ctx, identity, err := auth.EmbedUserTokenInContext(nil, nil)
+	ctx, identity, err := testauth.EmbedUserTokenInContext(nil, nil)
 	require.NoError(s.T(), err)
 
 	tests := []struct {