Merge pull request #289 from m-lab/validation

Fix validation

Author: gfr10598

etl/etl_test.go

@@ -11,7 +11,7 @@ func TestValidation(t *testing.T) {
 	// These should fail:
 	// Leading character before gs://
 	_, err := etl.ValidateTestPath(
-		`xgs://m-lab-sandbox/ndt/2016/01/26/20160126T000000Z-mlab1-prg01-ndt-0007.tgz`)
+		`xgs://m-lab-sandbox/ndt/2016/01/26/20160126T123456Z-mlab1-prg01-ndt-0007.tgz`)
 	if err == nil {
 		t.Error("Should be invalid: ")
 	}
@@ -35,12 +35,12 @@ func TestValidation(t *testing.T) {
 		t.Error(err)
 	}
 	data, err = etl.ValidateTestPath(
-		`gs://m-lab-sandbox/ndt/2016/07/14/20160714T000000Z-mlab1-lax04-ndt-0001.tar`)
+		`gs://m-lab-sandbox/ndt/2016/07/14/20160714T123456Z-mlab1-lax04-ndt-0001.tar`)
 	if err != nil {
 		t.Error(err)
 	}
 	data, err = etl.ValidateTestPath(
-		`gs://m-lab-sandbox/ndt/2016/07/14/20160714T000000Z-mlab1-lax04-ndt-0001.tar.gz`)
+		`gs://m-lab-sandbox/ndt/2016/07/14/20160714T123456Z-mlab1-lax04-ndt-0001.tar.gz`)
 	if err != nil {
 		t.Error(err)
 	}

etl/globals.go

@@ -7,7 +7,7 @@ import (
 
 const start = `^gs://(?P<prefix>.*)/(?P<exp>[^/]*)/`
 const datePath = `(?P<datepath>\d{4}/[01]\d/[0123]\d)/`
-const dateTime = `(\d{4}[01]\d[0123]\d)T000000Z`
+const dateTime = `(\d{4}[01]\d[0123]\d)T\d{6}Z`
 const mlabN_podNN = `-(mlab\d)-([[:alpha:]]{3}\d[0-9t])-`
 const exp_NNNN = `(.*)-(\d{4})`
 const suffix = `(?:\.tar|\.tar.gz|\.tgz)$`
@@ -18,7 +18,7 @@ var (
 	// This matches any valid test file name, and some invalid ones.
 	TaskPattern = regexp.MustCompile(start + // #1 #2
 		datePath + // #3 - YYYY/MM/DD
-		dateTime + // #4 - YYYYMMDDT000000Z
+		dateTime + // #4 - YYYYMMDDTHHMMSSZ
 		mlabN_podNN + // #5 #6 - e.g. -mlab1-lax04-
 		exp_NNNN + // #7 #8 e.g. ndt-0001
 		suffix) // #9 typically .tgz