Fix tests after audit log changes

pkg/service/cluster_test.go

@@ -30,7 +30,7 @@ func TestCreateCluster(t *testing.T) {
 		RelayAgentImage: "rafaysystems/relay:latest",
 	}
 
-	ps := NewClusterService(db, downloadData, NewBootstrapService(db))
+	ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger())
 
 	puuid := uuid.New().String()
 	cuuid := uuid.New().String()
@@ -74,7 +74,7 @@ func TestUpdateCluster(t *testing.T) {
 		RelayAgentImage: "rafaysystems/relay:latest",
 	}
 
-	ps := NewClusterService(db, downloadData, NewBootstrapService(db))
+	ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger())
 
 	puuid := uuid.New().String()
 	cuuid := uuid.New().String()
@@ -108,7 +108,7 @@ func TestSelectCluster(t *testing.T) {
 		RelayAgentImage: "rafaysystems/relay:latest",
 	}
 
-	ps := NewClusterService(db, downloadData, NewBootstrapService(db))
+	ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger())
 
 	puuid := uuid.New().String()
 	cuuid := uuid.New().String()
@@ -142,7 +142,7 @@ func TestGetCluster(t *testing.T) {
 		RelayAgentImage: "rafaysystems/relay:latest",
 	}
 
-	ps := NewClusterService(db, downloadData, NewBootstrapService(db))
+	ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger())
 
 	puuid := uuid.New().String()
 	cuuid := uuid.New().String()
@@ -175,7 +175,7 @@ func TestListCluster(t *testing.T) {
 		RelayAgentImage: "rafaysystems/relay:latest",
 	}
 
-	ps := NewClusterService(db, downloadData, NewBootstrapService(db))
+	ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger())
 
 	puuid := uuid.New().String()
 	ouuid := uuid.New().String()

pkg/service/group_test.go

