diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go index 919e75153..48a82ee04 100644 --- a/pkg/cluster/resources.go +++ b/pkg/cluster/resources.go @@ -506,7 +506,7 @@ func (c *Cluster) deleteSecrets() error { } if len(errors) > 0 { - return fmt.Errorf("could not delete all secrets: %v", errors) + return fmt.Errorf("could not delete all secrets: %v", strings.Join(errors, `', '`)) } return nil diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 41a324b19..67b684856 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -195,9 +195,9 @@ func (c *Controller) getInfrastructureRoleDefinitions() []*config.Infrastructure func (c *Controller) getInfrastructureRoles( rolesSecrets []*config.InfrastructureRole) ( - map[string]spec.PgUser, []error) { + map[string]spec.PgUser, error) { - errors := make([]error, 0) + errors := make([]string, 0) noRolesProvided := true roles := []spec.PgUser{} uniqRoles := map[string]spec.PgUser{} @@ -220,30 +220,32 @@ func (c *Controller) getInfrastructureRoles( infraRoles, err := c.getInfrastructureRole(secret) if err != nil || infraRoles == nil { - c.logger.Debugf("Cannot get infrastructure role: %+v", *secret) + c.logger.Debugf("cannot get infrastructure role: %+v", *secret) if err != nil { - errors = append(errors, err) + errors = append(errors, fmt.Sprintf("%v", err)) } continue } - for _, r := range infraRoles { - roles = append(roles, r) - } + roles = append(roles, infraRoles...) } for _, r := range roles { if _, exists := uniqRoles[r.Name]; exists { - msg := "Conflicting infrastructure roles: roles[%s] = (%q, %q)" + msg := "conflicting infrastructure roles: roles[%s] = (%q, %q)" c.logger.Debugf(msg, r.Name, uniqRoles[r.Name], r) } uniqRoles[r.Name] = r } - return uniqRoles, errors + if len(errors) > 0 { + return nil, fmt.Errorf(strings.Join(errors, `', '`)) + } + + return uniqRoles, nil } // Generate list of users representing one infrastructure role based on its diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index c6b6461fe..821350bb7 100644 --- a/pkg/util/users/users.go +++ b/pkg/util/users/users.go @@ -138,7 +138,7 @@ func (strategy DefaultUserSyncStrategy) ExecuteSyncRequests(requests []spec.PgSy return err } } else { - return fmt.Errorf("could not execute sync requests for users: %v", errors) + return fmt.Errorf("could not execute sync requests for users: %v", strings.Join(errors, `', '`)) } }