public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-17 17:06:47 +02:00
Code Issues Projects Releases Wiki Activity

superusers instead of admin

Browse Source
This commit is contained in:
Felix Kunde
2020-10-15 13:40:41 +02:00
parent 0f86eff13e
commit 4cd82220d2
6 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/teams/postgres_team.go
+16 -24
View File
@@ -8,9 +8,9 @@ import (
type PostgresTeamMap map[string]postgresTeamMembership
type postgresTeamMembership struct {
AdditionalAdminTeams []string
AdditionalTeams []string
AdditionalMembers []string
AdditionalSuperuserTeams []string
AdditionalTeams []string
AdditionalMembers []string
}
type teamHashSet map[string]map[string]struct{}
@@ -55,26 +55,18 @@ func fetchTeams(teamset *map[string]struct{}, set teamHashSet) {
}
}
func (ptm *PostgresTeamMap) fetchAdditionalTeams(team string, adminTeams bool, transitive bool, exclude *[]string) []string {
func (ptm *PostgresTeamMap) fetchAdditionalTeams(team string, superuserTeams bool, transitive bool, exclude *[]string) []string {
var teams, allTeams []string
var teams []string
if adminTeams {
teams = (*ptm)[team].AdditionalAdminTeams
allTeams = teams
for _, otherPrivilegedTeam := range (*ptm)[team].AdditionalTeams {
allTeams = append(allTeams, otherPrivilegedTeam)
}
if superuserTeams {
teams = (*ptm)[team].AdditionalSuperuserTeams
} else {
teams = (*ptm)[team].AdditionalTeams
allTeams = teams
for _, otherPrivilegedTeam := range (*ptm)[team].AdditionalAdminTeams {
allTeams = append(allTeams, otherPrivilegedTeam)
}
}
if transitive {
*exclude = append(*exclude, team)
for _, additionalTeam := range allTeams {
for _, additionalTeam := range teams {
getTransitiveTeams := true
for _, excludedTeam := range *exclude {
if additionalTeam == excludedTeam {
@@ -82,7 +74,7 @@ func (ptm *PostgresTeamMap) fetchAdditionalTeams(team string, adminTeams bool, t
}
}
if getTransitiveTeams {
transitiveTeams := (*ptm).fetchAdditionalTeams(additionalTeam, adminTeams, transitive, exclude)
transitiveTeams := (*ptm).fetchAdditionalTeams(additionalTeam, superuserTeams, transitive, exclude)
if len(transitiveTeams) > 0 {
for _, transitiveTeam := range transitiveTeams {
@@ -102,31 +94,31 @@ func (ptm *PostgresTeamMap) GetAdditionalTeams(team string, transitive bool) []s
}
// GetAdditionalTeams function to retrieve list of additional teams
func (ptm *PostgresTeamMap) GetAdditionalAdminTeams(team string, transitive bool) []string {
func (ptm *PostgresTeamMap) GetAdditionalSuperuserTeams(team string, transitive bool) []string {
return ptm.fetchAdditionalTeams(team, true, transitive, &[]string{})
}
// Load function to import data from PostgresTeam CRD
func (ptm *PostgresTeamMap) Load(pgTeams *acidv1.PostgresTeamList) {
adminTeamSet := teamHashSet{}
superuserTeamSet := teamHashSet{}
teamSet := teamHashSet{}
teamMemberSet := teamHashSet{}
teamIDs := make(map[string]struct{})
for _, pgTeam := range pgTeams.Items {
adminTeamSet.mergeCrdMap(pgTeam.Spec.AdditionalAdminTeams)
superuserTeamSet.mergeCrdMap(pgTeam.Spec.AdditionalSuperuserTeams)
teamSet.mergeCrdMap(pgTeam.Spec.AdditionalTeams)
teamMemberSet.mergeCrdMap(pgTeam.Spec.AdditionalMembers)
}
fetchTeams(&teamIDs, adminTeamSet)
fetchTeams(&teamIDs, superuserTeamSet)
fetchTeams(&teamIDs, teamSet)
fetchTeams(&teamIDs, teamMemberSet)
for teamID := range teamIDs {
(*ptm)[teamID] = postgresTeamMembership{
AdditionalAdminTeams: adminTeamSet.toMap()[teamID],
AdditionalTeams: teamSet.toMap()[teamID],
AdditionalMembers: teamMemberSet.toMap()[teamID],
AdditionalSuperuserTeams: superuserTeamSet.toMap()[teamID],
AdditionalTeams: teamSet.toMap()[teamID],
AdditionalMembers: teamMemberSet.toMap()[teamID],
}
}
}
pkg/teams/postgres_team_test.go
+7 -7
View File
@@ -38,7 +38,7 @@ func TestLoadingPostgresTeamCRD(t *testing.T) {
Name: "teamAB",
},
Spec: acidv1.PostgresTeamSpec{
AdditionalAdminTeams: map[string][]string{"teamA": []string{"teamB", "team24/7"}, "teamB": []string{"teamA", "team24/7"}},
AdditionalSuperuserTeams: map[string][]string{"teamA": []string{"teamB", "team24/7"}, "teamB": []string{"teamA", "team24/7"}},
AdditionalTeams: map[string][]string{"teamA": []string{"teamC"}, "teamB": []string{}},
AdditionalMembers: map[string][]string{"team24/7": []string{"optimusprime"}, "teamB": []string{"drno"}},
},
@@ -51,7 +51,7 @@ func TestLoadingPostgresTeamCRD(t *testing.T) {
Name: "teamC",
},
Spec: acidv1.PostgresTeamSpec{
AdditionalAdminTeams: map[string][]string{"teamC": []string{"team24/7"}},
AdditionalSuperuserTeams: map[string][]string{"teamC": []string{"team24/7"}},
AdditionalTeams: map[string][]string{"teamA": []string{"teamC"}, "teamC": []string{"teamA", "teamB"}},
AdditionalMembers: map[string][]string{"acid": []string{"batman"}},
},
@@ -60,27 +60,27 @@ func TestLoadingPostgresTeamCRD(t *testing.T) {
},
PostgresTeamMap{
"teamA": {
AdditionalAdminTeams: []string{"teamB", "team24/7"},
AdditionalSuperuserTeams: []string{"teamB", "team24/7"},
AdditionalTeams: []string{"teamC"},
AdditionalMembers: nil,
},
"teamB": {
AdditionalAdminTeams: []string{"teamA", "team24/7"},
AdditionalSuperuserTeams: []string{"teamA", "team24/7"},
AdditionalTeams: []string{},
AdditionalMembers: []string{"drno"},
},
"teamC": {
AdditionalAdminTeams: []string{"team24/7"},
AdditionalSuperuserTeams: []string{"team24/7"},
AdditionalTeams: []string{"teamA", "teamB"},
AdditionalMembers: nil,
},
"team24/7": {
AdditionalAdminTeams: nil,
AdditionalSuperuserTeams: nil,
AdditionalTeams: nil,
AdditionalMembers: []string{"optimusprime"},
},
"acid": {
AdditionalAdminTeams: nil,
AdditionalSuperuserTeams: nil,
AdditionalTeams: nil,
AdditionalMembers: []string{"batman"},
},