From 2352fc9a3902d938c63d43a2fee6b5e4d72dbca5 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Mon, 6 Nov 2017 13:07:09 +0100 Subject: [PATCH] go fmt run --- pkg/cluster/cluster.go | 6 +++--- pkg/spec/types.go | 8 ++++---- pkg/util/config/config.go | 30 +++++++++++++++--------------- pkg/util/users/users.go | 20 ++++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 38579d3c2..df900a9f3 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -646,9 +646,9 @@ func (c *Cluster) initHumanUsers() error { } c.pgUsers[username] = spec.PgUser{ - Name: username, - Flags: flags, - MemberOf: memberOf, + Name: username, + Flags: flags, + MemberOf: memberOf, Parameters: c.OpConfig.APIRolesParameters, } } diff --git a/pkg/spec/types.go b/pkg/spec/types.go index a350633f6..3eb6e7fa7 100644 --- a/pkg/spec/types.go +++ b/pkg/spec/types.go @@ -58,10 +58,10 @@ type PodEvent struct { // PgUser contains information about a single user. type PgUser struct { - Name string - Password string - Flags []string - MemberOf []string + Name string + Password string + Flags []string + MemberOf []string Parameters map[string]string } diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 9d66dc53a..91b1d533f 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -50,21 +50,21 @@ type Config struct { CRD Resources Auth - Namespace string `name:"namespace"` - EtcdHost string `name:"etcd_host" default:"etcd-client.default.svc.cluster.local:2379"` - DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4"` - ServiceAccountName string `name:"service_account_name" default:"operator"` - DbHostedZone string `name:"db_hosted_zone" default:"db.example.com"` - EtcdScope string `name:"etcd_scope" default:"service"` - WALES3Bucket string `name:"wal_s3_bucket"` - KubeIAMRole string `name:"kube_iam_role"` - DebugLogging bool `name:"debug_logging" default:"true"` - EnableDBAccess bool `name:"enable_database_access" default:"true"` - EnableTeamsAPI bool `name:"enable_teams_api" default:"true"` - EnableTeamSuperuser bool `name:"enable_team_superuser" default:"false"` - TeamAdminRole string `name:"team_admin_role" default:"admin"` - EnableLoadBalancer bool `name:"enable_load_balancer" default:"true"` - MasterDNSNameFormat stringTemplate `name:"master_dns_name_format" default:"{cluster}.{team}.{hostedzone}"` + Namespace string `name:"namespace"` + EtcdHost string `name:"etcd_host" default:"etcd-client.default.svc.cluster.local:2379"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4"` + ServiceAccountName string `name:"service_account_name" default:"operator"` + DbHostedZone string `name:"db_hosted_zone" default:"db.example.com"` + EtcdScope string `name:"etcd_scope" default:"service"` + WALES3Bucket string `name:"wal_s3_bucket"` + KubeIAMRole string `name:"kube_iam_role"` + DebugLogging bool `name:"debug_logging" default:"true"` + EnableDBAccess bool `name:"enable_database_access" default:"true"` + EnableTeamsAPI bool `name:"enable_teams_api" default:"true"` + EnableTeamSuperuser bool `name:"enable_team_superuser" default:"false"` + TeamAdminRole string `name:"team_admin_role" default:"admin"` + EnableLoadBalancer bool `name:"enable_load_balancer" default:"true"` + MasterDNSNameFormat stringTemplate `name:"master_dns_name_format" default:"{cluster}.{team}.{hostedzone}"` ReplicaDNSNameFormat stringTemplate `name:"replica_dns_name_format" default:"{cluster}-repl.{team}.{hostedzone}"` PDBNameFormat stringTemplate `name:"pdb_name_format" default:"postgres-{cluster}-pdb"` Workers uint32 `name:"workers" default:"4"` diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index d8a3eaf98..f4e41e8e8 100644 --- a/pkg/util/users/users.go +++ b/pkg/util/users/users.go @@ -11,14 +11,14 @@ import ( ) const ( - createUserSQL = `SET LOCAL synchronous_commit = 'local'; CREATE ROLE "%s" %s %s;` - alterUserSQL = `ALTER ROLE "%s" %s` + createUserSQL = `SET LOCAL synchronous_commit = 'local'; CREATE ROLE "%s" %s %s;` + alterUserSQL = `ALTER ROLE "%s" %s` alterRoleResetAllSQL = `ALTER ROLE "%s" RESET ALL` - alterRoleSetSQL = `ALTER ROLE "%s" SET %s TO %s` - grantToUserSQL = `GRANT %s TO "%s"` - doBlockStmt = `SET LOCAL synchronous_commit = 'local'; DO $$ BEGIN %s; END;$$;` - passwordTemplate = "ENCRYPTED PASSWORD '%s'" - inRoleTemplate = `IN ROLE %s` + alterRoleSetSQL = `ALTER ROLE "%s" SET %s TO %s` + grantToUserSQL = `GRANT %s TO "%s"` + doBlockStmt = `SET LOCAL synchronous_commit = 'local'; DO $$ BEGIN %s; END;$$;` + passwordTemplate = "ENCRYPTED PASSWORD '%s'" + inRoleTemplate = `IN ROLE %s` ) // DefaultUserSyncStrategy implements a user sync strategy that merges already existing database users @@ -173,7 +173,7 @@ func produceAlterStmt(user spec.PgUser) string { func produceAlterRoleSetStmts(user spec.PgUser) []string { result := make([]string, 0) result = append(result, fmt.Sprintf(alterRoleResetAllSQL, user.Name)) - for key, value := range(user.Parameters) { + for key, value := range user.Parameters { result = append(result, fmt.Sprintf(alterRoleSetSQL, user.Name, key, quoteValue(value))) } return result @@ -196,7 +196,7 @@ func quoteMemberList(user spec.PgUser) string { func quoteValue(val string) string { if (strings.HasPrefix(val, `"`) && strings.HasSuffix(val, `"`)) || (strings.HasPrefix(val, `'`) && strings.HasSuffix(val, `'`)) { - return val + return val } - return fmt.Sprintf(`"%s"`, strings.Trim(val," ")) + return fmt.Sprintf(`"%s"`, strings.Trim(val, " ")) }