public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better naming 

fix function visibility
This commit is contained in:
Murat Kabilov 2017-05-26 17:10:14 +02:00
parent 8e1c21c396
commit a21a16d24c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/spec/postgresql.go
View File

@ -69,7 +69,7 @@ type Postgresql struct {
Metadata v1.ObjectMeta `json:"metadata"` Metadata v1.ObjectMeta `json:"metadata"`
Spec PostgresSpec `json:"spec"` Spec PostgresSpec `json:"spec"`
Status PostgresStatus `json:"status"` Status PostgresStatus `json:"status,omitempty"`
Error error `json:"-"` Error error `json:"-"`
} }
@ -97,7 +97,7 @@ type PostgresqlList struct {
var alphaRegexp = regexp.MustCompile("^[a-zA-Z]*$") var alphaRegexp = regexp.MustCompile("^[a-zA-Z]*$")
var weekdays = map[string]int{"Sun": 0, "Mon": 1, "Tue": 2, "Wed": 3, "Thu": 4, "Fri": 5, "Sat": 6} var weekdays = map[string]int{"Sun": 0, "Mon": 1, "Tue": 2, "Wed": 3, "Thu": 4, "Fri": 5, "Sat": 6}
func ParseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err error) { func parseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err error) {
var timeLayout string var timeLayout string
parts := strings.Split(s, ":") parts := strings.Split(s, ":")
@ -156,12 +156,12 @@ func (m *MaintenanceWindow) UnmarshalJSON(data []byte) error {
return fmt.Errorf("incorrect maintenance window format") return fmt.Errorf("incorrect maintenance window format")
} }
got.StartTime, got.StartWeekday, weekdayProvidedFrom, err = ParseTime(parts[0]) got.StartTime, got.StartWeekday, weekdayProvidedFrom, err = parseTime(parts[0])
if err != nil { if err != nil {
return err return err
} }
got.EndTime, got.EndWeekday, weekdayProvidedTo, err = ParseTime(parts[1]) got.EndTime, got.EndWeekday, weekdayProvidedTo, err = parseTime(parts[1])
if err != nil { if err != nil {
return err return err
} }
@ -200,11 +200,16 @@ func (pl *PostgresqlList) GetListMeta() unversioned.List {
return &pl.Metadata return &pl.Metadata
} }
func clusterName(clusterName string, teamName string) (string, error) { func extractClusterName(clusterName string, teamName string) (string, error) {
teamNameLen := len(teamName) teamNameLen := len(teamName)
if len(clusterName) < teamNameLen+2 { if len(clusterName) < teamNameLen+2 {
return "", fmt.Errorf("name is too short") return "", fmt.Errorf("name is too short")
} }
if teamNameLen == 0 {
return "", fmt.Errorf("Team name is empty")
}
if strings.ToLower(clusterName[:teamNameLen+1]) != strings.ToLower(teamName)+"-" { if strings.ToLower(clusterName[:teamNameLen+1]) != strings.ToLower(teamName)+"-" {
return "", fmt.Errorf("name must match {TEAM}-{NAME} format") return "", fmt.Errorf("name must match {TEAM}-{NAME} format")
} }
@ -220,7 +225,8 @@ type PostgresqlListCopy PostgresqlList
type PostgresqlCopy Postgresql type PostgresqlCopy Postgresql
func (p *Postgresql) UnmarshalJSON(data []byte) error { func (p *Postgresql) UnmarshalJSON(data []byte) error {
tmp := PostgresqlCopy{} var tmp PostgresqlCopy
err := json.Unmarshal(data, &tmp) err := json.Unmarshal(data, &tmp)
if err != nil { if err != nil {
metaErr := json.Unmarshal(data, &tmp.Metadata) metaErr := json.Unmarshal(data, &tmp.Metadata)
@ -237,7 +243,7 @@ func (p *Postgresql) UnmarshalJSON(data []byte) error {
} }
tmp2 := Postgresql(tmp) tmp2 := Postgresql(tmp)
clusterName, err := clusterName(tmp2.Metadata.Name, tmp2.Spec.TeamID) clusterName, err := extractClusterName(tmp2.Metadata.Name, tmp2.Spec.TeamID)
if err == nil { if err == nil {
tmp2.Spec.ClusterName = clusterName tmp2.Spec.ClusterName = clusterName
} else { } else {
@ -250,7 +256,8 @@ func (p *Postgresql) UnmarshalJSON(data []byte) error {
} }
func (pl *PostgresqlList) UnmarshalJSON(data []byte) error { func (pl *PostgresqlList) UnmarshalJSON(data []byte) error {
tmp := PostgresqlListCopy{} var tmp PostgresqlListCopy
err := json.Unmarshal(data, &tmp) err := json.Unmarshal(data, &tmp)
if err != nil { if err != nil {
return err return err