Skip to content

Commit 74e8e7c

Browse files
committed
adjust date time regex checks
now the year 838438 and sub-second measurements are allowed
1 parent 5bc73e5 commit 74e8e7c

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

redshift/resource_redshift_user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ func resourceRedshiftUserReadImpl(db *DBConnection, d *schema.ResourceData) erro
330330

331331
const redshiftDataApiInfinityDateString = "2038-01-19 03:14:04"
332332

333-
var redshiftDataApiDatetimeRegexp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$`)
334-
var correctDatetimeRegexp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+00$`)
333+
var redshiftDataApiDatetimeRegexp = regexp.MustCompile(`^\d+-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$`)
334+
var correctDatetimeRegexp = regexp.MustCompile(`^\d+-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d+)?\+00$`)
335335

336336
func validateAndAdjustValidUntil(validUntil string) (string, error) {
337337
if validUntil == redshiftDataApiInfinityDateString {

redshift/resource_redshift_user_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,14 @@ func Test_validateAndAdjustValidUntil(t *testing.T) {
573573
want: "2025-08-06 17:22:56+00",
574574
wantErr: false,
575575
},
576+
{
577+
name: "does not add suffix to correct datetime with sub-second check",
578+
args: args{
579+
validUntil: "2025-08-06 17:22:56.0+00",
580+
},
581+
want: "2025-08-06 17:22:56.0+00",
582+
wantErr: false,
583+
},
576584
{
577585
name: "returns error for invalid timezone",
578586
args: args{

0 commit comments

Comments
 (0)