From 0ba78e2cd731ef6459730682079b5b8b1360fffd Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 18 Feb 2019 00:44:43 +0800
Subject: [PATCH] update vendor

---
 Gopkg.lock                                         | 4 ++--
 vendor/yunion.io/x/pkg/util/regutils/regutils.go   | 6 ++++++
 vendor/yunion.io/x/pkg/util/timeutils/timeutils.go | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 5763c3d8a6..518fa29739 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1634,7 +1634,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:e78aec3a172eac3452533bdd7cbfb357853122fca029b28808acceb8ea82633a"
+  digest = "1:3b7b0660eacbcc2a7e03955abe3774f1d8ca39a20483e7397720dc47c6cc04ef"
   name = "yunion.io/x/pkg"
   packages = [
     "gotypes",
@@ -1667,7 +1667,7 @@
     "utils",
   ]
   pruneopts = "UT"
-  revision = "e2e42205d868c26829b9322b40cdc48f24fed379"
+  revision = "5fbe7b39e5f599aa49f6f597d57da460d93c26ff"
 
 [[projects]]
   branch = "master"
diff --git a/vendor/yunion.io/x/pkg/util/regutils/regutils.go b/vendor/yunion.io/x/pkg/util/regutils/regutils.go
index b196f2772f..6fd20266fc 100644
--- a/vendor/yunion.io/x/pkg/util/regutils/regutils.go
+++ b/vendor/yunion.io/x/pkg/util/regutils/regutils.go
@@ -27,6 +27,7 @@ var FULLISO_TIME_REG *regexp.Regexp
 var COMPACT_TIME_REG *regexp.Regexp
 var MYSQL_TIME_REG *regexp.Regexp
 var NORMAL_TIME_REG *regexp.Regexp
+var FULLNORMAL_TIME_REG *regexp.Regexp
 var RFC2882_TIME_REG *regexp.Regexp
 var EMAIL_REG *regexp.Regexp
 var CHINA_MOBILE_REG *regexp.Regexp
@@ -56,6 +57,7 @@ func init() {
 	COMPACT_TIME_REG = regexp.MustCompile(`^\d{14}$`)
 	MYSQL_TIME_REG = regexp.MustCompile(`^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$`)
 	NORMAL_TIME_REG = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$`)
+	FULLNORMAL_TIME_REG = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}$`)
 	RFC2882_TIME_REG = regexp.MustCompile(`[A-Z][a-z]{2}, [0-9]{1,2} [A-Z][a-z]{2} [0-9]{4} [0-9]{2}:[0-9]{2}:[0-9]{2} [A-Z]{3}`)
 	EMAIL_REG = regexp.MustCompile(`^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$`)
 	CHINA_MOBILE_REG = regexp.MustCompile(`^1[0-9-]{10}$`)
@@ -171,6 +173,10 @@ func MatchNormalTime(str string) bool {
 	return NORMAL_TIME_REG.MatchString(str)
 }
 
+func MatchFullNormalTime(str string) bool {
+	return FULLNORMAL_TIME_REG.MatchString(str)
+}
+
 func MatchRFC2882Time(str string) bool {
 	return RFC2882_TIME_REG.MatchString(str)
 }
diff --git a/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go
index ed6522dd37..d92e34844f 100644
--- a/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go
+++ b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go
@@ -26,6 +26,7 @@ const (
 	FullIsoTimeFormat     = "2006-01-02T15:04:05.000000Z"
 	MysqlTimeFormat       = "2006-01-02 15:04:05"
 	NormalTimeFormat      = "2006-01-02T15:04:05"
+	FullNormalTimeFormat  = "2006-01-02T15:04:05.000000"
 	CompactTimeFormat     = "20060102150405"
 	DateFormat            = "2006-01-02"
 	ShortDateFormat       = "20060102"
@@ -84,6 +85,10 @@ func ParseNormalTime(str string) (time.Time, error) {
 	return time.Parse(NormalTimeFormat, str)
 }
 
+func ParseFullNormalTime(str string) (time.Time, error) {
+	return time.Parse(FullNormalTimeFormat, str)
+}
+
 func ParseCompactTime(str string) (time.Time, error) {
 	return time.Parse(CompactTimeFormat, str)
 }
@@ -111,6 +116,8 @@ func ParseTimeStr(str string) (time.Time, error) {
 		return ParseMysqlTime(str)
 	} else if regutils.MatchNormalTime(str) {
 		return ParseNormalTime(str)
+	} else if regutils.MatchFullNormalTime(str) {
+		return ParseFullNormalTime(str)
 	} else if regutils.MatchRFC2882Time(str) {
 		return ParseRFC2882Time(str)
 	} else if regutils.MatchCompactTime(str) {