Refactor authentication codebase (#689)

* ISSUE-646 first stage of refactoring Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 further refactoring of login controller / service Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 more refactoring of login controller / service Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 minor Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 remove login service Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 further refactoring Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed all auth provider service compiler errors, introduced oso subscription service Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added logout service, implementation to follow Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 moved account package Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored authorize endpoint Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored token package Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 cleanup Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed token package, started rewiring token controller Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 rewiring of token controller Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed token manager Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored link service, added link provider factory Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 improve docs Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored oauth providers further Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 few more fixes Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored token controller Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix test compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed a lot, lots still broken Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed more compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed all compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix test compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 updated configuration to remove keycloak Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed more test compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix test issues Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 updated openshift config Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 more configuration defaults Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix logout service to still call auth provider logout endpoint Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed test compiler errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed more tests Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added factories Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 test infrastructure improvements Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix more test compiler issues Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 testing framework enhancements Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 factory refinements Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 minor cleanup Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix import cycles Signed-off-by: Shane Bryzak <[email protected]> * lock fabric8-common and use renamed package * ISSUE-646 refactored factories package, renaming Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 test compiler issues Signed-off-by: Shane Bryzak <[email protected]> * fix authorize_black_box_test.go * fix login_blackbox_test.go * ISSUE-646 fix build errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 renamed auth provider config params Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed compile errors Signed-off-by: Shane Bryzak <[email protected]> * fix logout test convert to a "black box" test, using a DBTestSuite so that the controller can be initialized with a proper `application.Application` Signed-off-by: Xavier Coulon <[email protected]> * update env vars in openshift template Signed-off-by: Xavier Coulon <[email protected]> * fix token_blackbox_test - expect access and refresh token to be renewed - expect type to be `bearer` - expect failure if access token was signed by an unknown key Signed-off-by: Xavier Coulon <[email protected]> * fix test end to end login service * fix login service end to end tests * remove changes not needed for this fix * remove changes not needed for this fix * check cause * ISSUE-646 added service tests to logout controller test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added IdentityProviderFactory Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added dummy identity provider factory, fixed oauth2_blackbox_test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed servicecontext bug in gormapplication, fixed tests in auth provider service tests Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 refactored factory wrappers to fix broken behaviour, fixed another test, yay! Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 factories should only be accessible from the service layer. this causes a few additional issues during testing, for which i'm still working on a solution... Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed other factory-related stuff Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 simplified factory Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 minor Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed more tests... Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed authentication provider service tests Signed-off-by: Shane Bryzak <[email protected]> * fix link_service_blackbox_test.go * ISSUE-646 fixed more tests Signed-off-by: Shane Bryzak <[email protected]> * fix(#684): remove create wit user for first time login (#686) * remove create wit user for first time login * docs: add documents to create user in DB * docs: add info about rhd_used_id * docs: add shell script to create user * chore: fix typos * ISSUE-646 fixed one problem... Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed TestRetrieveOSOServiceAccountTokenInvalidOnForcePull Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed another test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed test compilation issue Signed-off-by: Shane Bryzak <[email protected]> * fix cluster service test and remove pointer on servicecontext.ServiceContext Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 fixed token_storage_blackbox_test.go Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed oso subscription tests Signed-off-by: Shane Bryzak <[email protected]> * fix 'bearer' in unit test Signed-off-by: Xavier Coulon <[email protected]> * allow for 'bearer' authororization type Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 fixed status test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed users_blackbox_test Signed-off-by: Shane Bryzak <[email protected]> * fix logout controller tests added a `referer` header arg in the design so it can be passed in the goa-generated test functions and retrieved from the controller context, which avoids custom test (boilerplate) code marked a test as "skipped" for now, until clarification is provided Signed-off-by: Xavier Coulon <[email protected]> * fix test * remove unwanted changes * fix controller.TokenBlackBoxTest/TestLinkCallbackRedirects Signed-off-by: Xavier Coulon <[email protected]> * fix compilation error :/ Signed-off-by: Xavier Coulon <[email protected]> * fix compilation error #2 :/ Signed-off-by: Xavier Coulon <[email protected]> * renaming functions and types Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 fixed TestExchangeWithCorrectCodeButNotApprovedUserOK Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed TestLinkOK Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed more tests Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed TestExchangeWithCorrectRefreshTokenOK Signed-off-by: Shane Bryzak <[email protected]> * fix TestExchangeWithCorrectCodeOK Signed-off-by: Xavier Coulon <[email protected]> * fix compilation errors on unit-tests Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 fix golangci-lint errors Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed login dir Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 merged changes from issue #698 Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed end to end test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 cleanup Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added user_profile_blackbox_test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 minor test change Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 minor Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 merge master Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added setup to user profile test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed go format Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed redundant function Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added support for empty factory wrappers at runtime Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go format Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added redirect URL to oauth code exchange Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix redirect url for login callback Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 format go code Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed unused param Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go format Signed-off-by: Shane Bryzak <[email protected]> * go fmt Signed-off-by: Xavier Coulon <[email protected]> * simplify code Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 added tests for resource type scope Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go format Signed-off-by: Shane Bryzak <[email protected]> * use DEFERRABLE constraints to clean the data after tests Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 re-add generated files Signed-off-by: Shane Bryzak <[email protected]> * apply review comments Signed-off-by: Xavier Coulon <[email protected]> * test the 'GetLastModified()' method on DefaultRoleMapping Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 removed update of oauth user profile Signed-off-by: Shane Bryzak <[email protected]> * remove empty deferred func Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 remove generated code Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 don't create new token managers Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 added test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed unused code Signed-off-by: Shane Bryzak <[email protected]> * make constraint explicitly 'DEFERRABLE INITIALLY IMMEDIATE' Signed-off-by: Xavier Coulon <[email protected]> * redirect to 'redirectURL' in case of error fix and test login/callback controller Signed-off-by: Xavier Coulon <[email protected]> * return 500 error when callback failed Signed-off-by: Xavier Coulon <[email protected]> * make sure preview account can be approved Signed-off-by: Xavier Coulon <[email protected]> * add deployment for cluster svc Signed-off-by: Xavier Coulon <[email protected]> * ISSUE-646 fixed golangci issues, fixed token blackbox test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 test relinking of external tokens Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 removed jwk functions Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 moved unused function Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 improved logging Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 renamed migration script Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 go fmt Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 put migration script in correct directory Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed migration test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 merged Alexey's PR, updated format to go 1.11 Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix migration test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 oops, fixed filename Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed resource roles test Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix golangci issues Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fix more golangci issue Signed-off-by: Shane Bryzak <[email protected]> * ISSUE-646 fixed review issues Signed-off-by: Shane Bryzak <[email protected]>
fabric8-services · Dec 9, 2018 · 3a44ba7 · 3a44ba7
1 parent 16c631f
commit 3a44ba7
Show file tree

Hide file tree

Showing 204 changed files with 6,770 additions and 7,365 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,9 +80,8 @@ migration/sqlbindata.go
 migration/sqlbindata_test.go
 configuration/confbindata.go
 wit/witservice
-account/tenant
+authentication/account/tenant
+test/generated
 test/service
 test/token/oauth
-test/login
-test/generated
-authentication/account
+test/login
diff --git a/.make/Makefile.dev b/.make/Makefile.dev
@@ -36,6 +36,22 @@ deploy-wit: deploy-wit-secrets deploy-wit-db
 	@echo "Deploying wit service"
 	@oc process -f $(TEMPLATE_DIR)/wit.app.yaml -o yaml | oc apply -f -
 
+.PHONY: deploy-cluster-config
+deploy-cluster-config:
+	oc process -f $(TEMPLATE_DIR)/cluster.config.yaml -o yaml | oc apply -f -
+
+.PHONY: deploy-cluster-db
+deploy-cluster-db:
+	@echo "Deploying cluster-db service using postgresql:${POSTGRESQL_VERSION}"
+	@oc process -f $(TEMPLATE_DIR)/cluster.db.yaml \
+		-p POSTGRESQL_VERSION=$(POSTGRESQL_VERSION) \
+		-o yaml | oc apply -f -
+
+.PHONY: deploy-cluster
+deploy-cluster: deploy-cluster-config deploy-cluster-db
+	@echo "Deploying cluster service"
+	@oc process -f $(TEMPLATE_DIR)/cluster.app.yaml -o yaml | oc apply -f -
+
 .PHONY: deploy-notification
 deploy-notification: deploy-notification-secrets
 	@echo "Deploying notification service"

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -5,24 +5,26 @@ ENV LANG=en_US.utf8
 ARG USE_GO_VERSION_FROM_WEBSITE=0
 
 # Some packages might seem weird but they are required by the RVM installer.
-RUN yum --enablerepo=centosplus install -y --quiet \
+RUN yum install epel-release --enablerepo=extras -y \
+    && yum --enablerepo=centosplus --enablerepo=epel-testing install -y \
       findutils \
       git \
-      $(test -z $USE_GO_VERSION_FROM_WEBSITE && echo "golang") \
+      $(test "$USE_GO_VERSION_FROM_WEBSITE" != 1 && echo "golang") \
       make \
       procps-ng \
       tar \
       wget \
       which \
     && yum clean all
 
-RUN test -n $USE_GO_VERSION_FROM_WEBSITE \
+RUN if [[ "$USE_GO_VERSION_FROM_WEBSITE" = 1 ]]; then cd /tmp \
     && cd /tmp \
     && wget https://dl.google.com/go/go1.11.1.linux-amd64.tar.gz \
     && echo "2871270d8ff0c8c69f161aaae42f9f28739855ff5c5204752a8d92a1c9f63993  go1.11.1.linux-amd64.tar.gz" > checksum \
     && sha256sum -c checksum \
     && tar -C /usr/local -xzf go1.11.1.linux-amd64.tar.gz \
-    && rm -f go1.11.1.linux-amd64.tar.gz
+    && rm -f go1.11.1.linux-amd64.tar.gz; \
+    fi
 ENV PATH=$PATH:/usr/local/go/bin
 
 # Get dep for Go package management and make sure the directory has full rwz permissions for non-root users

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -109,6 +109,10 @@ required = [
   name = "github.com/fabric8-services/fabric8-cluster"
   revision = "edd01596bbe1dabf0f66b6dc431b4b88b35692b8"
 
+[[constraint]]
+  name = "github.com/fabric8-services/fabric8-common"
+  revision = "7a49685a8135c385898dff8f46277a508eaf6cc5"
+
 [[constraint]]
   name = "github.com/jstemmer/go-junit-report"
   revision = "1ce4b93a20c6a280a7d5c1ef38c44d0d8c6d80ea"

diff --git a/Makefile b/Makefile
@@ -153,11 +153,13 @@ $(MINIMOCK_BIN):
 generate-minimock: deps $(MINIMOCK_BIN) ## Generate Minimock sources. Only necessary after clean or if changes occurred in interfaces.
 	@echo "Generating mocks..."
 	@-mkdir -p test/service
-	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/application/service.NotificationService,github.com/fabric8-services/fabric8-auth/application/service.WITService,github.com/fabric8-services/fabric8-auth/application/service.ClusterService -o ./test/service/ -s ".go"
+	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/application/service.NotificationService,github.com/fabric8-services/fabric8-auth/application/service.WITService,github.com/fabric8-services/fabric8-auth/application/service.ClusterService,github.com/fabric8-services/fabric8-auth/application/service.AuthenticationProviderService -o ./test/service/ -s ".go"
 	@-mkdir -p test/token/oauth
-	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/token/oauth.IdentityProvider -o ./test/token/oauth/ -s ".go"
-	@-mkdir -p test/login
-	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/login.KeycloakOAuthService -o ./test/login/ -s ".go"
+	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/authentication/provider.IdentityProvider -o ./test/token/oauth/ -s ".go"
+	@-mkdir -p test/generated/authorization/token/manager
+	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/authorization/token/manager.TokenManagerConfiguration -o ./test/generated/authorization/token/manager/ -s ".go"
+	@-mkdir -p test/generated/application/service
+	@$(MINIMOCK_BIN) -i github.com/fabric8-services/fabric8-auth/application/service.AuthenticationProviderService -o ./test/generated/application/service/ -s ".go"
 
 .PHONY: generate-client
 generate-client: $(GOAGEN_BIN)
@@ -247,11 +249,12 @@ clean-generated:
 	-rm -f ./migration/sqlbindata_test.go
 	-rm -f ./configuration/confbindata.go
 	-rm -rf wit/witservice
-	-rm -rf ./account/tenant
+	-rm -rf ./authentication/account/tenant
 	-rm -rf ./test/service
 	-rm -rf ./notification/client
 	-rm -rf ./cluster/client
 	-rm -rf ./test/token/oauth
+	-rm -rf ./test/generated
 
 CLEAN_TARGETS += clean-vendor
 .PHONY: clean-vendor
@@ -291,7 +294,7 @@ app/controllers.go: $(DESIGNS) $(GOAGEN_BIN) $(VENDOR_DIR)
 	$(GOAGEN_BIN) client -d ${PACKAGE_NAME}/${DESIGN_DIR}
 	$(GOAGEN_BIN) swagger -d ${PACKAGE_NAME}/${DESIGN_DIR}
 	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-wit/design --notool --pkg witservice -o wit
-	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-tenant/design --notool --pkg tenant -o account
+	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-tenant/design --notool --pkg tenant -o authentication/account
 	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-notification/design --notool --pkg client -o notification
 	$(GOAGEN_BIN) client -d github.com/fabric8-services/fabric8-cluster/design --notool --pkg client -o cluster
 

diff --git a/README.adoc b/README.adoc
@@ -280,7 +280,7 @@ curl -X POST http://localhost:8089/api/token -H 'Content-Type: application/json'
 You will receive response like follow:
 ```json
 {"access_token":"eyJhbGciOiJSUzI1NiIsImtpZCI6IjlNTG5WaWFSa2hWajFHVDlrcFdVa3dISXdVRC13WmZVeFItM0Nwa0UtWHMiLCJ0eXAiOiJKV1QifQ.eyJpYXQiOjE1Mzg2NTYwMTYsImlzcyI6Imh0dHA6Ly9sb2NhbGhvc3QiLCJqdGkiOiI0MjA1NGE4MS1jNjdlLTQ0MGQtYjQ1My1kNzkwNmM3ZjE5MDQiLCJzY29wZXMiOlsidW1hX3Byb3RlY3Rpb24iXSwic2VydmljZV9hY2NvdW50bmFtZSI6Im9ubGluZS1yZWdpc3RyYXRpb24iLCJzdWIiOiJmODY3ZWM3Mi0zMTcxLTRiOGYtOGVlYy05MGEzMmVhYjZlMGIifQ.esAmoXFhkHq02-ABf22FHZtO7ytfNzmMHPoAYwsDYYVQ5thPyXPNTWXnhHu4bV0rACnf7R5oa3oIl14DhyPSTMjAN_qZZlWQC2qjhMEOBSbss_hW5BkYwU67YBhkHt_eYgfVuoAgi7SuMu5KucaBIMNBEpYrDXR6G9Q2qk3jq4tV4qbTaQ6P078pdfYKT2ue_eGbSEvUN4G33tTzI-TX6UrR3mi-jsavLkRGAPUZmvdIVigHMi-KM1oilw7IB24FB6rd4AMuD1OVhgV-r9qrA3MDdLP6mS_t09D30ROAoymJEy44OvbmdVo0XAQRD6_JyzHhK-YrAGN-39C5BDBeFw",
- "token_type":"bearer"
+ "token_type":"Bearer"
 }
 ```
 

diff --git a/account/service/user.go b/account/service/user.go
diff --git a/application/application_db_calls_bench_test.go b/application/application_db_calls_bench_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/fabric8-services/fabric8-auth/migration"
 	testsupport "github.com/fabric8-services/fabric8-auth/test"
 
-	account "github.com/fabric8-services/fabric8-auth/account/repository"
+	account "github.com/fabric8-services/fabric8-auth/authentication/account/repository"
 	"github.com/jinzhu/gorm"
 	uuid "github.com/satori/go.uuid"
 )
@@ -61,7 +61,7 @@ func (s *BenchDbOperations) SetupBenchmark() {
 	s.identity = &account.Identity{
 		ID:           uuid.NewV4(),
 		Username:     "BenchmarkTestIdentity",
-		ProviderType: account.KeycloakIDP}
+		ProviderType: account.DefaultIDP}
 
 	err := s.repo.Create(s.ctx, s.identity)
 	if err != nil {