Skip to content

Remove build date from the version #300

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.

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 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cli/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
}
s := grpc.NewServer()

userAgentValue := fmt.Sprintf("%s/%s daemon (%s; %s; %s) Commit:%s/Build:%s", globals.VersionInfo.Application,
globals.VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), globals.VersionInfo.Commit, globals.VersionInfo.BuildDate)
userAgentValue := fmt.Sprintf("%s/%s daemon (%s; %s; %s) Commit:%s", globals.VersionInfo.Application,
globals.VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), globals.VersionInfo.Commit)
headers := http.Header{"User-Agent": []string{userAgentValue}}

coreServer := daemon.ArduinoCoreServerImpl{
Expand Down
4 changes: 2 additions & 2 deletions cli/globals/globals.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ var (
)

func getHTTPClientHeader() http.Header {
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s/Build:%s", VersionInfo.Application,
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit, VersionInfo.BuildDate)
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s", VersionInfo.Application,
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit)
downloaderHeaders := http.Header{"User-Agent": []string{userAgentValue}}
return downloaderHeaders
}
1 change: 0 additions & 1 deletion test/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,3 @@ def test_command_version():
assert parsed_out.get('Application', False) == 'arduino-cli'
assert isinstance(semver.parse(parsed_out.get('VersionString', False)), dict)
assert isinstance(parsed_out.get('Commit', False), str)
assert datetime.strptime(parsed_out.get('BuildDate')[:-2], '%Y-%m-%dT%H:%M:%S.%f')
25 changes: 4 additions & 21 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,19 @@ package version

import (
"fmt"
"time"
)

var (
defaultVersionString = "0.3.7-alpha.preview"
versionString = ""
commit = ""
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 rfc3339Time `json:"BuildDate"`
Application string `json:"Application"`
VersionString string `json:"VersionString"`
Commit string `json:"Commit"`
}

// NewInfo FIXMEDOC
Expand All @@ -55,18 +40,16 @@ func NewInfo(application string) *Info {
Application: application,
VersionString: versionString,
Commit: commit,
BuildDate: buildDate,
}
}

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

//nolint:gochecknoinits
func init() {
if versionString == "" {
versionString = defaultVersionString
}
buildDate = rfc3339Time{time.Now().UTC()}
}
4 changes: 0 additions & 4 deletions version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package version

import (
"testing"
"time"

"github.com/stretchr/testify/require"
)
Expand All @@ -35,12 +34,9 @@ func TestBuildInjectedInfo(t *testing.T) {
Application: goldenAppName,
VersionString: "0.0.0-test.preview",
Commit: "deadbeef",
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, rfc3339Time{time.Time{}}, info.BuildDate)
require.False(t, info.BuildDate.IsZero())
}