Refactoring inspired by gometalinter. (#357)

Among other things, fix a few issues with deepcopy implementation.

pkg/controller/controller.go

@@ -151,9 +151,9 @@ func (c *Controller) initPodServiceAccount() {
 
 	switch {
 	case err != nil:
-		panic(fmt.Errorf("Unable to parse pod service account definiton from the operator config map: %v", err))
+		panic(fmt.Errorf("Unable to parse pod service account definition from the operator config map: %v", err))
 	case groupVersionKind.Kind != "ServiceAccount":
-		panic(fmt.Errorf("pod service account definiton in the operator config map defines another type of resource: %v", groupVersionKind.Kind))
+		panic(fmt.Errorf("pod service account definition in the operator config map defines another type of resource: %v", groupVersionKind.Kind))
 	default:
 		c.PodServiceAccount = obj.(*v1.ServiceAccount)
 		if c.PodServiceAccount.Name != c.opConfig.PodServiceAccountName {

pkg/controller/postgresql_test.go

@@ -7,8 +7,8 @@ import (
 )
 
 var (
-	True  bool = true
-	False bool = false
+	True  = true
+	False = false
 )
 
 func TestMergeDeprecatedPostgreSQLSpecParameters(t *testing.T) {

pkg/controller/util.go

@@ -114,7 +114,7 @@ func readDecodedRole(s string) (*spec.PgUser, error) {
 	return &result, nil
 }
 
-func (c *Controller) getInfrastructureRoles(rolesSecret *spec.NamespacedName) (result map[string]spec.PgUser, err error) {
+func (c *Controller) getInfrastructureRoles(rolesSecret *spec.NamespacedName) (map[string]spec.PgUser, error) {
 	if *rolesSecret == (spec.NamespacedName{}) {
 		// we don't have infrastructure roles defined, bail out
 		return nil, nil
@@ -129,7 +129,7 @@ func (c *Controller) getInfrastructureRoles(rolesSecret *spec.NamespacedName) (r
 	}
 
 	secretData := infraRolesSecret.Data
-	result = make(map[string]spec.PgUser)
+	result := make(map[string]spec.PgUser)
 Users:
 	// in worst case we would have one line per user
 	for i := 1; i <= len(secretData); i++ {
@@ -171,22 +171,22 @@ Users:
 	if infraRolesMap, err := c.KubeClient.ConfigMaps(rolesSecret.Namespace).Get(rolesSecret.Name, metav1.GetOptions{}); err == nil {
 		// we have a configmap with username - json description, let's read and decode it
 		for role, s := range infraRolesMap.Data {
-			if roleDescr, err := readDecodedRole(s); err != nil {
+			roleDescr, err := readDecodedRole(s)
+			if err != nil {
 				return nil, fmt.Errorf("could not decode role description: %v", err)
-			} else {
-				// check if we have a a password in a configmap
-				c.logger.Debugf("found role description for role %q: %+v", role, roleDescr)
-				if passwd, ok := secretData[role]; ok {
-					roleDescr.Password = string(passwd)
-					delete(secretData, role)
-				} else {
-					c.logger.Warningf("infrastructure role %q has no password defined and is ignored", role)
-					continue
-				}
-				roleDescr.Name = role
-				roleDescr.Origin = spec.RoleOriginInfrastructure
-				result[role] = *roleDescr
 			}
+			// check if we have a a password in a configmap
+			c.logger.Debugf("found role description for role %q: %+v", role, roleDescr)
+			if passwd, ok := secretData[role]; ok {
+				roleDescr.Password = string(passwd)
+				delete(secretData, role)
+			} else {
+				c.logger.Warningf("infrastructure role %q has no password defined and is ignored", role)
+				continue
+			}
+			roleDescr.Name = role
+			roleDescr.Origin = spec.RoleOriginInfrastructure
+			result[role] = *roleDescr
 		}
 	}