Skip to content

Commit 9e5d639

Browse files
prakashsvmxprakashsvmx
committed
test updates
1 parent 884230e commit 9e5d639

File tree

3 files changed

+39
-71
lines changed

3 files changed

+39
-71
lines changed

‎integration/service_account_test.go

Lines changed: 8 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
"github.com/go-openapi/swag"
3030

31-
iampolicy "github.com/minio/pkg/v2/policy"
3231
"github.com/stretchr/testify/assert"
3332
)
3433

@@ -52,32 +51,7 @@ func TestAddServiceAccount(t *testing.T) {
5251
requestDataAddServiceAccount := map[string]interface{}{
5352
"accessKey": "testuser1",
5453
"secretKey": "password",
55-
}
56-
57-
requestDataJSON, _ := json.Marshal(requestDataAddServiceAccount)
58-
requestDataBody := bytes.NewReader(requestDataJSON)
59-
request, err := http.NewRequest(
60-
"POST", "http://localhost:9090/api/v1/service-account-credentials", requestDataBody)
61-
if err != nil {
62-
log.Println(err)
63-
return
64-
}
65-
request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
66-
request.Header.Add("Content-Type", "application/json")
67-
68-
response, err := client.Do(request)
69-
if err != nil {
70-
log.Println(err)
71-
return
72-
}
73-
if response != nil {
74-
fmt.Println("POST StatusCode:", response.StatusCode)
75-
assert.Equal(201, response.StatusCode, "Status Code is incorrect")
76-
}
77-
78-
requestDataPolicy := map[string]interface{}{
79-
"policy": `
80-
{
54+
"policy": `{
8155
"Version": "2012-10-17",
8256
"Statement": [
8357
{
@@ -93,55 +67,26 @@ func TestAddServiceAccount(t *testing.T) {
9367
]
9468
}`,
9569
}
96-
requestDataJSON, _ = json.Marshal(requestDataPolicy)
97-
requestDataBody = bytes.NewReader(requestDataJSON)
98-
request, err = http.NewRequest(
99-
"PUT", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", requestDataBody)
100-
if err != nil {
101-
log.Println(err)
102-
return
103-
}
104-
request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
105-
request.Header.Add("Content-Type", "application/json")
106-
response, err = client.Do(request)
107-
if err != nil {
108-
log.Println(err)
109-
return
110-
}
111-
if response != nil {
112-
fmt.Println("POST StatusCode:", response.StatusCode)
113-
assert.Equal(200, response.StatusCode, "Status Code is incorrect")
114-
}
11570

116-
// Test policy
117-
request, err = http.NewRequest(
118-
"GET", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", nil)
71+
requestDataJSON, _ := json.Marshal(requestDataAddServiceAccount)
72+
requestDataBody := bytes.NewReader(requestDataJSON)
73+
request, err := http.NewRequest(
74+
"POST", "http://localhost:9090/api/v1/service-account-credentials", requestDataBody)
11975
if err != nil {
12076
log.Println(err)
12177
return
12278
}
12379
request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
12480
request.Header.Add("Content-Type", "application/json")
125-
response, err = client.Do(request)
81+
82+
response, err := client.Do(request)
12683
if err != nil {
12784
log.Println(err)
12885
return
12986
}
13087
if response != nil {
13188
fmt.Println("POST StatusCode:", response.StatusCode)
132-
assert.Equal(200, response.StatusCode, "Status Code is incorrect")
133-
buf := new(bytes.Buffer)
134-
buf.ReadFrom(response.Body)
135-
var actual *iampolicy.Policy
136-
var expected *iampolicy.Policy
137-
json.Unmarshal(buf.Bytes(), actual)
138-
policy, err := json.Marshal(requestDataAddServiceAccount["policy"])
139-
if err != nil {
140-
log.Println(err)
141-
return
142-
}
143-
json.Unmarshal(policy, expected)
144-
assert.Equal(expected, actual)
89+
assert.Equal(201, response.StatusCode, "Status Code is incorrect")
14590
}
14691

14792
// {{baseUrl}}/user?name=proident velit

‎portal-ui/src/screens/Console/Account/EditServiceAccount.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const EditServiceAccount = ({
101101

102102
return (
103103
<ModalWrapper
104-
title="Access Key Policy"
104+
title={`Edit Access Key Details of - ${selectedAccessKey}`}
105105
modalOpen={open}
106106
onClose={() => {
107107
closeModalAndRefresh();
@@ -169,7 +169,12 @@ const EditServiceAccount = ({
169169
/>
170170
</Box>
171171
</Grid>
172-
<Grid xs={12}>
172+
<Grid
173+
xs={12}
174+
sx={{
175+
marginBottom: "15px",
176+
}}
177+
>
173178
<InputBox
174179
value={name}
175180
size={120}
@@ -183,7 +188,12 @@ const EditServiceAccount = ({
183188
}}
184189
/>
185190
</Grid>
186-
<Grid xs={12}>
191+
<Grid
192+
xs={12}
193+
sx={{
194+
marginBottom: "15px",
195+
}}
196+
>
187197
<InputBox
188198
size={120}
189199
value={description}
@@ -207,7 +217,6 @@ const EditServiceAccount = ({
207217
color: "rgb(7, 25, 62)",
208218
gap: 2,
209219
marginBottom: "15px",
210-
marginTop: "15px",
211220
}}
212221
>
213222
<label style={{ width: "150px" }}>Status</label>
@@ -249,7 +258,7 @@ const EditServiceAccount = ({
249258
variant="callAction"
250259
color="primary"
251260
disabled={loading}
252-
label={"Set"}
261+
label={"Update"}
253262
/>
254263
</Grid>
255264
</Grid>

‎restapi/service_accounts_handlers_test.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ func TestAddServiceAccount(t *testing.T) {
7676
if assert.Error(err) {
7777
assert.Equal("error", err.Error())
7878
}
79+
80+
// test invalid scenarios
81+
7982
}
8083

8184
func TestListServiceAccounts(t *testing.T) {
@@ -125,6 +128,12 @@ func TestListServiceAccounts(t *testing.T) {
125128
if assert.Error(err) {
126129
assert.Equal("error", err.Error())
127130
}
131+
132+
_, err = getUserServiceAccounts(ctx, client, "test-user")
133+
if assert.Error(err) {
134+
assert.Equal("error", err.Error())
135+
}
136+
128137
}
129138

130139
func TestDeleteServiceAccount(t *testing.T) {
@@ -154,11 +163,11 @@ func TestDeleteServiceAccount(t *testing.T) {
154163
}
155164
}
156165

157-
func TestGetServiceAccountPolicy(t *testing.T) {
166+
func TestGetServiceAccountDetails(t *testing.T) {
158167
assert := assert.New(t)
159168
// mock minIO client
160169
client := AdminClientMock{}
161-
function := "getServiceAccountPolicy()"
170+
function := "getServiceAccountDetails()"
162171

163172
// Test-1: getServiceAccountPolicy list serviceaccounts for a user
164173
ctx, cancel := context.WithCancel(context.Background())
@@ -188,7 +197,7 @@ func TestGetServiceAccountPolicy(t *testing.T) {
188197
if err != nil {
189198
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
190199
}
191-
assert.Equal(mockResponse.Policy, serviceAccount)
200+
assert.Equal(mockResponse.Policy, serviceAccount.Policy)
192201

193202
// Test-2: getServiceAccountPolicy returns an error, handle it properly
194203
minioInfoServiceAccountMock = func(ctx context.Context, user string) (madmin.InfoServiceAccountResp, error) {
@@ -198,4 +207,9 @@ func TestGetServiceAccountPolicy(t *testing.T) {
198207
if assert.Error(err) {
199208
assert.Equal("error", err.Error())
200209
}
210+
211+
_, err = getServiceAccountDetails(ctx, client, "test-access-key")
212+
if assert.Error(err) {
213+
assert.Equal("error", err.Error())
214+
}
201215
}

0 commit comments

Comments
 (0)