fix(databases): accepts more format

Author: EtienneM

cmd/databases.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -314,9 +315,9 @@ func parseScheduleAtFlag(flag string) (int, *time.Location, error) {
 	scheduleAtTime := s[0]
 	scheduleAtTimezone := s[1]
 
-	// If client writes "4:00", we only want to keep "4" in scheduleAtTime
-	scheduleAtTimeSplit := strings.SplitN(scheduleAtTime, ":", 2)
-	scheduleAtTime = scheduleAtTimeSplit[0]
+	// If client writes "4:00" or "4h00", we only want to keep "4" in scheduleAtTime
+	re := regexp.MustCompile(`([:hH].*)|[0]+`)
+	scheduleAtTime = re.ReplaceAllString(scheduleAtTime, "")
 
 	scheduleAtHour, err = strconv.Atoi(scheduleAtTime)
 	if err != nil {

cmd/databases_test.go

@@ -0,0 +1,81 @@
+package cmd
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestParseScheduleAtFlag(t *testing.T) {
+	tests := map[string]struct {
+		flag          string
+		expectedHour  int
+		expectedLoc   string
+		expectedError string
+	}{
+		"single hour uses local timezone": {
+			flag:         "3",
+			expectedHour: 3,
+			expectedLoc:  time.Local.String(),
+		},
+		"hour and timezone": {
+			flag:         "3 Europe/Paris",
+			expectedHour: 3,
+			expectedLoc:  "Europe/Paris",
+		},
+		"hour with minutes and timezone (1)": {
+			flag:         "4:00 Europe/Paris",
+			expectedHour: 4,
+			expectedLoc:  "Europe/Paris",
+		},
+		"hour with minutes and timezone (2)": {
+			flag:         "4h00 Europe/Paris",
+			expectedHour: 4,
+			expectedLoc:  "Europe/Paris",
+		},
+		"hour with minutes and timezone (3)": {
+			flag:         "4H00 Europe/Paris",
+			expectedHour: 4,
+			expectedLoc:  "Europe/Paris",
+		},
+		"invalid flag (1)": {
+			flag:          "invalid",
+			expectedError: "schedule-at=only contains two space-separated fields",
+		},
+		"invalid flag (2)": {
+			flag:          "invalid invalid2",
+			expectedError: "schedule-at=first field must be a digit representing the hour",
+		},
+		"invalid flag (3)": {
+			flag:          "invalid invalid2:invalid3",
+			expectedError: "schedule-at=first field must be a digit representing the hour",
+		},
+		"invalid hour": {
+			flag:          "aa Europe/Paris",
+			expectedError: "schedule-at=first field must be a digit representing the hour",
+		},
+		"unknown timezone": {
+			flag:          "3 Europe/Unknown",
+			expectedError: "schedule-at=unknown timezoneEurope/Unknown",
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			hour, loc, err := parseScheduleAtFlag(test.flag)
+			if test.expectedError != "" {
+				require.ErrorContains(t, err, test.expectedError)
+				assert.Equal(t, -1, hour)
+				assert.Nil(t, loc)
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotNil(t, loc)
+			assert.Equal(t, test.expectedHour, hour)
+			assert.Equal(t, test.expectedLoc, loc.String())
+		})
+	}
+}