Skip to content

Commit 2aaade5

Browse files
author
Roberto Sora
committed
removed getters and related usage for version package
1 parent 46ca29c commit 2aaade5

File tree

4 files changed

+6
-29
lines changed

4 files changed

+6
-29
lines changed

cli/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ func InitInstance() *rpc.InitResp {
9191
logrus.Info("Initializing package manager")
9292
req := packageManagerInitReq()
9393

94-
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s/Build:%s", version.GetApplication(),
95-
version.GetVersion(), runtime.GOARCH, runtime.GOOS, runtime.Version(), version.GetCommit(), version.GetBuildDate())
94+
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s/Build:%s", VersionInfo.Application,
95+
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit, VersionInfo.BuildDate)
9696
downloaderHeaders := http.Header{"User-Agent": []string{userAgentValue}}
9797

9898
resp, err := commands.Init(context.Background(), req, OutputProgressBar(), OutputTaskProgress(), downloaderHeaders)

cli/daemon/daemon.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/arduino/arduino-cli/cli"
2828
"github.com/arduino/arduino-cli/daemon"
2929
"github.com/arduino/arduino-cli/rpc"
30-
"github.com/arduino/arduino-cli/version"
3130
"github.com/spf13/cobra"
3231
"google.golang.org/grpc"
3332
)
@@ -57,12 +56,11 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
5756
}
5857
s := grpc.NewServer()
5958

60-
userAgentValue := fmt.Sprintf("%s daemon/%s (%s; %s; %s) Commit:%s/Build:%s ", version.GetApplication(),
61-
version.GetVersion(), runtime.GOARCH, runtime.GOOS, runtime.Version(), version.GetCommit(), version.GetBuildDate())
59+
userAgentValue := fmt.Sprintf("%s/%s daemon (%s; %s; %s) Commit:%s/Build:%s", cli.VersionInfo.Application,
60+
cli.VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), cli.VersionInfo.Commit, cli.VersionInfo.BuildDate)
6261
headers := http.Header{"User-Agent": []string{userAgentValue}}
6362

6463
coreServer := daemon.ArduinoCoreServerImpl{DownloaderHeaders: headers}
65-
6664
rpc.RegisterArduinoCoreServer(s, &coreServer)
6765
if err := s.Serve(lis); err != nil {
6866
log.Fatalf("failed to serve: %v", err)

cli/root/root.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"github.com/arduino/arduino-cli/cli/version"
3636
"github.com/arduino/arduino-cli/common/formatter"
3737
"github.com/arduino/arduino-cli/configs"
38-
ver "github.com/arduino/arduino-cli/version"
3938
"github.com/arduino/go-paths-helper"
4039
"github.com/mattn/go-colorable"
4140
"github.com/sirupsen/logrus"
@@ -49,7 +48,7 @@ func Init() *cobra.Command {
4948
Use: "arduino-cli",
5049
Short: "Arduino CLI.",
5150
Long: "Arduino Command Line Interface (arduino-cli).",
52-
Example: " " + ver.GetAppName() + " <command> [flags...]",
51+
Example: " " + cli.VersionInfo.Application + " <command> [flags...]",
5352
PersistentPreRun: preRun,
5453
}
5554
command.PersistentFlags().BoolVar(&cli.GlobalFlags.Debug, "debug", false, "Enables debug output (super verbose, used to debug the CLI).")
@@ -92,7 +91,7 @@ func preRun(cmd *cobra.Command, args []string) {
9291
}
9392
initConfigs()
9493

95-
logrus.Info(ver.GetAppName() + "-" + ver.GetVersion())
94+
logrus.Info(cli.VersionInfo.Application + "-" + cli.VersionInfo.VersionString)
9695
logrus.Info("Starting root command preparation (`arduino`)")
9796
switch outputFormat {
9897
case "text":

version/version.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,6 @@ var (
2929
buildDate = time.Time{}
3030
)
3131

32-
func GetAppName() string {
33-
return ""
34-
}
35-
36-
func GetApplication() string {
37-
return ""
38-
}
39-
40-
func GetVersion() string {
41-
return defaultVersionString
42-
}
43-
44-
func GetCommit() string {
45-
return commit
46-
}
47-
48-
func GetBuildDate() string {
49-
return ""
50-
}
51-
5232
type Info struct {
5333
Application string `json:"Application"`
5434
VersionString string `json:"VersionString"`

0 commit comments

Comments
 (0)