mirror of https://github.com/helm/helm
Merge pull request #6679 from thomastaylor312/feat/timestamp_hell
feat(*): Adds custom time package for better marshallingpull/6691/head
Taylor Thomas
6 years ago
committed by
GitHub
commit
5a23663c6b
@ -1 +1 @@
|
|||||||
{"name":"flummoxed-chickadee","info":{"first_deployed":"0001-01-01T00:00:00Z","last_deployed":"2016-01-16T00:00:00Z","deleted":"0001-01-01T00:00:00Z","status":"deployed","notes":"release notes"},"namespace":"default"}
|
{"name":"flummoxed-chickadee","info":{"first_deployed":"","last_deployed":"2016-01-16T00:00:00Z","deleted":"","status":"deployed","notes":"release notes"},"namespace":"default"}
|
||||||
|
|||||||
@ -0,0 +1,91 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Package time contains a wrapper for time.Time in the standard library and
|
||||||
|
// associated methods. This package mainly exists to workaround an issue in Go
|
||||||
|
// where the serializer doesn't omit an empty value for time:
|
||||||
|
// https://github.com/golang/go/issues/11939. As such, this can be removed if a
|
||||||
|
// proposal is ever accepted for Go
|
||||||
|
package time
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// emptyString contains an empty JSON string value to be used as output
|
||||||
|
var emptyString = `""`
|
||||||
|
|
||||||
|
// Time is a convenience wrapper around stdlib time, but with different
|
||||||
|
// marshalling and unmarshaling for zero values
|
||||||
|
type Time struct {
|
||||||
|
time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now returns the current time. It is a convenience wrapper around time.Now()
|
||||||
|
func Now() Time {
|
||||||
|
return Time{time.Now()}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t Time) MarshalJSON() ([]byte, error) {
|
||||||
|
if t.Time.IsZero() {
|
||||||
|
return []byte(emptyString), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return t.Time.MarshalJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Time) UnmarshalJSON(b []byte) error {
|
||||||
|
if bytes.Equal(b, []byte("null")) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// If it is empty, we don't have to set anything since time.Time is not a
|
||||||
|
// pointer and will be set to the zero value
|
||||||
|
if bytes.Equal([]byte(emptyString), b) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return t.Time.UnmarshalJSON(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
func Parse(layout, value string) (Time, error) {
|
||||||
|
t, err := time.Parse(layout, value)
|
||||||
|
return Time{Time: t}, err
|
||||||
|
}
|
||||||
|
func ParseInLocation(layout, value string, loc *time.Location) (Time, error) {
|
||||||
|
t, err := time.ParseInLocation(layout, value, loc)
|
||||||
|
return Time{Time: t}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func Date(year int, month time.Month, day, hour, min, sec, nsec int, loc *time.Location) Time {
|
||||||
|
return Time{Time: time.Date(year, month, day, hour, min, sec, nsec, loc)}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Unix(sec int64, nsec int64) Time { return Time{Time: time.Unix(sec, nsec)} }
|
||||||
|
|
||||||
|
func (t Time) Add(d time.Duration) Time { return Time{Time: t.Time.Add(d)} }
|
||||||
|
func (t Time) AddDate(years int, months int, days int) Time {
|
||||||
|
return Time{Time: t.Time.AddDate(years, months, days)}
|
||||||
|
}
|
||||||
|
func (t Time) After(u Time) bool { return t.Time.After(u.Time) }
|
||||||
|
func (t Time) Before(u Time) bool { return t.Time.Before(u.Time) }
|
||||||
|
func (t Time) Equal(u Time) bool { return t.Time.Equal(u.Time) }
|
||||||
|
func (t Time) In(loc *time.Location) Time { return Time{Time: t.Time.In(loc)} }
|
||||||
|
func (t Time) Local() Time { return Time{Time: t.Time.Local()} }
|
||||||
|
func (t Time) Round(d time.Duration) Time { return Time{Time: t.Time.Round(d)} }
|
||||||
|
func (t Time) Sub(u Time) time.Duration { return t.Time.Sub(u.Time) }
|
||||||
|
func (t Time) Truncate(d time.Duration) Time { return Time{Time: t.Time.Truncate(d)} }
|
||||||
|
func (t Time) UTC() Time { return Time{Time: t.Time.UTC()} }
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package time
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
testingTime, _ = Parse(time.RFC3339, "1977-09-02T22:04:05Z")
|
||||||
|
testingTimeString = `"1977-09-02T22:04:05Z"`
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestNonZeroValueMarshal(t *testing.T) {
|
||||||
|
res, err := json.Marshal(testingTime)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if testingTimeString != string(res) {
|
||||||
|
t.Errorf("expected a marshaled value of %s, got %s", testingTimeString, res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestZeroValueMarshal(t *testing.T) {
|
||||||
|
res, err := json.Marshal(Time{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if string(res) != emptyString {
|
||||||
|
t.Errorf("expected zero value to marshal to empty string, got %s", res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNonZeroValueUnmarshal(t *testing.T) {
|
||||||
|
var myTime Time
|
||||||
|
err := json.Unmarshal([]byte(testingTimeString), &myTime)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !myTime.Equal(testingTime) {
|
||||||
|
t.Errorf("expected time to be equal to %v, got %v", testingTime, myTime)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEmptyStringUnmarshal(t *testing.T) {
|
||||||
|
var myTime Time
|
||||||
|
err := json.Unmarshal([]byte(emptyString), &myTime)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !myTime.IsZero() {
|
||||||
|
t.Errorf("expected time to be equal to zero value, got %v", myTime)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestZeroValueUnmarshal(t *testing.T) {
|
||||||
|
// This test ensures that we can unmarshal any time value that was output
|
||||||
|
// with the current go default value of "0001-01-01T00:00:00Z"
|
||||||
|
var myTime Time
|
||||||
|
err := json.Unmarshal([]byte(`"0001-01-01T00:00:00Z"`), &myTime)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !myTime.IsZero() {
|
||||||
|
t.Errorf("expected time to be equal to zero value, got %v", myTime)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in new issue