fix(datastore): Ensure the datastore time is returned as UTC

datastore/load_test.go

@@ -486,21 +486,6 @@ func TestLoadToInterface(t *testing.T) {
 			dst:  &withUntypedInterface{Field: 1e9},
 			want: &withUntypedInterface{Field: "Newly set"},
 		},
-		{
-			name: "struct with timestamp",
-			src: &pb.Entity{
-				Key: keyToProto(testKey0),
-				Properties: map[string]*pb.Value{
-					"Time": {ValueType: &pb.Value_TimestampValue{TimestampValue: &timestamppb.Timestamp{Seconds: 1605504600}}},
-				},
-			},
-			dst: &struct{ Time time.Time }{
-				Time: time.Time{},
-			},
-			want: &struct{ Time time.Time }{
-				Time: time.Unix(1605504600, 0).In(time.UTC),
-			},
-		},
 		{
 			name: "struct with civil.Date",
 			src: &pb.Entity{
@@ -584,6 +569,36 @@ func TestLoadToInterface(t *testing.T) {
 	}
 }
 
+func TestTimezone(t *testing.T) {
+	// Expect Local times to be represented in UTC
+	src := &pb.Entity{
+		Key: keyToProto(testKey0),
+		Properties: map[string]*pb.Value{
+			"Time": {ValueType: &pb.Value_TimestampValue{TimestampValue: &timestamppb.Timestamp{Seconds: 1605504600}}},
+		},
+	}
+
+	dst := &struct{ Time time.Time }{
+		Time: time.Time{},
+	}
+	want := &struct{ Time time.Time }{
+		Time: time.Unix(1605504600, 0).In(time.UTC),
+	}
+
+	err := loadEntityProto(dst, src)
+
+	if err != nil {
+		t.Fatalf("loadEntityProto: %v", err)
+	}
+
+	gotZone, _ := dst.Time.Zone()
+	wantZone, _ := want.Time.Zone()
+	if diff := testutil.Diff(gotZone, wantZone); diff != "" {
+		t.Fatalf("Mismatch: got - want +\n%s", diff)
+	}
+
+}
+
 func TestAlreadyPopulatedDst(t *testing.T) {
 	testCases := []struct {
 		desc string