From 51480bff47d64c0b2e969281f2d5f806d11adc79 Mon Sep 17 00:00:00 2001
From: divolgin <dmitriy@replicated.com>
Date: Thu, 11 Jun 2020 07:56:21 -0700
Subject: [PATCH] Parse node 10 time format

---
 pkg/specs/replicatedapp/graphql.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkg/specs/replicatedapp/graphql.go b/pkg/specs/replicatedapp/graphql.go
index c15d884a9..4a3026fe5 100644
--- a/pkg/specs/replicatedapp/graphql.go
+++ b/pkg/specs/replicatedapp/graphql.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	multierror "github.com/hashicorp/go-multierror"
@@ -167,8 +168,24 @@ type GQLRegisterInstallResponse struct {
 }
 
 func parseServerTS(ts string) time.Time {
-	parsed, _ := time.Parse("Mon Jan 02 2006 15:04:05 GMT-0700 (MST)", ts)
-	return parsed
+	parsed, err := time.Parse(time.RFC3339, ts)
+	if err == nil {
+		return parsed
+	}
+
+	ts = strings.TrimSuffix(ts, "+0000 (UTC)")
+	parsed, err = time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)
+	if err == nil {
+		return parsed
+	}
+
+	ts = strings.TrimSuffix(ts, "+0000 (Coordinated Universal Time)")
+	parsed, err = time.Parse("Mon Jan 02 2006 15:04:05 MST", ts)
+	if err == nil {
+		return parsed
+	}
+
+	return time.Time{}
 }
 
 type license struct {