Skip to content

Commit 0c95087

Browse files
authored
remove build date from the version (#300)
1 parent 633e9ab commit 0c95087

File tree

5 files changed

+8
-30
lines changed

5 files changed

+8
-30
lines changed

Diff for: cli/daemon/daemon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
5555
}
5656
s := grpc.NewServer()
5757

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

6262
coreServer := daemon.ArduinoCoreServerImpl{

Diff for: cli/globals/globals.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ var (
4242
)
4343

4444
func getHTTPClientHeader() http.Header {
45-
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s/Build:%s", VersionInfo.Application,
46-
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit, VersionInfo.BuildDate)
45+
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s", VersionInfo.Application,
46+
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit)
4747
downloaderHeaders := http.Header{"User-Agent": []string{userAgentValue}}
4848
return downloaderHeaders
4949
}

Diff for: test/test_main.py

-1
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,3 @@ def test_command_version():
106106
assert parsed_out.get('Application', False) == 'arduino-cli'
107107
assert isinstance(semver.parse(parsed_out.get('VersionString', False)), dict)
108108
assert isinstance(parsed_out.get('Commit', False), str)
109-
assert datetime.strptime(parsed_out.get('BuildDate')[:-2], '%Y-%m-%dT%H:%M:%S.%f')

Diff for: version/version.go

+4-21
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,19 @@ package version
1919

2020
import (
2121
"fmt"
22-
"time"
2322
)
2423

2524
var (
2625
defaultVersionString = "0.3.7-alpha.preview"
2726
versionString = ""
2827
commit = ""
29-
buildDate = rfc3339Time{}
3028
)
3129

32-
type rfc3339Time struct {
33-
time.Time
34-
}
35-
36-
func (r rfc3339Time) format() string {
37-
return r.Time.Format(time.RFC3339)
38-
}
39-
40-
func (r rfc3339Time) MarshalJSON() ([]byte, error) {
41-
return []byte(`"` + r.format() + `"`), nil
42-
}
43-
4430
// Info FIXMEDOC
4531
type Info struct {
46-
Application string `json:"Application"`
47-
VersionString string `json:"VersionString"`
48-
Commit string `json:"Commit"`
49-
BuildDate rfc3339Time `json:"BuildDate"`
32+
Application string `json:"Application"`
33+
VersionString string `json:"VersionString"`
34+
Commit string `json:"Commit"`
5035
}
5136

5237
// NewInfo FIXMEDOC
@@ -55,18 +40,16 @@ func NewInfo(application string) *Info {
5540
Application: application,
5641
VersionString: versionString,
5742
Commit: commit,
58-
BuildDate: buildDate,
5943
}
6044
}
6145

6246
func (i *Info) String() string {
63-
return fmt.Sprintf("%s Version: %s Commit: %s BuildDate: %s", i.Application, i.VersionString, i.Commit, i.BuildDate.format())
47+
return fmt.Sprintf("%s Version: %s Commit: %s", i.Application, i.VersionString, i.Commit)
6448
}
6549

6650
//nolint:gochecknoinits
6751
func init() {
6852
if versionString == "" {
6953
versionString = defaultVersionString
7054
}
71-
buildDate = rfc3339Time{time.Now().UTC()}
7255
}

Diff for: version/version_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package version
1919

2020
import (
2121
"testing"
22-
"time"
2322

2423
"github.com/stretchr/testify/require"
2524
)
@@ -35,12 +34,9 @@ func TestBuildInjectedInfo(t *testing.T) {
3534
Application: goldenAppName,
3635
VersionString: "0.0.0-test.preview",
3736
Commit: "deadbeef",
38-
BuildDate: rfc3339Time{time.Time{}},
3937
}
4038
info := NewInfo(goldenAppName)
4139
require.Equal(t, goldenInfo.Application, info.Application)
4240
require.Equal(t, goldenInfo.VersionString, info.VersionString)
4341
require.Equal(t, goldenInfo.Commit, info.Commit)
44-
require.IsType(t, rfc3339Time{time.Time{}}, info.BuildDate)
45-
require.False(t, info.BuildDate.IsZero())
4642
}

0 commit comments

Comments
 (0)