reflect code review

pkg/util/constants/roles.go

@@ -13,4 +13,8 @@ const (
 	RoleFlagCreateDB       = "CREATEDB"
 	RoleFlagReplication    = "REPLICATION"
 	RoleFlagByPassRLS      = "BYPASSRLS"
+	OwnerRoleNameSuffix    = "_owner"
+	ReaderRoleNameSuffix   = "_reader"
+	WriterRoleNameSuffix   = "_writer"
+	UserRoleNameSuffix     = "_user"
 )

pkg/util/users/users.go

@@ -73,37 +73,37 @@ func (strategy DefaultUserSyncStrategy) ProduceSyncRequests(dbUsers spec.PgUserM
 }
 
 // ExecuteSyncRequests makes actual database changes from the requests passed in its arguments.
-func (strategy DefaultUserSyncStrategy) ExecuteSyncRequests(reqs []spec.PgSyncUserRequest, db *sql.DB) error {
-	var rr []spec.PgSyncUserRequest
+func (strategy DefaultUserSyncStrategy) ExecuteSyncRequests(requests []spec.PgSyncUserRequest, db *sql.DB) error {
+	var reqretries []spec.PgSyncUserRequest
 	var errors []string
-	for _, r := range reqs {
-		switch r.Kind {
+	for _, request := range requests {
+		switch request.Kind {
 		case spec.PGSyncUserAdd:
-			if err := strategy.createPgUser(r.User, db); err != nil {
-				rr = append(rr, r)
-				errors = append(errors, fmt.Sprintf("could not create user %q: %v", r.User.Name, err))
+			if err := strategy.createPgUser(request.User, db); err != nil {
+				reqretries = append(reqretries, request)
+				errors = append(errors, fmt.Sprintf("could not create user %q: %v", request.User.Name, err))
 			}
 		case spec.PGsyncUserAlter:
-			if err := strategy.alterPgUser(r.User, db); err != nil {
-				rr = append(rr, r)
-				errors = append(errors, fmt.Sprintf("could not alter user %q: %v", r.User.Name, err))
+			if err := strategy.alterPgUser(request.User, db); err != nil {
+				reqretries = append(reqretries, request)
+				errors = append(errors, fmt.Sprintf("could not alter user %q: %v", request.User.Name, err))
 			}
 		case spec.PGSyncAlterSet:
-			if err := strategy.alterPgUserSet(r.User, db); err != nil {
-				rr = append(rr, r)
-				errors = append(errors, fmt.Sprintf("could not set custom user %q parameters: %v", r.User.Name, err))
+			if err := strategy.alterPgUserSet(request.User, db); err != nil {
+				reqretries = append(reqretries, request)
+				errors = append(errors, fmt.Sprintf("could not set custom user %q parameters: %v", request.User.Name, err))
 			}
 		default:
-			return fmt.Errorf("unrecognized operation: %v", r.Kind)
+			return fmt.Errorf("unrecognized operation: %v", request.Kind)
 		}
 
 	}
 
 	// creating roles might fail if group role members are created before the parent role
 	// retry adding roles as long as the number of failed attempts is shrinking
-	if len(rr) > 0 {
-		if len(rr) < len(reqs) {
-			if err := strategy.ExecuteSyncRequests(rr, db); err != nil {
+	if len(reqretries) > 0 {
+		if len(reqretries) < len(requests) {
+			if err := strategy.ExecuteSyncRequests(reqretries, db); err != nil {
 				return err
 			}
 		} else {