Skip to content

Commit ccaaa21

Browse files
reivaj05reivaj05
authored
Move adminClientMock methods to single file (#2583)
1 parent 0595ec1 commit ccaaa21

24 files changed

+444
-515
lines changed

‎restapi/admin_arns_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737

3838
func TestArnsList(t *testing.T) {
3939
assert := asrt.New(t)
40-
adminClient := adminClientMock{}
40+
adminClient := AdminClientMock{}
4141
// Test-1 : getArns() returns proper arn list
4242
minioServerInfoMock = func(ctx context.Context) (madmin.InfoMessage, error) {
4343
return madmin.InfoMessage{

‎restapi/admin_client_mock.go

Lines changed: 387 additions & 0 deletions
Large diffs are not rendered by default.

‎restapi/admin_config_test.go

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,9 @@ const (
4040
PostgresQueueLimit = "queue_limit"
4141
)
4242

43-
// assigning mock at runtime instead of compile time
44-
var minioHelpConfigKVMock func(subSys, key string, envOnly bool) (madmin.Help, error)
45-
46-
var (
47-
minioGetConfigKVMock func(key string) ([]byte, error)
48-
minioSetConfigKVMock func(kv string) (restart bool, err error)
49-
minioDelConfigKVMock func(name string) (err error)
50-
)
51-
52-
// mock function helpConfigKV()
53-
func (ac adminClientMock) helpConfigKV(ctx context.Context, subSys, key string, envOnly bool) (madmin.Help, error) {
54-
return minioHelpConfigKVMock(subSys, key, envOnly)
55-
}
56-
57-
// mock function getConfigKV()
58-
func (ac adminClientMock) getConfigKV(ctx context.Context, name string) ([]byte, error) {
59-
return minioGetConfigKVMock(name)
60-
}
61-
62-
// mock function setConfigKV()
63-
func (ac adminClientMock) setConfigKV(ctx context.Context, kv string) (restart bool, err error) {
64-
return minioSetConfigKVMock(kv)
65-
}
66-
67-
func (ac adminClientMock) delConfigKV(ctx context.Context, name string) (err error) {
68-
return minioDelConfigKVMock(name)
69-
}
70-
7143
func TestListConfig(t *testing.T) {
7244
assert := assert.New(t)
73-
adminClient := adminClientMock{}
45+
adminClient := AdminClientMock{}
7446
function := "listConfig()"
7547
// Test-1 : listConfig() get list of two configurations and ensure is output correctly
7648
configListMock := []madmin.HelpKV{
@@ -119,7 +91,7 @@ func TestListConfig(t *testing.T) {
11991

12092
func TestSetConfig(t *testing.T) {
12193
assert := assert.New(t)
122-
adminClient := adminClientMock{}
94+
adminClient := AdminClientMock{}
12395
function := "setConfig()"
12496
// mock function response from setConfig()
12597
minioSetConfigKVMock = func(kv string) (restart bool, err error) {
@@ -169,7 +141,7 @@ func TestSetConfig(t *testing.T) {
169141

170142
func TestDelConfig(t *testing.T) {
171143
assert := assert.New(t)
172-
adminClient := adminClientMock{}
144+
adminClient := AdminClientMock{}
173145
function := "resetConfig()"
174146
// mock function response from setConfig()
175147
minioDelConfigKVMock = func(name string) (err error) {
@@ -258,7 +230,7 @@ func Test_buildConfig(t *testing.T) {
258230

259231
func Test_setConfigWithARN(t *testing.T) {
260232
assert := assert.New(t)
261-
client := adminClientMock{}
233+
client := AdminClientMock{}
262234

263235
type args struct {
264236
ctx context.Context
@@ -369,7 +341,7 @@ func Test_setConfigWithARN(t *testing.T) {
369341
}
370342

371343
func Test_getConfig(t *testing.T) {
372-
client := adminClientMock{}
344+
client := AdminClientMock{}
373345
type args struct {
374346
client MinioAdmin
375347
name string

‎restapi/admin_console_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,9 @@ import (
2626
"github.com/stretchr/testify/assert"
2727
)
2828

29-
// assigning mock at runtime instead of compile time
30-
var minioGetLogsMock func(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo
31-
32-
// mock function of listPolicies()
33-
func (ac adminClientMock) getLogs(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo {
34-
return minioGetLogsMock(ctx, node, lineCnt, logKind)
35-
}
36-
3729
func TestAdminConsoleLog(t *testing.T) {
3830
assert := assert.New(t)
39-
adminClient := adminClientMock{}
31+
adminClient := AdminClientMock{}
4032
mockWSConn := mockConn{}
4133
function := "startConsoleLog(ctx, )"
4234
ctx, cancel := context.WithCancel(context.Background())

‎restapi/admin_groups_test.go

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,9 @@ import (
2828
"github.com/stretchr/testify/assert"
2929
)
3030

31-
// assigning mock at runtime instead of compile time
32-
var minioListGroupsMock func() ([]string, error)
33-
34-
var (
35-
minioUpdateGroupMembersMock func(madmin.GroupAddRemove) error
36-
minioGetGroupDescriptionMock func(group string) (*madmin.GroupDesc, error)
37-
minioSetGroupStatusMock func(group string, status madmin.GroupStatus) error
38-
)
39-
40-
// mock function of listGroups()
41-
func (ac adminClientMock) listGroups(ctx context.Context) ([]string, error) {
42-
return minioListGroupsMock()
43-
}
44-
45-
// mock function of updateGroupMembers()
46-
func (ac adminClientMock) updateGroupMembers(ctx context.Context, req madmin.GroupAddRemove) error {
47-
return minioUpdateGroupMembersMock(req)
48-
}
49-
50-
// mock function of getGroupDescription()
51-
func (ac adminClientMock) getGroupDescription(ctx context.Context, group string) (*madmin.GroupDesc, error) {
52-
return minioGetGroupDescriptionMock(group)
53-
}
54-
55-
// mock function setGroupStatus()
56-
func (ac adminClientMock) setGroupStatus(ctx context.Context, group string, status madmin.GroupStatus) error {
57-
return minioSetGroupStatusMock(group, status)
58-
}
59-
6031
func TestListGroups(t *testing.T) {
6132
assert := assert.New(t)
62-
adminClient := adminClientMock{}
33+
adminClient := AdminClientMock{}
6334
ctx, cancel := context.WithCancel(context.Background())
6435
defer cancel()
6536
// Test-1 : listGroups() Get response from minio client with two Groups and return the same number on listGroups()
@@ -95,7 +66,7 @@ func TestListGroups(t *testing.T) {
9566

9667
func TestAddGroup(t *testing.T) {
9768
assert := assert.New(t)
98-
adminClient := adminClientMock{}
69+
adminClient := AdminClientMock{}
9970
ctx, cancel := context.WithCancel(context.Background())
10071
defer cancel()
10172
// Test-1 : addGroup() add a new group with two members
@@ -122,7 +93,7 @@ func TestAddGroup(t *testing.T) {
12293

12394
func TestRemoveGroup(t *testing.T) {
12495
assert := assert.New(t)
125-
adminClient := adminClientMock{}
96+
adminClient := AdminClientMock{}
12697
ctx, cancel := context.WithCancel(context.Background())
12798
defer cancel()
12899
// Test-1 : removeGroup() remove group assume it has no members
@@ -147,7 +118,7 @@ func TestRemoveGroup(t *testing.T) {
147118

148119
func TestGroupInfo(t *testing.T) {
149120
assert := assert.New(t)
150-
adminClient := adminClientMock{}
121+
adminClient := AdminClientMock{}
151122
ctx, cancel := context.WithCancel(context.Background())
152123
defer cancel()
153124
// Test-1 : groupInfo() get group info
@@ -184,7 +155,7 @@ func TestGroupInfo(t *testing.T) {
184155

185156
func TestUpdateGroup(t *testing.T) {
186157
assert := assert.New(t)
187-
adminClient := adminClientMock{}
158+
adminClient := AdminClientMock{}
188159
ctx, cancel := context.WithCancel(context.Background())
189160
defer cancel()
190161
// Test-1 : addOrDeleteMembers() update group members add user3 and delete user2
@@ -280,7 +251,7 @@ func TestUpdateGroup(t *testing.T) {
280251

281252
func TestSetGroupStatus(t *testing.T) {
282253
assert := assert.New(t)
283-
adminClient := adminClientMock{}
254+
adminClient := AdminClientMock{}
284255
function := "setGroupStatus()"
285256
groupName := "acmeGroup"
286257
ctx, cancel := context.WithCancel(context.Background())

‎restapi/admin_heal_test.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,10 @@ import (
2929
"github.com/stretchr/testify/assert"
3030
)
3131

32-
// assigning mock at runtime instead of compile time
33-
var minioHealMock func(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
34-
forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error)
35-
36-
func (ac adminClientMock) heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
37-
forceStart, forceStop bool,
38-
) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
39-
return minioHealMock(ctx, bucket, prefix, healOpts, clientToken, forceStart, forceStop)
40-
}
41-
4232
func TestHeal(t *testing.T) {
4333
assert := assert.New(t)
4434

45-
client := adminClientMock{}
35+
client := AdminClientMock{}
4636
mockWSConn := mockConn{}
4737
ctx, cancel := context.WithCancel(context.Background())
4838
defer cancel()

‎restapi/admin_health_info_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,12 @@ import (
2727
madmin "github.com/minio/madmin-go/v2"
2828
)
2929

30-
// assigning mock at runtime instead of compile time
31-
var minioServerHealthInfoMock func(ctx context.Context, healthDataTypes []madmin.HealthDataType, deadline time.Duration) (interface{}, string, error)
32-
33-
// mock function serverHealthInfo
34-
func (ac adminClientMock) serverHealthInfo(ctx context.Context, healthDataTypes []madmin.HealthDataType, deadline time.Duration) (interface{}, string, error) {
35-
return minioServerHealthInfoMock(ctx, healthDataTypes, deadline)
36-
}
37-
3830
func Test_serverHealthInfo(t *testing.T) {
3931
var testReceiver chan madmin.HealthInfo
4032

4133
ctx, cancel := context.WithCancel(context.Background())
4234
defer cancel()
43-
client := adminClientMock{}
35+
client := AdminClientMock{}
4436
mockWSConn := mockConn{}
4537
deadlineDuration, _ := time.ParseDuration("1h")
4638

‎restapi/admin_idp_test.go

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,22 @@ import (
2626
"github.com/minio/console/models"
2727
"github.com/minio/console/restapi/operations"
2828
"github.com/minio/console/restapi/operations/idp"
29-
"github.com/minio/madmin-go/v2"
3029
"github.com/stretchr/testify/assert"
3130
"github.com/stretchr/testify/suite"
3231
)
3332

34-
func (ac adminClientMock) addOrUpdateIDPConfig(ctx context.Context, idpType, cfgName, cfgData string, update bool) (restart bool, err error) {
35-
return true, nil
36-
}
37-
38-
func (ac adminClientMock) listIDPConfig(ctx context.Context, idpType string) ([]madmin.IDPListItem, error) {
39-
return []madmin.IDPListItem{{Name: "mock"}}, nil
40-
}
41-
42-
func (ac adminClientMock) deleteIDPConfig(ctx context.Context, idpType, cfgName string) (restart bool, err error) {
43-
return true, nil
44-
}
45-
46-
func (ac adminClientMock) getIDPConfig(ctx context.Context, cfgType, cfgName string) (c madmin.IDPConfig, err error) {
47-
return madmin.IDPConfig{Info: []madmin.IDPCfgInfo{{Key: "mock", Value: "mock"}}}, nil
48-
}
49-
5033
type IDPTestSuite struct {
5134
suite.Suite
5235
assert *assert.Assertions
5336
currentServer string
5437
isServerSet bool
5538
server *httptest.Server
56-
adminClient adminClientMock
39+
adminClient AdminClientMock
5740
}
5841

5942
func (suite *IDPTestSuite) SetupSuite() {
6043
suite.assert = assert.New(suite.T())
61-
suite.adminClient = adminClientMock{}
44+
suite.adminClient = AdminClientMock{}
6245
minioServiceRestartMock = func(ctx context.Context) error {
6346
return nil
6447
}

‎restapi/admin_info_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ type AdminInfoTestSuite struct {
3838
isServerSet bool
3939
isPrometheusRequest bool
4040
server *httptest.Server
41-
adminClient adminClientMock
41+
adminClient AdminClientMock
4242
}
4343

4444
func (suite *AdminInfoTestSuite) SetupSuite() {
4545
suite.assert = assert.New(suite.T())
46-
suite.adminClient = adminClientMock{}
46+
suite.adminClient = AdminClientMock{}
4747
minioServerInfoMock = func(ctx context.Context) (madmin.InfoMessage, error) {
4848
return madmin.InfoMessage{
4949
Servers: []madmin.ServerProperties{{

‎restapi/admin_kms_test.go

Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -26,107 +26,22 @@ import (
2626
"github.com/minio/console/models"
2727
"github.com/minio/console/restapi/operations"
2828
kmsAPI "github.com/minio/console/restapi/operations/k_m_s"
29-
"github.com/minio/madmin-go/v2"
3029
"github.com/stretchr/testify/assert"
3130
"github.com/stretchr/testify/suite"
3231
)
3332

34-
func (ac adminClientMock) kmsStatus(ctx context.Context) (madmin.KMSStatus, error) {
35-
return madmin.KMSStatus{Name: "name", DefaultKeyID: "key", Endpoints: map[string]madmin.ItemState{"localhost": madmin.ItemState("online")}}, nil
36-
}
37-
38-
func (ac adminClientMock) kmsAPIs(ctx context.Context) ([]madmin.KMSAPI, error) {
39-
return []madmin.KMSAPI{{Method: "GET", Path: "/mock"}}, nil
40-
}
41-
42-
func (ac adminClientMock) kmsMetrics(ctx context.Context) (*madmin.KMSMetrics, error) {
43-
return &madmin.KMSMetrics{}, nil
44-
}
45-
46-
func (ac adminClientMock) kmsVersion(ctx context.Context) (*madmin.KMSVersion, error) {
47-
return &madmin.KMSVersion{Version: "test-version"}, nil
48-
}
49-
50-
func (ac adminClientMock) createKey(ctx context.Context, key string) error {
51-
return nil
52-
}
53-
54-
func (ac adminClientMock) importKey(ctx context.Context, key string, content []byte) error {
55-
return nil
56-
}
57-
58-
func (ac adminClientMock) listKeys(ctx context.Context, pattern string) ([]madmin.KMSKeyInfo, error) {
59-
return []madmin.KMSKeyInfo{{
60-
Name: "name",
61-
CreatedBy: "by",
62-
}}, nil
63-
}
64-
65-
func (ac adminClientMock) keyStatus(ctx context.Context, key string) (*madmin.KMSKeyStatus, error) {
66-
return &madmin.KMSKeyStatus{KeyID: "key"}, nil
67-
}
68-
69-
func (ac adminClientMock) deleteKey(ctx context.Context, key string) error {
70-
return nil
71-
}
72-
73-
func (ac adminClientMock) setKMSPolicy(ctx context.Context, policy string, content []byte) error {
74-
return nil
75-
}
76-
77-
func (ac adminClientMock) assignPolicy(ctx context.Context, policy string, content []byte) error {
78-
return nil
79-
}
80-
81-
func (ac adminClientMock) describePolicy(ctx context.Context, policy string) (*madmin.KMSDescribePolicy, error) {
82-
return &madmin.KMSDescribePolicy{Name: "name"}, nil
83-
}
84-
85-
func (ac adminClientMock) getKMSPolicy(ctx context.Context, policy string) (*madmin.KMSPolicy, error) {
86-
return &madmin.KMSPolicy{Allow: []string{""}, Deny: []string{""}}, nil
87-
}
88-
89-
func (ac adminClientMock) listKMSPolicies(ctx context.Context, pattern string) ([]madmin.KMSPolicyInfo, error) {
90-
return []madmin.KMSPolicyInfo{{
91-
Name: "name",
92-
CreatedBy: "by",
93-
}}, nil
94-
}
95-
96-
func (ac adminClientMock) deletePolicy(ctx context.Context, policy string) error {
97-
return nil
98-
}
99-
100-
func (ac adminClientMock) describeIdentity(ctx context.Context, identity string) (*madmin.KMSDescribeIdentity, error) {
101-
return &madmin.KMSDescribeIdentity{}, nil
102-
}
103-
104-
func (ac adminClientMock) describeSelfIdentity(ctx context.Context) (*madmin.KMSDescribeSelfIdentity, error) {
105-
return &madmin.KMSDescribeSelfIdentity{
106-
Policy: &madmin.KMSPolicy{Allow: []string{}, Deny: []string{}},
107-
}, nil
108-
}
109-
110-
func (ac adminClientMock) deleteIdentity(ctx context.Context, identity string) error {
111-
return nil
112-
}
113-
114-
func (ac adminClientMock) listIdentities(ctx context.Context, pattern string) ([]madmin.KMSIdentityInfo, error) {
115-
return []madmin.KMSIdentityInfo{{Identity: "identity"}}, nil
116-
}
117-
11833
type KMSTestSuite struct {
11934
suite.Suite
12035
assert *assert.Assertions
12136
currentServer string
12237
isServerSet bool
12338
server *httptest.Server
124-
adminClient adminClientMock
39+
adminClient AdminClientMock
12540
}
12641

12742
func (suite *KMSTestSuite) SetupSuite() {
12843
suite.assert = assert.New(suite.T())
129-
suite.adminClient = adminClientMock{}
44+
suite.adminClient = AdminClientMock{}
13045
}
13146

13247
func (suite *KMSTestSuite) SetupTest() {

0 commit comments

Comments
 (0)