More groups tests (#1923)

integration/groups_test.go

@@ -34,7 +34,6 @@ func Test_AddGroupAPI(t *testing.T) {
 	AddUser("member1", "testtest", []string{}, []string{"consoleAdmin"})
 
 	type args struct {
-		api     string
 		group   string
 		members []string
 	}
@@ -47,7 +46,6 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Valid",
 			args: args{
-				api:     "/groups",
 				group:   "test",
 				members: []string{"member1"},
 			},
@@ -57,7 +55,6 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Invalid",
 			args: args{
-				api:     "/groups",
 				group:   "test",
 				members: []string{},
 			},
@@ -73,8 +70,6 @@ func Test_AddGroupAPI(t *testing.T) {
 				Timeout: 3 * time.Second,
 			}
 
-			// Add policy
-
 			requestDataPolicy := map[string]interface{}{}
 			requestDataPolicy["group"] = tt.args.group
 			requestDataPolicy["members"] = tt.args.members
@@ -82,7 +77,196 @@ func Test_AddGroupAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"POST", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
+				"POST", "http://localhost:9090/api/v1/groups", requestDataBody)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+			response, err := client.Do(request)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			if response != nil {
+				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
+			}
+
+		})
+	}
+
+}
+
+func Test_GetGroupAPI(t *testing.T) {
+	assert := assert.New(t)
+
+	AddUser("member2", "testtest", []string{}, []string{"consoleAdmin"})
+	AddGroup("getgroup1", []string{"member2"})
+
+	type args struct {
+		api string
+	}
+	tests := []struct {
+		name           string
+		args           args
+		expectedStatus int
+		expectedError  error
+	}{
+		{
+			name: "Get Group - Valid",
+			args: args{
+				api: "?name=getgroup1",
+			},
+			expectedStatus: 200,
+			expectedError:  nil,
+		},
+		{
+			name: "Get Group - Invalid",
+			args: args{
+				api: "?name=askfjalkd",
+			},
+			expectedStatus: 500,
+			expectedError:  nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			client := &http.Client{
+				Timeout: 3 * time.Second,
+			}
+
+			requestDataPolicy := map[string]interface{}{}
+
+			requestDataJSON, _ := json.Marshal(requestDataPolicy)
+			requestDataBody := bytes.NewReader(requestDataJSON)
+			request, err := http.NewRequest(
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+			response, err := client.Do(request)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			if response != nil {
+				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
+			}
+
+		})
+	}
+
+}
+
+func Test_ListGroupsAPI(t *testing.T) {
+	assert := assert.New(t)
+
+	tests := []struct {
+		name           string
+		expectedStatus int
+		expectedError  error
+	}{
+		{
+			name:           "Get Group - Valid",
+			expectedStatus: 200,
+			expectedError:  nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			client := &http.Client{
+				Timeout: 3 * time.Second,
+			}
+
+			requestDataPolicy := map[string]interface{}{}
+
+			requestDataJSON, _ := json.Marshal(requestDataPolicy)
+			requestDataBody := bytes.NewReader(requestDataJSON)
+			request, err := http.NewRequest(
+				"GET", "http://localhost:9090/api/v1/groups", requestDataBody)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+			response, err := client.Do(request)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			if response != nil {
+				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
+			}
+
+		})
+	}
+
+}
+
+func Test_PutGroupsAPI(t *testing.T) {
+	assert := assert.New(t)
+
+	AddUser("member3", "testtest", []string{}, []string{"consoleAdmin"})
+	AddGroup("putgroup1", []string{})
+
+	type args struct {
+		api     string
+		members []string
+		status  string
+	}
+	tests := []struct {
+		name           string
+		args           args
+		expectedStatus int
+		expectedError  error
+	}{
+		{
+			name: "Put Group - Valid",
+			args: args{
+				api:     "?name=putgroup1",
+				members: []string{"member3"},
+				status:  "enabled",
+			},
+			expectedStatus: 200,
+			expectedError:  nil,
+		},
+		{
+			name: "Put Group - Invalid",
+			args: args{
+				api:     "?name=gdgfdfgd",
+				members: []string{"member3"},
+				status:  "enabled",
+			},
+			expectedStatus: 500,
+			expectedError:  nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			client := &http.Client{
+				Timeout: 3 * time.Second,
+			}
+
+			requestDataPolicy := map[string]interface{}{}
+
+			requestDataPolicy["members"] = tt.args.members
+			requestDataPolicy["status"] = tt.args.status
+
+			requestDataJSON, _ := json.Marshal(requestDataPolicy)
+			requestDataBody := bytes.NewReader(requestDataJSON)
+			request, err := http.NewRequest(
+				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -120,19 +304,28 @@ func Test_DeleteGroupAPI(t *testing.T) {
 	}{
 		{
 			name: "Delete Group - Valid",
-			verb: "DELETE",
 			args: args{
-				api: "/group?name=grouptests1",
+				api: "?name=grouptests1",
 			},
+			verb:           "DELETE",
 			expectedStatus: 204,
 			expectedError:  nil,
 		},
 		{
-			name: "Access Group After Delete - Invalid",
+			name: "Delete Group - Invalid",
-			verb: "GET",
 			args: args{
-				api: "/group?name=grouptests1",
+				api: "?name=grouptests12345",
 			},
+			verb:           "DELETE",
+			expectedStatus: 404,
+			expectedError:  nil,
+		},
+		{
+			name: "Access Group After Delete - Invalid",
+			args: args{
+				api: "?name=grouptests1",
+			},
+			verb:           "GET",
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
@@ -145,14 +338,12 @@ func Test_DeleteGroupAPI(t *testing.T) {
 				Timeout: 3 * time.Second,
 			}
 
-			// Add policy
-
 			requestDataPolicy := map[string]interface{}{}
 
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
+				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return

restapi/admin_groups.go

@@ -204,9 +204,13 @@ func getRemoveGroupResponse(session *models.Principal, params groupApi.RemoveGro
 	// createad a MinIO Admin Client interface implementation
 	// defining the client to be used
 	adminClient := AdminClient{Client: mAdmin}
-
 	if err := removeGroup(ctx, adminClient, params.Name); err != nil {
-		return ErrorWithContext(ctx, err)
+		minioError := madmin.ToErrorResponse(err)
+		err2 := ErrorWithContext(ctx, err)
+		if minioError.Code == "XMinioAdminNoSuchGroup" {
+			err2.Code = 404
+		}
+		return err2
 	}
 	return nil
 }