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

fix maintenance window parsing

This commit is contained in:
Murat Kabilov 2017-05-26 17:09:12 +02:00
parent 009db16c7c
commit 8e1c21c396
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/spec/postgresql.go
View File

@ -12,8 +12,6 @@ import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
var alphaRegexp = regexp.MustCompile("^[a-zA-Z]*$")
type MaintenanceWindow struct { type MaintenanceWindow struct {
StartTime time.Time // Start time StartTime time.Time // Start time
StartWeekday time.Weekday // Start weekday StartWeekday time.Weekday // Start weekday
@ -96,7 +94,10 @@ type PostgresqlList struct {
Items []Postgresql `json:"items"` Items []Postgresql `json:"items"`
} }
func parseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err error) { 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}
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, ":")
@ -107,6 +108,12 @@ func parseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err err
} }
timeLayout = "Mon:15:04" timeLayout = "Mon:15:04"
wdProvided = true wdProvided = true
weekday, ok := weekdays[parts[0]]
if !ok {
err = fmt.Errorf("incorrect weekday")
return
}
wd = time.Weekday(weekday)
} else { } else {
wdProvided = false wdProvided = false
timeLayout = "15:04" timeLayout = "15:04"
@ -116,8 +123,6 @@ func parseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err err
if err != nil { if err != nil {
return return
} }
wd = tp.Weekday()
t = tp.UTC() t = tp.UTC()
return return
@ -125,7 +130,7 @@ func parseTime(s string) (t time.Time, wd time.Weekday, wdProvided bool, err err
func (m *MaintenanceWindow) MarshalJSON() ([]byte, error) { func (m *MaintenanceWindow) MarshalJSON() ([]byte, error) {
var startWd, endWd string var startWd, endWd string
if m.StartWeekday == time.Sunday && m.EndWeekday == time.Saturday { if m.StartWeekday == time.Monday && m.EndWeekday == time.Sunday {
startWd = "" startWd = ""
endWd = "" endWd = ""
} else { } else {
@ -151,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
} }
@ -165,9 +170,13 @@ func (m *MaintenanceWindow) UnmarshalJSON(data []byte) error {
return fmt.Errorf("'From' time must be prior to the 'To' time") return fmt.Errorf("'From' time must be prior to the 'To' time")
} }
if (int(got.StartWeekday)+6)%7 > (int(got.EndWeekday)+6)%7 {
return fmt.Errorf("'From' weekday must be prior to the 'To' weekday")
}
if !weekdayProvidedFrom || !weekdayProvidedTo { if !weekdayProvidedFrom || !weekdayProvidedTo {
got.StartWeekday = time.Sunday got.StartWeekday = time.Monday
got.EndWeekday = time.Saturday got.EndWeekday = time.Sunday
} }
*m = got *m = got