Skip to content

Fix time format RFC3339 in version #283 #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2019
Merged

Fix time format RFC3339 in version #283 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,27 @@ var (
defaultVersionString = "0.3.7-alpha.preview"
versionString = ""
commit = ""
buildDate = time.Time{}
buildDate = rfc3339Time{}
)

type rfc3339Time struct {
time.Time
}

func (r rfc3339Time) format() string {
return r.Time.Format(time.RFC3339)
}

func (r rfc3339Time) MarshalJSON() ([]byte, error) {
return []byte(`"` + r.format() + `"`), nil
}

// Info FIXMEDOC
type Info struct {
Application string `json:"Application"`
VersionString string `json:"VersionString"`
Commit string `json:"Commit"`
BuildDate time.Time `json:"BuildDate"`
Application string `json:"Application"`
VersionString string `json:"VersionString"`
Commit string `json:"Commit"`
BuildDate rfc3339Time `json:"BuildDate"`
}

// NewInfo FIXMEDOC
Expand All @@ -48,13 +60,13 @@ func NewInfo(application string) *Info {
}

func (i *Info) String() string {
return fmt.Sprintf("%s Version: %s Commit: %s BuildDate: %s", i.Application, i.VersionString, i.Commit, i.BuildDate)
return fmt.Sprintf("%s Version: %s Commit: %s BuildDate: %s", i.Application, i.VersionString, i.Commit, i.BuildDate.format())
}

//nolint:gochecknoinits
func init() {
if versionString == "" {
versionString = defaultVersionString
}
buildDate = time.Now().UTC()
buildDate = rfc3339Time{time.Now().UTC()}
}
4 changes: 2 additions & 2 deletions version/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ func TestIntegrationBuildInjectedInfo(t *testing.T) {
Application: goldenAppName,
VersionString: "0.0.0-test.preview",
Commit: "deadbeef",
BuildDate: time.Time{},
BuildDate: rfc3339Time{time.Time{}},
}
info := NewInfo(goldenAppName)
require.Equal(t, goldenInfo.Application, info.Application)
require.Equal(t, goldenInfo.VersionString, info.VersionString)
require.Equal(t, goldenInfo.Commit, info.Commit)
require.IsType(t, time.Time{}, info.BuildDate)
require.IsType(t, rfc3339Time{time.Time{}}, info.BuildDate)
require.False(t, info.BuildDate.IsZero())
}