refactor: use token pkg from fabric8-common (#14)

* refactor: use `token` pkg from `fabric8-common`

fixes #6

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>

* go fmt

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>

* Reuse the latest token manager from common

* remove key duplication

* Init defult token manager

Gopkg.toml

@@ -98,4 +98,4 @@ required = [
 
 [[constraint]]
   name = "github.com/fabric8-services/fabric8-common"
-  revision = "51e44b47e514721ddaa3fca99e5fb5bc1a6e7eb2"
+  revision = "85e11c21982767f47d3da5e6f59d5b638f8b0313"

configuration/configuration.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/fabric8-services/fabric8-cluster/rest"
+	commoncfg "github.com/fabric8-services/fabric8-common/configuration"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/pkg/errors"
@@ -673,7 +674,7 @@ func (c *ConfigurationData) GetEnvironment() string {
 // GetDevModePrivateKey returns the private key and its ID used in tests
 func (c *ConfigurationData) GetDevModePrivateKey() []byte {
 	if c.DeveloperModeEnabled() {
-		return []byte(devModePrivateKey)
+		return []byte(commoncfg.DevModeRsaPrivateKey)
 	}
 	return nil
 }

configuration/defaults.go

@@ -1,34 +1,6 @@
 package configuration
 
 const (
-	devModePrivateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA40yB6SNoU4SpWxTfG5ilu+BlLYikRyyEcJIGg//w/GyqtjvT
-/CVo92DRTh/DlrgwjSitmZrhauBnrCOoUBMin0/TXeSo3w2M5tEiiIFPbTDRf2jM
-fbSGEOke9O0USCCR+bM2TncrgZR74qlSwq38VCND4zHc89rAzqJ2LVM2aXkuBbO7
-TcgLNyooBrpOK9khVHAD64cyODAdJY4esUjcLdlcB7TMDGOgxGGn2RARU7+TUf32
-gZZbTMikbuPM5gXuzGlo/22ECbQSKuZpbGwgPIAZ5NN9QA4D1NRz9+KDoiXZ6deZ
-TTVCrZykJJ6RyLNfRh+XS+6G5nvcqAmfBpyOWwIDAQABAoIBAE5pBie23zZwfTu+
-Z3jNn96/+idLC+DBqq5qsXS3xhpOIlXbLbW98gfkjk+1BXPo9la7wadLlpeX8iuf
-4WA+OaNblj69ssO/mOvHGXKdqRixzpN1Q5XZwKX0xYkYf/ahxbmt6P4IfimlX1dB
-shsWigU8ZR7rBJ3ayMh/ouTf39ViIbXsHYpEubmACcLaOlXbEuZNr7ofkFQKl/mh
-XLWUeOoM97xY6Agw/gv60GIcxIC5OAg7iNqS+XNzhba7f2nf2YqodbN9H1BmEJsf
-RRaTTWlZAiQXC8lpZOKwP7DiMLOT78lfmlYtquEBhwRbXazfzsdf67Mr4Kdl2Cej
-Jy0EGwECgYEA/DZWB0Lb0tPdT1FmORNrBfGg3PjhX9FOilhbtUgX3nNKp8Zsi3yO
-yN6hf0/98qIGlmAQi5C92cXpdhqTiVAGktWD+q0a1W99udIjinS1tFrKgNtOyBWN
-uwDBZyhw8RrwpQinMe7B966SVDaphvvOWlB1TadMDh5kReJCYpvRCrMCgYEA5rZj
-djCU2UqMw6jIP07nCFjWgxPPjg7jP8aRo07oW2mv1sEA0doCyoZaMrdNeGd3fB0B
-sm+IvlQtWD7r0tWZI1GkYpdRkDFurdkIzVPV5pMwH4ByOq/Jf5ZqtjIpoMaRBirA
-whJyjmiGU3yDyPDLtEFpNgqM3mIyxS6M6UGKYbkCgYEAg6w+d6YBK+1uQiXGD5BC
-tKS0jgjlaOfWcEW3A0qzI3Dfjf3610vdI6OPfu8dLppGhCV9HdAgPdykiQNQ+UQt
-WmVcdPgA5WNCqUu7QGK0Joer52AXnkAacYHwdtHXPRkKf66n01rKK2wZexvan91A
-m0gcJcFs5IYbZZy9ecvNdB8CgYEAo4JZ5Vay93j1YGnLWcrixDCp/wXYUJbOidGC
-QBpZZQf3Hh11JkT7O2uSm2T727yAmw63uC2B3VotNOCLI8ZMHRLsjQ8vOCFAjqdF
-rLeg3iQss/bFfkA9b1Y8VNoiVJbGC3fbWu/WDoWXxa12fL/jruG43hsGEUnJL6Q5
-K8tOdskCgYABpoHFRxsvJ5Sp9CUS3BBTicVSkpAjoX2O3+cS9XL8IsIqZEMW7VKb
-16/H2BRvI0uUq12t+UCc0P0SyrWRGxwGR5zSYHVDOot5EDHqE8aYSbX4jiXtAAiu
-qCn3Rug8QWyBjjxnU3CxPRiLSmEllQAAVlzfRWn6kL4RKSyruUhZaA==
------END RSA PRIVATE KEY-----`
-
 	defaultDBPassword = "mysecretpassword"
 
 	defaultLogLevel = "info"

controller/clusters.go

@@ -5,10 +5,9 @@ import (
 	"github.com/fabric8-services/fabric8-cluster/configuration"
 	"github.com/fabric8-services/fabric8-cluster/jsonapi"
 	"github.com/fabric8-services/fabric8-cluster/rest"
-	"github.com/fabric8-services/fabric8-cluster/token"
-
 	"github.com/fabric8-services/fabric8-common/errors"
 	"github.com/fabric8-services/fabric8-common/log"
+	"github.com/fabric8-services/fabric8-common/token"
 
 	"github.com/goadesign/goa"
 )

controller/clusters_blackbox_test.go

@@ -6,8 +6,8 @@ import (
 	"github.com/fabric8-services/fabric8-cluster/app/test"
 	. "github.com/fabric8-services/fabric8-cluster/controller"
 	"github.com/fabric8-services/fabric8-cluster/rest"
-	testsupport "github.com/fabric8-services/fabric8-cluster/test"
 	testsuite "github.com/fabric8-services/fabric8-cluster/test/suite"
+	"github.com/fabric8-services/fabric8-common/test/auth"
 
 	"github.com/goadesign/goa"
 	"github.com/satori/go.uuid"
@@ -23,8 +23,9 @@ func TestRunClustersREST(t *testing.T) {
 	suite.Run(t, &ClustersTestSuite{UnitTestSuite: testsuite.NewUnitTestSuite()})
 }
 
-func (s *ClustersTestSuite) SecuredControllerWithServiceAccount(serviceAccount *testsupport.Identity) (*goa.Service, *ClustersController) {
-	svc := testsupport.ServiceAsServiceAccountUser("Token-Service", serviceAccount)
+func (s *ClustersTestSuite) SecuredControllerWithServiceAccount(serviceAccount *auth.Identity) (*goa.Service, *ClustersController) {
+	svc, err := auth.ServiceAsServiceAccountUser("Token-Service", serviceAccount)
+	require.NoError(s.T(), err)
 	return svc, NewClustersController(svc, s.Config)
 }
 
@@ -38,7 +39,7 @@ func (s *ClustersTestSuite) TestShowForServiceAccountsOK() {
 }
 
 func (s *ClustersTestSuite) checkShowForServiceAccount(saName string) {
-	sa := &testsupport.Identity{
+	sa := &auth.Identity{
 		Username: saName,
 		ID:       uuid.NewV4(),
 	}
@@ -61,7 +62,7 @@ func (s *ClustersTestSuite) checkShowForServiceAccount(saName string) {
 }
 
 func (s *ClustersTestSuite) TestShowForUnknownSAFails() {
-	sa := &testsupport.Identity{
+	sa := &auth.Identity{
 		Username: "unknown-sa",
 		ID:       uuid.NewV4(),
 	}
@@ -75,7 +76,7 @@ func (s *ClustersTestSuite) TestShowForAuthServiceAccountsOK() {
 }
 
 func (s *ClustersTestSuite) TestShowAuthForUnknownSAFails() {
-	sa := &testsupport.Identity{
+	sa := &auth.Identity{
 		Username: "fabric8-tenant",
 		ID:       uuid.NewV4(),
 	}
@@ -84,7 +85,7 @@ func (s *ClustersTestSuite) TestShowAuthForUnknownSAFails() {
 }
 
 func (s *ClustersTestSuite) checkShowAuthForServiceAccount(saName string) {
-	sa := &testsupport.Identity{
+	sa := &auth.Identity{
 		Username: saName,
 		ID:       uuid.NewV4(),
 	}

gormtestsupport/db_test_suite.go

@@ -12,8 +12,6 @@ import (
 	"github.com/fabric8-services/fabric8-cluster/resource"
 	"github.com/fabric8-services/fabric8-common/log"
 
-	"github.com/fabric8-services/fabric8-cluster/test/graph"
-
 	"github.com/jinzhu/gorm"
 	_ "github.com/lib/pq" // need to import postgres driver
 	"github.com/stretchr/testify/suite"
@@ -36,7 +34,6 @@ type DBTestSuite struct {
 	cleanTest     func()
 	cleanSuite    func()
 	Ctx           context.Context
-	Graph         *graph.TestGraph
 }
 
 // SetupSuite implements suite.SetupAllSuite
@@ -69,8 +66,6 @@ func (s *DBTestSuite) SetupSuite() {
 // SetupTest implements suite.SetupTest
 func (s *DBTestSuite) SetupTest() {
 	s.cleanTest = cleaner.DeleteCreatedEntities(s.DB)
-	g := s.NewTestGraph()
-	s.Graph = &g
 }
 
 // TearDownTest implements suite.TearDownTest
@@ -81,7 +76,6 @@ func (s *DBTestSuite) TearDownTest() {
 	if s.Configuration.IsCleanTestDataEnabled() {
 		s.cleanTest()
 	}
-	s.Graph = nil
 }
 
 // PopulateDBTestSuite populates the DB with common values
@@ -119,7 +113,3 @@ func (s *DBTestSuite) DisableGormCallbacks() func() {
 		s.DB.Callback().Update().Register(gormCallbackName, oldUpdateCallback)
 	}
 }
-
-func (s *DBTestSuite) NewTestGraph() graph.TestGraph {
-	return graph.NewTestGraph(s.T(), s.Application, s.Ctx, s.DB)
-}

main.go

@@ -12,12 +12,12 @@ import (
 	"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/goamiddleware"
 	"github.com/fabric8-services/fabric8-cluster/jsonapi"
 	"github.com/fabric8-services/fabric8-cluster/migration"
 	"github.com/fabric8-services/fabric8-cluster/sentry"
-	"github.com/fabric8-services/fabric8-cluster/token"
+	"github.com/fabric8-services/fabric8-common/goamiddleware"
 	"github.com/fabric8-services/fabric8-common/log"
+	"github.com/fabric8-services/fabric8-common/token"
 
 	"github.com/goadesign/goa"
 	"github.com/goadesign/goa/logging/logrus"
@@ -149,7 +149,7 @@ func main() {
 	//appDB := gormapplication.NewGormDB(db, config)
 
 	// Setup Security
-	tokenManager, err := token.NewManager(config)
+	tokenManager, err := token.DefaultManager(config)
 	if err != nil {
 		log.Panic(nil, map[string]interface{}{
 			"err": err,

sentry/sentry.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/fabric8-services/fabric8-cluster/token"
 	"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"