@@ -84,7 +84,7 @@ func TestCreateGroupNoUsersNoRoles(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid := uuid.New().String()
 
@@ -115,7 +115,7 @@ func TestCreateGroupDuplicate(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid := uuid.New().String()
 
@@ -153,7 +153,7 @@ func TestCreateGroupWithUsersNoRoles(t *testing.T) {
 			defer db.Close()
 
 			mazc := mockAuthzClient{}
-			gs := NewGroupService(db, &mazc)
+			gs := NewGroupService(db, &mazc, getLogger())
 
 			guuid := uuid.New().String()
 
@@ -215,7 +215,7 @@ func TestCreateGroupNoUsersWithRoles(t *testing.T) {
 			defer db.Close()
 
 			mazc := mockAuthzClient{}
-			gs := NewGroupService(db, &mazc)
+			gs := NewGroupService(db, &mazc, getLogger())
 
 			guuid := uuid.New().String()
 			pruuid := uuid.New().String()
@@ -289,7 +289,7 @@ func TestCreateGroupWithUsersWithRoles(t *testing.T) {
 			defer db.Close()
 
 			mazc := mockAuthzClient{}
-			gs := NewGroupService(db, &mazc)
+			gs := NewGroupService(db, &mazc, getLogger())
 
 			guuid := uuid.New().String()
 			pruuid := uuid.New().String()
@@ -367,7 +367,7 @@ func TestUpdateGroupWithUsersWithRoles(t *testing.T) {
 			defer db.Close()
 
 			mazc := mockAuthzClient{}
-			gs := NewGroupService(db, &mazc)
+			gs := NewGroupService(db, &mazc, getLogger())
 
 			guuid := uuid.New().String()
 			pruuid := uuid.New().String()
@@ -431,7 +431,7 @@ func TestGroupDelete(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	puuid, ouuid := addParterOrgFetchExpectation(mock)
 	guuid := addFetchExpectation(mock, "group")
@@ -455,7 +455,7 @@ func TestGroupDeleteNonExist(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -477,7 +477,7 @@ func TestGroupGetByName(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid := uuid.New().String()
 	uuuid := uuid.New().String()
@@ -513,7 +513,7 @@ func TestGroupGetById(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -559,7 +559,7 @@ func TestGroupList(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid1 := uuid.New().String()
 	guuid2 := uuid.New().String()
@@ -600,7 +600,7 @@ func TestGroupListFiltered(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewGroupService(db, &mazc)
+	gs := NewGroupService(db, &mazc, getLogger())
 
 	guuid1 := uuid.New().String()
 	guuid2 := uuid.New().String()

pkg/service/organization_test.go

@@ -21,7 +21,7 @@ func TestCreateOrganization(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	puuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -47,7 +47,7 @@ func TestCreateOrganizationDuplicate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	gs := NewOrganizationService(db)
+	gs := NewOrganizationService(db, getLogger())
 
 	ouuid := uuid.New().String()
 
@@ -69,7 +69,7 @@ func TestOrganizationDelete(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	ouuid := uuid.New().String()
 
@@ -92,7 +92,7 @@ func TestOrganizationDeleteNonExist(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	ouuid := uuid.New().String()
 
@@ -112,7 +112,7 @@ func TestOrganizationGetByName(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	partuuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -137,7 +137,7 @@ func TestOrganizationGetById(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	partuuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -162,7 +162,7 @@ func TestOrganizationUpdate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewOrganizationService(db)
+	ps := NewOrganizationService(db, getLogger())
 
 	puuid := uuid.New().String()
 

pkg/service/partner_test.go

@@ -37,7 +37,7 @@ func TestCreatePartner(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewPartnerService(db)
+	ps := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -59,7 +59,7 @@ func TestCreatePartnerDuplicate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	gs := NewPartnerService(db)
+	gs := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -81,7 +81,7 @@ func TestPartnerDelete(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewPartnerService(db)
+	ps := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -104,7 +104,7 @@ func TestPartnerDeleteNonExist(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	gs := NewPartnerService(db)
+	gs := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -116,7 +116,7 @@ func TestPartnerDeleteNonExist(t *testing.T) {
 	}
 	_, err := gs.Delete(context.Background(), partner)
 	if err == nil {
-		t.Fatal("deleted non existant group")
+		t.Fatal("deleted non existent group")
 	}
 }
 
@@ -124,7 +124,7 @@ func TestPartnerGetByName(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewPartnerService(db)
+	ps := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -144,7 +144,7 @@ func TestPartnerGetById(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewPartnerService(db)
+	ps := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -165,7 +165,7 @@ func TestPartnerUpdate(t *testing.T) {
 	db, mock := getDB(t)
 	defer db.Close()
 
-	ps := NewPartnerService(db)
+	ps := NewPartnerService(db, getLogger())
 
 	puuid := uuid.New().String()
 

pkg/service/project_test.go

@@ -22,7 +22,7 @@ func TestCreateProject(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -50,7 +50,7 @@ func TestCreateProjectDuplicate(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	gs := NewProjectService(db, &mazc)
+	gs := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -73,7 +73,7 @@ func TestProjectDelete(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -101,7 +101,7 @@ func TestProjectDeleteNonExist(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -113,7 +113,7 @@ func TestProjectDeleteNonExist(t *testing.T) {
 	}
 	_, err := ps.Delete(context.Background(), project)
 	if err == nil {
-		t.Fatal("deleted non existant project")
+		t.Fatal("deleted non existent project")
 	}
 }
 
@@ -122,7 +122,7 @@ func TestProjectGetByName(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	partuuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -166,7 +166,7 @@ func TestProjectGetById(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 
@@ -188,7 +188,7 @@ func TestProjectUpdate(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	ps := NewProjectService(db, &mazc)
+	ps := NewProjectService(db, &mazc, getLogger())
 
 	puuid := uuid.New().String()
 

pkg/service/role_test.go

@@ -52,7 +52,7 @@ func TestCreateRole(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -87,7 +87,7 @@ func TestCreateRoleWithPermissions(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -126,7 +126,7 @@ func TestCreateRoleDuplicate(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -160,7 +160,7 @@ func TestUpdateRole(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -201,7 +201,7 @@ func TestRoleDelete(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -234,7 +234,7 @@ func TestRoleDeleteNonExist(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -248,7 +248,7 @@ func TestRoleDeleteNonExist(t *testing.T) {
 	}
 	_, err := rs.Delete(context.Background(), role)
 	if err == nil {
-		t.Error("deleted non existant role")
+		t.Error("deleted non existent role")
 	}
 
 }
@@ -258,7 +258,7 @@ func TestRoleGetByName(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	rruuid := uuid.New().String()
@@ -289,7 +289,7 @@ func TestRoleGetById(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid := uuid.New().String()
 	rruuid := uuid.New().String()
@@ -316,7 +316,7 @@ func TestRoleList(t *testing.T) {
 	defer db.Close()
 
 	mazc := mockAuthzClient{}
-	rs := NewRoleService(db, &mazc)
+	rs := NewRoleService(db, &mazc, getLogger())
 
 	ruuid1 := uuid.New().String()
 	ruuid2 := uuid.New().String()

pkg/service/test_utils.go

@@ -5,9 +5,21 @@ import (
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/RafayLabs/rcloud-base/pkg/audit"
 	"github.com/google/uuid"
+	"go.uber.org/zap"
 )
 
+func getLogger() *zap.Logger {
+	ao := audit.AuditOptions{
+		LogPath:    "stdout",
+		MaxSizeMB:  1,
+		MaxBackups: 10, // Should we let sidecar do rotation?
+		MaxAgeDays: 10, // Make these configurable via env
+	}
+	return audit.GetAuditLogger(&ao)
+}
+
 func performBasicAuthzChecks(t *testing.T, mazc mockAuthzClient, cpCount, dpCount, cugCount, dugCount, crpmCount, drpmCount int) {
 	if len(mazc.cp) != cpCount {
 		t.Errorf("unexpected number of calls to Authz CreatePolicies; expctex '%v', got '%v'", cpCount, len(mazc.cp))

pkg/service/user_test.go

@@ -62,7 +62,7 @@ func TestCreateUser(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	uuuid := uuid.New().String()
 	puuid, ouuid := addParterOrgFetchExpectation(mock)
@@ -110,7 +110,7 @@ func TestCreateUserWithRole(t *testing.T) {
 
 			ap := &mockAuthProvider{}
 			mazc := mockAuthzClient{}
-			us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+			us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 			uuuid := uuid.New().String()
 
@@ -167,7 +167,7 @@ func TestUpdateUser(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	// performing update
 	uuuid := addUserIdFetchExpectation(mock)
@@ -203,7 +203,7 @@ func TestUserGetByName(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	puuid := uuid.New().String()
 	ouuid := uuid.New().String()
@@ -260,7 +260,7 @@ func TestUserGetInfo(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	uuuid := uuid.New().String()
 	fakeuuuid := uuid.New().String()
@@ -332,7 +332,7 @@ func TestUserGetById(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	uuuid := uuid.New().String()
 	puuid := uuid.New().String()
@@ -397,7 +397,7 @@ func TestUserList(t *testing.T) {
 
 			ap := &mockAuthProvider{}
 			mazc := mockAuthzClient{}
-			us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+			us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 			uuuid1 := uuid.New().String()
 			uuuid2 := uuid.New().String()
@@ -495,7 +495,7 @@ func TestUserDelete(t *testing.T) {
 
 	ap := &mockAuthProvider{}
 	mazc := mockAuthzClient{}
-	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{})
+	us := NewUserService(ap, db, &mazc, nil, common.CliConfigDownloadData{}, getLogger())
 
 	uuuid := uuid.New().String()
 	puuid := uuid.New().String()