Skip to content

Commit 71b1b70

Browse files
authored
Clean-up after PR 3509 (#3517)
1 parent 63c6d89 commit 71b1b70

15 files changed

+214
-1787
lines changed

api/admin_client_mock.go

+3-317
Original file line numberDiff line numberDiff line change
@@ -18,332 +18,18 @@ package api
1818

1919
import (
2020
"context"
21-
"io"
22-
"time"
2321

2422
"github.com/minio/madmin-go/v3"
25-
iampolicy "github.com/minio/pkg/v3/policy"
2623
)
2724

28-
type AdminClientMock struct{}
29-
30-
var (
31-
MinioServerInfoMock func(ctx context.Context) (madmin.InfoMessage, error)
32-
minioChangePasswordMock func(ctx context.Context, accessKey, secretKey string) error
33-
34-
minioHelpConfigKVMock func(subSys, key string, envOnly bool) (madmin.Help, error)
35-
minioGetConfigKVMock func(key string) ([]byte, error)
36-
minioSetConfigKVMock func(kv string) (restart bool, err error)
37-
minioDelConfigKVMock func(name string) (err error)
38-
minioHelpConfigKVGlobalMock func(envOnly bool) (madmin.Help, error)
39-
40-
minioGetLogsMock func(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo
41-
42-
minioListGroupsMock func() ([]string, error)
43-
minioUpdateGroupMembersMock func(madmin.GroupAddRemove) error
44-
minioGetGroupDescriptionMock func(group string) (*madmin.GroupDesc, error)
45-
minioSetGroupStatusMock func(group string, status madmin.GroupStatus) error
46-
47-
minioHealMock func(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
48-
forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error)
49-
50-
minioServerHealthInfoMock func(ctx context.Context, deadline time.Duration) (interface{}, string, error)
51-
52-
minioListPoliciesMock func() (map[string]*iampolicy.Policy, error)
53-
minioGetPolicyMock func(name string) (*iampolicy.Policy, error)
54-
minioRemovePolicyMock func(name string) error
55-
minioAddPolicyMock func(name string, policy *iampolicy.Policy) error
56-
minioSetPolicyMock func(policyName, entityName string, isGroup bool) error
57-
58-
minioStartProfiling func(profiler madmin.ProfilerType, duration time.Duration) (io.ReadCloser, error)
59-
60-
minioServiceRestartMock func(ctx context.Context) error
61-
62-
getSiteReplicationInfo func(ctx context.Context) (*madmin.SiteReplicationInfo, error)
63-
addSiteReplicationInfo func(ctx context.Context, sites []madmin.PeerSite) (*madmin.ReplicateAddStatus, error)
64-
editSiteReplicationInfo func(ctx context.Context, site madmin.PeerInfo) (*madmin.ReplicateEditStatus, error)
65-
deleteSiteReplicationInfoMock func(ctx context.Context, removeReq madmin.SRRemoveReq) (*madmin.ReplicateRemoveStatus, error)
66-
getSiteReplicationStatus func(ctx context.Context, params madmin.SRStatusOptions) (*madmin.SRStatusInfo, error)
67-
68-
minioListTiersMock func(ctx context.Context) ([]*madmin.TierConfig, error)
69-
minioTierStatsMock func(ctx context.Context) ([]madmin.TierInfo, error)
70-
minioAddTiersMock func(ctx context.Context, tier *madmin.TierConfig) error
71-
minioRemoveTierMock func(ctx context.Context, tierName string) error
72-
minioEditTiersMock func(ctx context.Context, tierName string, creds madmin.TierCreds) error
73-
minioVerifyTierStatusMock func(ctx context.Context, tierName string) error
74-
75-
minioServiceTraceMock func(ctx context.Context, threshold int64, s3, internal, storage, os, errTrace bool) <-chan madmin.ServiceTraceInfo
76-
77-
minioListUsersMock func() (map[string]madmin.UserInfo, error)
78-
minioAddUserMock func(accessKey, secreyKey string) error
79-
minioRemoveUserMock func(accessKey string) error
80-
minioGetUserInfoMock func(accessKey string) (madmin.UserInfo, error)
81-
minioSetUserStatusMock func(accessKey string, status madmin.AccountStatus) error
82-
83-
minioAccountInfoMock func(ctx context.Context) (madmin.AccountInfo, error)
84-
minioAddServiceAccountMock func(ctx context.Context, policy string, user string, accessKey string, secretKey string, description string, name string, expiry *time.Time, status string) (madmin.Credentials, error)
85-
minioListServiceAccountsMock func(ctx context.Context, user string) (madmin.ListServiceAccountsResp, error)
86-
minioDeleteServiceAccountMock func(ctx context.Context, serviceAccount string) error
87-
minioInfoServiceAccountMock func(ctx context.Context, serviceAccount string) (madmin.InfoServiceAccountResp, error)
88-
minioUpdateServiceAccountMock func(ctx context.Context, serviceAccount string, opts madmin.UpdateServiceAccountReq) error
89-
minioGetLDAPPolicyEntitiesMock func(ctx context.Context, query madmin.PolicyEntitiesQuery) (madmin.PolicyEntitiesResult, error)
90-
91-
minioListRemoteBucketsMock func(ctx context.Context, bucket, arnType string) (targets []madmin.BucketTarget, err error)
92-
minioGetRemoteBucketMock func(ctx context.Context, bucket, arnType string) (targets *madmin.BucketTarget, err error)
93-
minioAddRemoteBucketMock func(ctx context.Context, bucket string, target *madmin.BucketTarget) (string, error)
94-
)
95-
96-
func (ac AdminClientMock) serverInfo(ctx context.Context) (madmin.InfoMessage, error) {
97-
return MinioServerInfoMock(ctx)
98-
}
99-
100-
func (ac AdminClientMock) listRemoteBuckets(ctx context.Context, bucket, arnType string) (targets []madmin.BucketTarget, err error) {
101-
return minioListRemoteBucketsMock(ctx, bucket, arnType)
102-
}
103-
104-
func (ac AdminClientMock) getRemoteBucket(ctx context.Context, bucket, arnType string) (targets *madmin.BucketTarget, err error) {
105-
return minioGetRemoteBucketMock(ctx, bucket, arnType)
106-
}
107-
108-
func (ac AdminClientMock) removeRemoteBucket(_ context.Context, _, _ string) error {
109-
return nil
110-
}
111-
112-
func (ac AdminClientMock) addRemoteBucket(ctx context.Context, bucket string, target *madmin.BucketTarget) (string, error) {
113-
return minioAddRemoteBucketMock(ctx, bucket, target)
114-
}
115-
116-
func (ac AdminClientMock) changePassword(ctx context.Context, accessKey, secretKey string) error {
117-
return minioChangePasswordMock(ctx, accessKey, secretKey)
118-
}
119-
120-
func (ac AdminClientMock) speedtest(_ context.Context, _ madmin.SpeedtestOpts) (chan madmin.SpeedTestResult, error) {
121-
return nil, nil
122-
}
123-
124-
func (ac AdminClientMock) verifyTierStatus(ctx context.Context, tier string) error {
125-
return minioVerifyTierStatusMock(ctx, tier)
126-
}
127-
128-
// mock function helpConfigKV()
129-
func (ac AdminClientMock) helpConfigKV(_ context.Context, subSys, key string, envOnly bool) (madmin.Help, error) {
130-
return minioHelpConfigKVMock(subSys, key, envOnly)
131-
}
132-
133-
// mock function getConfigKV()
134-
func (ac AdminClientMock) getConfigKV(_ context.Context, name string) ([]byte, error) {
135-
return minioGetConfigKVMock(name)
136-
}
137-
138-
// mock function setConfigKV()
139-
func (ac AdminClientMock) setConfigKV(_ context.Context, kv string) (restart bool, err error) {
140-
return minioSetConfigKVMock(kv)
141-
}
142-
143-
// mock function helpConfigKV()
144-
func (ac AdminClientMock) helpConfigKVGlobal(_ context.Context, envOnly bool) (madmin.Help, error) {
145-
return minioHelpConfigKVGlobalMock(envOnly)
146-
}
147-
148-
func (ac AdminClientMock) delConfigKV(_ context.Context, name string) (err error) {
149-
return minioDelConfigKVMock(name)
150-
}
151-
152-
func (ac AdminClientMock) getLogs(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo {
153-
return minioGetLogsMock(ctx, node, lineCnt, logKind)
154-
}
155-
156-
func (ac AdminClientMock) listGroups(_ context.Context) ([]string, error) {
157-
return minioListGroupsMock()
158-
}
159-
160-
func (ac AdminClientMock) updateGroupMembers(_ context.Context, req madmin.GroupAddRemove) error {
161-
return minioUpdateGroupMembersMock(req)
162-
}
163-
164-
func (ac AdminClientMock) getGroupDescription(_ context.Context, group string) (*madmin.GroupDesc, error) {
165-
return minioGetGroupDescriptionMock(group)
166-
}
167-
168-
func (ac AdminClientMock) setGroupStatus(_ context.Context, group string, status madmin.GroupStatus) error {
169-
return minioSetGroupStatusMock(group, status)
170-
}
171-
172-
func (ac AdminClientMock) heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
173-
forceStart, forceStop bool,
174-
) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error) {
175-
return minioHealMock(ctx, bucket, prefix, healOpts, clientToken, forceStart, forceStop)
176-
}
177-
178-
func (ac AdminClientMock) serverHealthInfo(ctx context.Context, deadline time.Duration) (interface{}, string, error) {
179-
return minioServerHealthInfoMock(ctx, deadline)
180-
}
181-
182-
func (ac AdminClientMock) addOrUpdateIDPConfig(_ context.Context, _, _, _ string, _ bool) (restart bool, err error) {
183-
return true, nil
184-
}
185-
186-
func (ac AdminClientMock) listIDPConfig(_ context.Context, _ string) ([]madmin.IDPListItem, error) {
187-
return []madmin.IDPListItem{{Name: "mock"}}, nil
188-
}
189-
190-
func (ac AdminClientMock) deleteIDPConfig(_ context.Context, _, _ string) (restart bool, err error) {
191-
return true, nil
192-
}
193-
194-
func (ac AdminClientMock) getIDPConfig(_ context.Context, _, _ string) (c madmin.IDPConfig, err error) {
195-
return madmin.IDPConfig{Info: []madmin.IDPCfgInfo{{Key: "mock", Value: "mock"}}}, nil
25+
type AdminClientMock struct {
26+
minioAccountInfoMock func(ctx context.Context) (madmin.AccountInfo, error)
19627
}
19728

19829
func (ac AdminClientMock) kmsStatus(_ context.Context) (madmin.KMSStatus, error) {
19930
return madmin.KMSStatus{Name: "name", DefaultKeyID: "key", Endpoints: map[string]madmin.ItemState{"localhost": madmin.ItemState("online")}}, nil
20031
}
20132

202-
func (ac AdminClientMock) kmsAPIs(_ context.Context) ([]madmin.KMSAPI, error) {
203-
return []madmin.KMSAPI{{Method: "GET", Path: "/mock"}}, nil
204-
}
205-
206-
func (ac AdminClientMock) kmsMetrics(_ context.Context) (*madmin.KMSMetrics, error) {
207-
return &madmin.KMSMetrics{}, nil
208-
}
209-
210-
func (ac AdminClientMock) kmsVersion(_ context.Context) (*madmin.KMSVersion, error) {
211-
return &madmin.KMSVersion{Version: "test-version"}, nil
212-
}
213-
214-
func (ac AdminClientMock) createKey(_ context.Context, _ string) error {
215-
return nil
216-
}
217-
218-
func (ac AdminClientMock) listKeys(_ context.Context, _ string) ([]madmin.KMSKeyInfo, error) {
219-
return []madmin.KMSKeyInfo{{
220-
Name: "name",
221-
CreatedBy: "by",
222-
}}, nil
223-
}
224-
225-
func (ac AdminClientMock) keyStatus(_ context.Context, _ string) (*madmin.KMSKeyStatus, error) {
226-
return &madmin.KMSKeyStatus{KeyID: "key"}, nil
227-
}
228-
229-
func (ac AdminClientMock) listPolicies(_ context.Context) (map[string]*iampolicy.Policy, error) {
230-
return minioListPoliciesMock()
231-
}
232-
233-
func (ac AdminClientMock) getPolicy(_ context.Context, name string) (*iampolicy.Policy, error) {
234-
return minioGetPolicyMock(name)
235-
}
236-
237-
func (ac AdminClientMock) removePolicy(_ context.Context, name string) error {
238-
return minioRemovePolicyMock(name)
239-
}
240-
241-
func (ac AdminClientMock) addPolicy(_ context.Context, name string, policy *iampolicy.Policy) error {
242-
return minioAddPolicyMock(name, policy)
243-
}
244-
245-
func (ac AdminClientMock) setPolicy(_ context.Context, policyName, entityName string, isGroup bool) error {
246-
return minioSetPolicyMock(policyName, entityName, isGroup)
247-
}
248-
249-
// mock function for startProfiling()
250-
func (ac AdminClientMock) startProfiling(_ context.Context, profiler madmin.ProfilerType, duration time.Duration) (io.ReadCloser, error) {
251-
return minioStartProfiling(profiler, duration)
252-
}
253-
254-
// mock function of serviceRestart()
255-
func (ac AdminClientMock) serviceRestart(ctx context.Context) error {
256-
return minioServiceRestartMock(ctx)
257-
}
258-
259-
func (ac AdminClientMock) getSiteReplicationInfo(ctx context.Context) (*madmin.SiteReplicationInfo, error) {
260-
return getSiteReplicationInfo(ctx)
261-
}
262-
263-
func (ac AdminClientMock) addSiteReplicationInfo(ctx context.Context, sites []madmin.PeerSite, _ madmin.SRAddOptions) (*madmin.ReplicateAddStatus, error) {
264-
return addSiteReplicationInfo(ctx, sites)
265-
}
266-
267-
func (ac AdminClientMock) editSiteReplicationInfo(ctx context.Context, site madmin.PeerInfo, _ madmin.SREditOptions) (*madmin.ReplicateEditStatus, error) {
268-
return editSiteReplicationInfo(ctx, site)
269-
}
270-
271-
func (ac AdminClientMock) deleteSiteReplicationInfo(ctx context.Context, removeReq madmin.SRRemoveReq) (*madmin.ReplicateRemoveStatus, error) {
272-
return deleteSiteReplicationInfoMock(ctx, removeReq)
273-
}
274-
275-
func (ac AdminClientMock) getSiteReplicationStatus(ctx context.Context, params madmin.SRStatusOptions) (*madmin.SRStatusInfo, error) {
276-
return getSiteReplicationStatus(ctx, params)
277-
}
278-
279-
func (ac AdminClientMock) listTiers(ctx context.Context) ([]*madmin.TierConfig, error) {
280-
return minioListTiersMock(ctx)
281-
}
282-
283-
func (ac AdminClientMock) tierStats(ctx context.Context) ([]madmin.TierInfo, error) {
284-
return minioTierStatsMock(ctx)
285-
}
286-
287-
func (ac AdminClientMock) addTier(ctx context.Context, tier *madmin.TierConfig) error {
288-
return minioAddTiersMock(ctx, tier)
289-
}
290-
291-
func (ac AdminClientMock) removeTier(ctx context.Context, tierName string) error {
292-
return minioRemoveTierMock(ctx, tierName)
293-
}
294-
295-
func (ac AdminClientMock) editTierCreds(ctx context.Context, tierName string, creds madmin.TierCreds) error {
296-
return minioEditTiersMock(ctx, tierName, creds)
297-
}
298-
299-
func (ac AdminClientMock) serviceTrace(ctx context.Context, threshold int64, s3, internal, storage, os, errTrace bool) <-chan madmin.ServiceTraceInfo {
300-
return minioServiceTraceMock(ctx, threshold, s3, internal, storage, os, errTrace)
301-
}
302-
303-
func (ac AdminClientMock) listUsers(_ context.Context) (map[string]madmin.UserInfo, error) {
304-
return minioListUsersMock()
305-
}
306-
307-
func (ac AdminClientMock) addUser(_ context.Context, accessKey, secretKey string) error {
308-
return minioAddUserMock(accessKey, secretKey)
309-
}
310-
311-
func (ac AdminClientMock) removeUser(_ context.Context, accessKey string) error {
312-
return minioRemoveUserMock(accessKey)
313-
}
314-
315-
func (ac AdminClientMock) getUserInfo(_ context.Context, accessKey string) (madmin.UserInfo, error) {
316-
return minioGetUserInfoMock(accessKey)
317-
}
318-
319-
func (ac AdminClientMock) setUserStatus(_ context.Context, accessKey string, status madmin.AccountStatus) error {
320-
return minioSetUserStatusMock(accessKey, status)
321-
}
322-
32333
func (ac AdminClientMock) AccountInfo(ctx context.Context) (madmin.AccountInfo, error) {
324-
return minioAccountInfoMock(ctx)
325-
}
326-
327-
func (ac AdminClientMock) addServiceAccount(ctx context.Context, policy string, user string, accessKey string, secretKey string, description string, name string, expiry *time.Time, status string) (madmin.Credentials, error) {
328-
return minioAddServiceAccountMock(ctx, policy, user, accessKey, secretKey, description, name, expiry, status)
329-
}
330-
331-
func (ac AdminClientMock) listServiceAccounts(ctx context.Context, user string) (madmin.ListServiceAccountsResp, error) {
332-
return minioListServiceAccountsMock(ctx, user)
333-
}
334-
335-
func (ac AdminClientMock) deleteServiceAccount(ctx context.Context, serviceAccount string) error {
336-
return minioDeleteServiceAccountMock(ctx, serviceAccount)
337-
}
338-
339-
func (ac AdminClientMock) infoServiceAccount(ctx context.Context, serviceAccount string) (madmin.InfoServiceAccountResp, error) {
340-
return minioInfoServiceAccountMock(ctx, serviceAccount)
341-
}
342-
343-
func (ac AdminClientMock) updateServiceAccount(ctx context.Context, serviceAccount string, opts madmin.UpdateServiceAccountReq) error {
344-
return minioUpdateServiceAccountMock(ctx, serviceAccount, opts)
345-
}
346-
347-
func (ac AdminClientMock) getLDAPPolicyEntities(ctx context.Context, query madmin.PolicyEntitiesQuery) (madmin.PolicyEntitiesResult, error) {
348-
return minioGetLDAPPolicyEntitiesMock(ctx, query)
34+
return ac.minioAccountInfoMock(ctx)
34935
}

0 commit comments

Comments
 (0)