Skip to content

Commit 190226d

Browse files
committed
cmd/version: rename hss references to fleetdb
1 parent a0c5d4d commit 190226d

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var cmdVersion = &cobra.Command{
1313
Run: func(cmd *cobra.Command, args []string) {
1414
fmt.Printf(
1515
"commit: %s\nbranch: %s\ngit summary: %s\nbuildDate: %s\nversion: %s\nGo version: %s\nironlib version: %s\nbmclib version: %s\nserverservice version: %s",
16-
version.GitCommit, version.GitBranch, version.GitSummary, version.BuildDate, version.AppVersion, version.GoVersion, version.IronlibVersion, version.BmclibVersion, version.ServerserviceVersion)
16+
version.GitCommit, version.GitBranch, version.GitSummary, version.BuildDate, version.AppVersion, version.GoVersion, version.IronlibVersion, version.BmclibVersion, version.FleetDBAPIVersion)
1717

1818
},
1919
}

internal/version/version.go

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ import (
1010
)
1111

1212
var (
13-
GitCommit string
14-
GitBranch string
15-
GitSummary string
16-
BuildDate string
17-
AppVersion string
18-
IronlibVersion = ironlibVersion()
19-
BmclibVersion = bmclibVersion()
20-
ServerserviceVersion = serverserviceVersion()
21-
GoVersion = runtime.Version()
13+
GitCommit string
14+
GitBranch string
15+
GitSummary string
16+
BuildDate string
17+
AppVersion string
18+
IronlibVersion = ironlibVersion()
19+
BmclibVersion = bmclibVersion()
20+
FleetDBAPIVersion = fleetdbAPIVersion()
21+
GoVersion = runtime.Version()
2222
)
2323

2424
type Version struct {
25-
GitCommit string `json:"git_commit"`
26-
GitBranch string `json:"git_branch"`
27-
GitSummary string `json:"git_summary"`
28-
BuildDate string `json:"build_date"`
29-
AppVersion string `json:"app_version"`
30-
GoVersion string `json:"go_version"`
31-
IronlibVersion string `json:"ironlib_version"`
32-
BmclibVersion string `json:"bmclib_version"`
33-
ServerserviceVersion string `json:"serverservice_version"`
25+
GitCommit string `json:"git_commit"`
26+
GitBranch string `json:"git_branch"`
27+
GitSummary string `json:"git_summary"`
28+
BuildDate string `json:"build_date"`
29+
AppVersion string `json:"app_version"`
30+
GoVersion string `json:"go_version"`
31+
IronlibVersion string `json:"ironlib_version"`
32+
BmclibVersion string `json:"bmclib_version"`
33+
FleetDBAPIVersion string `json:"fleetdbapi_version"`
3434
}
3535

3636
func Current() Version {
3737
return Version{
38-
GitBranch: GitBranch,
39-
GitCommit: GitCommit,
40-
GitSummary: GitSummary,
41-
BuildDate: BuildDate,
42-
AppVersion: AppVersion,
43-
GoVersion: GoVersion,
44-
IronlibVersion: IronlibVersion,
45-
BmclibVersion: BmclibVersion,
46-
ServerserviceVersion: ServerserviceVersion,
38+
GitBranch: GitBranch,
39+
GitCommit: GitCommit,
40+
GitSummary: GitSummary,
41+
BuildDate: BuildDate,
42+
AppVersion: AppVersion,
43+
GoVersion: GoVersion,
44+
IronlibVersion: IronlibVersion,
45+
BmclibVersion: BmclibVersion,
46+
FleetDBAPIVersion: FleetDBAPIVersion,
4747
}
4848
}
4949

@@ -53,10 +53,10 @@ func ExportBuildInfoMetric() {
5353
Name: "alloy_build_info",
5454
Help: "A metric with a constant '1' value, labeled by branch, commit, summary, builddate, version, goversion from which Alloy was built.",
5555
},
56-
[]string{"branch", "commit", "summary", "builddate", "version", "goversion", "ironlibversion", "serverserviceVersion"},
56+
[]string{"branch", "commit", "summary", "builddate", "version", "goversion", "ironlibversion", "fleetdbAPIVersion"},
5757
)
5858

59-
buildInfo.WithLabelValues(GitBranch, GitCommit, GitSummary, BuildDate, AppVersion, GoVersion, IronlibVersion, ServerserviceVersion).Set(1)
59+
buildInfo.WithLabelValues(GitBranch, GitCommit, GitSummary, BuildDate, AppVersion, GoVersion, IronlibVersion, FleetDBAPIVersion).Set(1)
6060
}
6161

6262
func ironlibVersion() string {
@@ -89,14 +89,14 @@ func bmclibVersion() string {
8989
return ""
9090
}
9191

92-
func serverserviceVersion() string {
92+
func fleetdbAPIVersion() string {
9393
buildInfo, ok := rdebug.ReadBuildInfo()
9494
if !ok {
9595
return ""
9696
}
9797

9898
for _, d := range buildInfo.Deps {
99-
if strings.Contains(d.Path, "serverservice") {
99+
if strings.Contains(d.Path, "fleetdb") {
100100
return d.Version
101101
}
102102
}

0 commit comments

Comments
 (0)