re-commit of changes

pkg/sdk/resource_monitors.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"time"
 )
 
 var (
@@ -98,16 +97,19 @@ func (row *resourceMonitorRow) convert() (*ResourceMonitor, error) {
 		resourceMonitor.Frequency = *frequency
 	}
 	if row.StartTime.Valid {
-		const YYMMDDhhmm = "2006-01-02 15:04"
-		t, err := time.Parse(time.RFC3339, row.StartTime.String)
+		convertedStartTime, err := ParseTimestampWithOffset(row.StartTime.String, "2006-01-02 15:04")
 		if err != nil {
 			return nil, err
 		}
-		localTime := t.Local()
-		resourceMonitor.StartTime = localTime.Format(YYMMDDhhmm)
+		resourceMonitor.StartTime = convertedStartTime
 	}
+
 	if row.EndTime.Valid {
-		resourceMonitor.EndTime = row.EndTime.String
+		convertedEndTime, err := ParseTimestampWithOffset(row.EndTime.String, "2006-01-02 15:04")
+		if err != nil {
+			return nil, err
+		}
+		resourceMonitor.EndTime = convertedEndTime
 	}
 	suspendTriggers, err := extractTriggerInts(row.SuspendAt)
 	if err != nil {