-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CLOUDTRUST-2375] Add middleware to enable feature according to reaml conf. #41
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
package configuration | ||
|
||
//go:generate mockgen -destination=./mock/cloudtrustdb.go -package=mock -mock_names=CloudtrustDB=CloudtrustDB,SQLRow=SQLRow github.com/cloudtrust/common-service/database/sqltypes CloudtrustDB,SQLRow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
package configuration | ||
|
||
import ( | ||
"context" | ||
"database/sql" | ||
"errors" | ||
"testing" | ||
|
||
"github.com/cloudtrust/common-service/configuration/mock" | ||
"github.com/cloudtrust/common-service/log" | ||
"github.com/golang/mock/gomock" | ||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestGetConfiguration(t *testing.T) { | ||
var mockCtrl = gomock.NewController(t) | ||
defer mockCtrl.Finish() | ||
|
||
var mockDB = mock.NewCloudtrustDB(mockCtrl) | ||
var mockSQLRow = mock.NewSQLRow(mockCtrl) | ||
var logger = log.NewNopLogger() | ||
|
||
var realmID = "myrealm" | ||
var ctx = context.TODO() | ||
var module = NewConfigurationReaderDBModule(mockDB, logger) | ||
|
||
t.Run("SQL error", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).Return(errors.New("SQL error")) | ||
var _, err = module.GetConfiguration(ctx, realmID) | ||
assert.NotNil(t, err) | ||
}) | ||
t.Run("SQL No row", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).Return(sql.ErrNoRows) | ||
var _, err = module.GetConfiguration(ctx, realmID) | ||
assert.NotNil(t, err) | ||
}) | ||
t.Run("Success", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).DoAndReturn(func(ptrConfig *string) error { | ||
*ptrConfig = `{}` | ||
return nil | ||
}) | ||
var _, err = module.GetConfiguration(ctx, realmID) | ||
assert.Nil(t, err) | ||
}) | ||
} | ||
|
||
func TestGetAdminConfiguration(t *testing.T) { | ||
var mockCtrl = gomock.NewController(t) | ||
defer mockCtrl.Finish() | ||
|
||
var mockDB = mock.NewCloudtrustDB(mockCtrl) | ||
var mockSQLRow = mock.NewSQLRow(mockCtrl) | ||
var logger = log.NewNopLogger() | ||
|
||
var realmID = "myrealm" | ||
var ctx = context.TODO() | ||
var module = NewConfigurationReaderDBModule(mockDB, logger) | ||
|
||
t.Run("SQL error", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).Return(errors.New("SQL error")) | ||
var _, err = module.GetAdminConfiguration(ctx, realmID) | ||
assert.NotNil(t, err) | ||
}) | ||
t.Run("SQL No row", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).Return(sql.ErrNoRows) | ||
var _, err = module.GetAdminConfiguration(ctx, realmID) | ||
assert.NotNil(t, err) | ||
}) | ||
t.Run("Success", func(t *testing.T) { | ||
mockDB.EXPECT().QueryRow(gomock.Any(), realmID).Return(mockSQLRow) | ||
mockSQLRow.EXPECT().Scan(gomock.Any()).DoAndReturn(func(ptrConfig *string) error { | ||
*ptrConfig = `{}` | ||
return nil | ||
}) | ||
var _, err = module.GetAdminConfiguration(ctx, realmID) | ||
assert.Nil(t, err) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need this abstraction ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because implementation is done in keycloak-client and keycloak-client refers to common-service... So we should not add a reference to keycloak-client in this library