public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-21 10:22:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/maintenancewindow-parsing' into feature/tests

Browse Source 
# Conflicts:
#	pkg/spec/postgresql.go
This commit is contained in:
Murat Kabilov
2017-05-26 17:15:09 +02:00
parent 54fe4b530e a21a16d24c
commit a576d29017
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/spec/postgresql.go
+3 -3
View File
@@ -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
} }