From 176b915a93ff86e5a37a36b78b3b05eea20af716 Mon Sep 17 00:00:00 2001 From: bsoniam Date: Thu, 5 Sep 2019 18:10:50 +0200 Subject: [PATCH] fixup! fixup! Revert "[CLOUDTRUST-1502] Self service API" --- internal/keycloakb/eventsdbmodule_test.go | 6 +++--- pkg/management/component_test.go | 2 +- pkg/management/http_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/keycloakb/eventsdbmodule_test.go b/internal/keycloakb/eventsdbmodule_test.go index 8ba72cd0d..c6da9edc9 100644 --- a/internal/keycloakb/eventsdbmodule_test.go +++ b/internal/keycloakb/eventsdbmodule_test.go @@ -5,7 +5,7 @@ import ( "database/sql" "testing" - "github.com/cloudtrust/common-service/http" + errorhandler "github.com/cloudtrust/common-service/errors" api "github.com/cloudtrust/keycloak-bridge/api/events" "github.com/cloudtrust/keycloak-bridge/pkg/events/mock" "github.com/golang/mock/gomock" @@ -22,7 +22,7 @@ func TestModuleGetEvents(t *testing.T) { params := map[string]string{"origin": "origin-1", "max": "5"} var empty [0]api.AuditRepresentation var expectedResult = empty[:] - var expectedError error = http.CreateMissingParameterError("") + var expectedError error = errorhandler.CreateMissingParameterError("") var rows sql.Rows dbEvents.EXPECT().Query(gomock.Any(), params["origin"], nil, nil, nil, nil, nil, 0, params["max"]).Return(&rows, expectedError).Times(1) res, err := module.GetEvents(context.Background(), params) @@ -39,7 +39,7 @@ func TestModuleGetEventsSummary(t *testing.T) { module := NewEventsDBModule(dbEvents) var expectedResult api.EventSummaryRepresentation - var expectedError error = http.CreateMissingParameterError("") + var expectedError error = errorhandler.CreateMissingParameterError("") var rows sql.Rows dbEvents.EXPECT().Query(gomock.Any()).Return(&rows, expectedError).Times(1) res, err := module.GetEventsSummary(context.Background()) diff --git a/pkg/management/component_test.go b/pkg/management/component_test.go index c374e3da9..7e40aef87 100644 --- a/pkg/management/component_test.go +++ b/pkg/management/component_test.go @@ -11,7 +11,7 @@ import ( cs "github.com/cloudtrust/common-service" "github.com/cloudtrust/common-service/database" - commonhttp "github.com/cloudtrust/common-service/http" + commonhttp "github.com/cloudtrust/common-service/errors" "github.com/cloudtrust/common-service/log" api "github.com/cloudtrust/keycloak-bridge/api/management" "github.com/cloudtrust/keycloak-bridge/pkg/management/mock" diff --git a/pkg/management/http_test.go b/pkg/management/http_test.go index c3ec7507c..11b7610fc 100644 --- a/pkg/management/http_test.go +++ b/pkg/management/http_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - commonhttp "github.com/cloudtrust/common-service/http" + commonhttp "github.com/cloudtrust/common-service/errors" "github.com/cloudtrust/common-service/log" "github.com/cloudtrust/common-service/security" api "github.com/cloudtrust/keycloak-bridge/api/management"