From 3d8c83418903b4b2b7967994fd893a3f3b8c3c71 Mon Sep 17 00:00:00 2001 From: niravparikh05 Date: Mon, 23 May 2022 14:56:04 +0530 Subject: [PATCH] fixing test cases for namespaces --- pkg/service/group_test.go | 12 ++++++------ pkg/service/test_utils.go | 4 ++-- pkg/service/user_test.go | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/service/group_test.go b/pkg/service/group_test.go index 99cab52..43ba48c 100644 --- a/pkg/service/group_test.go +++ b/pkg/service/group_test.go @@ -267,7 +267,7 @@ func TestCreateGroupNoUsersWithRoles(t *testing.T) { func TestCreateGroupWithUsersWithRoles(t *testing.T) { projectid := uuid.New().String() - var namespaceid string = "7" + var namespaceid string = "ns" tt := []struct { name string users []string @@ -503,8 +503,8 @@ func TestGroupGetByName(t *testing.T) { if len(group.GetSpec().GetProjectNamespaceRoles()) != 3 { t.Errorf("invalid number of roles returned for user, expected 3; got '%v'", len(group.GetSpec().GetProjectNamespaceRoles())) } - if group.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "7" { - t.Errorf("invalid namespace in role returned for user, expected 7; got '%v'", group.GetSpec().GetProjectNamespaceRoles()[2].Namespace) + if group.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "ns" { + t.Errorf("invalid namespace in role returned for user, expected ns; got '%v'", group.GetSpec().GetProjectNamespaceRoles()[2].Namespace) } } @@ -532,7 +532,7 @@ func TestGroupGetById(t *testing.T) { mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, authsrv_group.name as group FROM "authsrv_projectgrouprole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectgrouprole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectgrouprole.project_id JOIN authsrv_group ON authsrv_group.id=authsrv_projectgrouprole.group_id WHERE`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project"}).AddRow("role-"+ruuid, "project-"+pruuid)) mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, namespace_id as namespace, authsrv_group.name as group FROM "authsrv_projectgroupnamespacerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectgroupnamespacerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectgroupnamespacerole.project_id JOIN authsrv_group ON authsrv_group.id=authsrv_projectgroupnamespacerole.group_id WHERE`). - WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, 9)) + WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, "ns")) group := &userv3.Group{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Id: guuid}, @@ -549,8 +549,8 @@ func TestGroupGetById(t *testing.T) { if len(group.GetSpec().GetProjectNamespaceRoles()) != 3 { t.Errorf("invalid number of roles returned for user, expected 3; got '%v'", len(group.GetSpec().GetProjectNamespaceRoles())) } - if group.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "9" { - t.Errorf("invalid namespace in role returned for user, expected 9; got '%v'", group.GetSpec().GetProjectNamespaceRoles()[2].Namespace) + if group.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "ns" { + t.Errorf("invalid namespace in role returned for user, expected ns; got '%v'", group.GetSpec().GetProjectNamespaceRoles()[2].Namespace) } } diff --git a/pkg/service/test_utils.go b/pkg/service/test_utils.go index e1d5e60..7d7df4e 100644 --- a/pkg/service/test_utils.go +++ b/pkg/service/test_utils.go @@ -167,7 +167,7 @@ func addUserRoleMappingsFetchExpectation(mock sqlmock.Sqlmock, user string, proj mock.ExpectQuery(`SELECT distinct authsrv_resourcerole.name as role, authsrv_project.name as project FROM "authsrv_projectaccountresourcerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountresourcerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountresourcerole.project_id WHERE .authsrv_projectaccountresourcerole.account_id = '` + user + `'`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project"}).AddRow("role-"+uid, "project-"+project)) mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, namespace_id as namespace FROM "authsrv_projectaccountnamespacerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountnamespacerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountnamespacerole.project_id WHERE .authsrv_projectaccountnamespacerole.account_id = '` + user + `'`). - WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+uid, "project-"+project, 7)) + WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+uid, "project-"+project, "ns")) } func addUserRoleMappingsUpdateExpectation(mock sqlmock.Sqlmock, uuuid string) string { @@ -188,7 +188,7 @@ func addGroupRoleMappingsFetchExpectation(mock sqlmock.Sqlmock, group string, pr mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, authsrv_group.name as group FROM "authsrv_projectgrouprole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectgrouprole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectgrouprole.project_id JOIN authsrv_group ON authsrv_group.id=authsrv_projectgrouprole.group_id WHERE`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project"}).AddRow("role-"+uid, "project-"+project)) mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, namespace_id as namespace, authsrv_group.name as group FROM "authsrv_projectgroupnamespacerole"`). - WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+uid, "project-"+project, 7)) + WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+uid, "project-"+project, "ns")) } func addGroupRoleMappingsUpdateExpectation(mock sqlmock.Sqlmock, group string) string { diff --git a/pkg/service/user_test.go b/pkg/service/user_test.go index 43fb2de..9de3e42 100644 --- a/pkg/service/user_test.go +++ b/pkg/service/user_test.go @@ -127,7 +127,7 @@ func TestCreateUserWithRole(t *testing.T) { role.Project = &pruuid } if tc.namespace { - var ns string = "7" + var ns string = "ns" role.Namespace = &ns } mock.ExpectQuery(fmt.Sprintf(`INSERT INTO "%v"`, tc.dbname)). @@ -181,7 +181,7 @@ func TestUpdateUser(t *testing.T) { WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(uuid.New().String())) mock.ExpectCommit() - var ns string = "7" + var ns string = "ns" user := &userv3.User{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}}, @@ -220,7 +220,7 @@ func TestUpdateUserWithGroup(t *testing.T) { WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(uuid.New().String())) mock.ExpectCommit() - var ns string = "7" + var ns string = "ns" user := &userv3.User{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ @@ -259,7 +259,7 @@ func TestUpdateUserInvalid(t *testing.T) { WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(uuid.New().String())) mock.ExpectCommit() - var ns string = "7" + var ns string = "ns" user := &userv3.User{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ @@ -313,7 +313,7 @@ func TestUserGetByName(t *testing.T) { mock.ExpectQuery(`SELECT distinct authsrv_resourcerole.name as role, authsrv_project.name as project FROM "authsrv_projectaccountresourcerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountresourcerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountresourcerole.project_id WHERE .authsrv_projectaccountresourcerole.account_id = '` + uuuid + `'`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project"}).AddRow("role-"+ruuid, "project-"+pruuid)) mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, namespace_id as namespace FROM "authsrv_projectaccountnamespacerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountnamespacerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountnamespacerole.project_id WHERE .authsrv_projectaccountnamespacerole.account_id = '` + uuuid + `'`). - WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, 9)) + WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, "ns")) user := &userv3.User{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, @@ -332,8 +332,8 @@ func TestUserGetByName(t *testing.T) { if len(user.GetSpec().GetProjectNamespaceRoles()) != 6 { t.Errorf("invalid number of roles returned for user, expected 3; got '%v'", len(user.GetSpec().GetProjectNamespaceRoles())) } - if user.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "9" { - t.Errorf("invalid namespace in role returned for user, expected 9; got '%v'", user.GetSpec().GetProjectNamespaceRoles()[2].Namespace) + if user.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "ns" { + t.Errorf("invalid namespace in role returned for user, expected ns; got '%v'", user.GetSpec().GetProjectNamespaceRoles()[2].Namespace) } performBasicAuthProviderChecks(t, *ap, 0, 0, 0, 0) } @@ -370,7 +370,7 @@ func TestUserGetInfo(t *testing.T) { mock.ExpectQuery(`SELECT distinct authsrv_resourcerole.name as role, authsrv_project.name as project FROM "authsrv_projectaccountresourcerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountresourcerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountresourcerole.project_id WHERE .authsrv_projectaccountresourcerole.account_id = '` + uuuid + `'`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project"}).AddRow("role-"+ruuid, "project-"+pruuid)) mock.ExpectQuery(`SELECT authsrv_resourcerole.name as role, authsrv_project.name as project, namespace_id as namespace FROM "authsrv_projectaccountnamespacerole" JOIN authsrv_resourcerole ON authsrv_resourcerole.id=authsrv_projectaccountnamespacerole.role_id JOIN authsrv_project ON authsrv_project.id=authsrv_projectaccountnamespacerole.project_id WHERE .authsrv_projectaccountnamespacerole.account_id = '` + uuuid + `'`). - WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, 9)) + WithArgs().WillReturnRows(sqlmock.NewRows([]string{"role", "project", "namespace"}).AddRow("role-"+ruuid, "project-"+pruuid, "ns")) mock.ExpectQuery(`SELECT "resourcerole"."id" FROM "authsrv_resourcerole" AS "resourcerole" WHERE .name = 'role-` + ruuid + `'. AND .trash = FALSE.`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).AddRow(ruuid, "role-"+ruuid)) mock.ExpectQuery(`SELECT authsrv_resourcepermission.name as name FROM "authsrv_resourcepermission" JOIN authsrv_resourcerolepermission ON authsrv_resourcerolepermission.resource_permission_id=authsrv_resourcepermission.id WHERE .authsrv_resourcerolepermission.resource_role_id = '` + ruuid + `'. AND .authsrv_resourcepermission.trash = FALSE. AND .authsrv_resourcerolepermission.trash = FALSE.`). @@ -445,8 +445,8 @@ func TestUserGetById(t *testing.T) { if len(user.GetSpec().GetProjectNamespaceRoles()) != 6 { t.Errorf("invalid number of roles returned for user, expected 6; got '%v'", len(user.GetSpec().GetProjectNamespaceRoles())) } - if user.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "7" { - t.Errorf("invalid namespace in role returned for user, expected 7; got '%v'", user.GetSpec().GetProjectNamespaceRoles()[2].Namespace) + if user.GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "ns" { + t.Errorf("invalid namespace in role returned for user, expected ns; got '%v'", user.GetSpec().GetProjectNamespaceRoles()[2].Namespace) } performBasicAuthProviderChecks(t, *ap, 0, 0, 0, 0) @@ -563,8 +563,8 @@ func TestUserList(t *testing.T) { if len(userlist.Items[0].GetSpec().GetProjectNamespaceRoles()) != 6 { t.Errorf("invalid number of roles returned for user, expected 6; got '%v'", len(userlist.Items[0].GetSpec().GetProjectNamespaceRoles())) } - if userlist.Items[0].GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "7" { - t.Errorf("invalid namespace in role returned for user, expected 7; got '%v'", userlist.Items[0].GetSpec().GetProjectNamespaceRoles()[2].Namespace) + if userlist.Items[0].GetSpec().GetProjectNamespaceRoles()[2].GetNamespace() != "ns" { + t.Errorf("invalid namespace in role returned for user, expected ns; got '%v'", userlist.Items[0].GetSpec().GetProjectNamespaceRoles()[2].Namespace) } performBasicAuthProviderChecks(t, *ap, 0, 0, 0, 0)