[XAPID-1065] Add seconds in the relative file path before uploading data to s3/gcs
diff --git a/uploader.go b/uploader.go
index d645a95..c37a257 100644
--- a/uploader.go
+++ b/uploader.go
@@ -165,7 +165,7 @@
func getDateFromDirTimestamp(timestamp string) string {
dateTime, _ := time.Parse(timestampLayout, timestamp)
date := dateTime.Format("2006-01-02") // same as YYYY-MM-dd
- time := dateTime.Format("15-04") // same as HH-mm
+ time := dateTime.Format("15-04-05") // same as HH-mm-ss
dateHourTS := "date=" + date + "/time=" + time
return dateHourTS
}
diff --git a/uploader_test.go b/uploader_test.go
index 03f1ce2..72d87ea 100644
--- a/uploader_test.go
+++ b/uploader_test.go
@@ -30,7 +30,7 @@
By("valid tenant")
tenant := "testorg~testenv"
- relativeFilePath := "/date=2006-01-02/time=15-04/fakefile.txt.gz"
+ relativeFilePath := "/date=2006-01-02/time=15-04-05/fakefile.txt.gz"
status, err := uploadFile(tenant, relativeFilePath, fp)
Expect(err).ShouldNot(HaveOccurred())
@@ -38,7 +38,7 @@
By("invalid tenant")
tenant = "o~e"
- relativeFilePath = "/date=2006-01-02/time=15-04/fakefile.txt.gz"
+ relativeFilePath = "/date=2006-01-02/time=15-04-05/fakefile.txt.gz"
status, err = uploadFile(tenant, relativeFilePath, fp)
Expect(err).Should(HaveOccurred())
@@ -81,7 +81,7 @@
Context("invalid tenant", func() {
It("should return error", func() {
tenant := "org~env"
- relativeFilePath := "/date=2016-01-01/time=22-45/a.txt.gz"
+ relativeFilePath := "/date=2016-01-01/time=22-45-05/a.txt.gz"
_, err := getSignedUrl(tenant, relativeFilePath)
Expect(err).Should(HaveOccurred())
@@ -91,7 +91,7 @@
Context("valid tenant", func() {
It("should return signed url", func() {
tenant := "testorg~testenv"
- relativeFilePath := "/date=2016-01-01/time=22-45/a.txt.gz"
+ relativeFilePath := "/date=2016-01-01/time=22-45-05/a.txt.gz"
url, err := getSignedUrl(tenant, relativeFilePath)
Expect(err).ShouldNot(HaveOccurred())
@@ -150,6 +150,6 @@
It("should return date/time formatted timestamp", func() {
timestamp := "20060102150405"
dateHourTS := getDateFromDirTimestamp(timestamp)
- Expect(dateHourTS).To(Equal("date=2006-01-02/time=15-04"))
+ Expect(dateHourTS).To(Equal("date=2006-01-02/time=15-04-05"))
})
})
