This commit is contained in:
Quentin McGaw
2020-08-29 19:14:52 +00:00
parent 049bc5b226
commit aac5274eab
8 changed files with 25 additions and 42 deletions

View File

@@ -10,10 +10,10 @@ import (
)
// Splash returns the welcome spash message
func Splash(version, vcsRef, buildDate string) string {
func Splash(version, commit, buildDate string) string {
lines := title()
lines = append(lines, "")
lines = append(lines, fmt.Sprintf("Running version %s built on %s (commit %s)", version, buildDate, vcsRef))
lines = append(lines, fmt.Sprintf("Running version %s built on %s (commit %s)", version, buildDate, commit))
lines = append(lines, "")
lines = append(lines, announcement()...)
lines = append(lines, "")

View File

@@ -108,11 +108,6 @@ type Reader interface {
// Public IP getters
GetPublicIPPeriod() (period time.Duration, err error)
// Version getters
GetVersion() string
GetBuildDate() string
GetVcsRef() string
}
type reader struct {

View File

@@ -1,20 +0,0 @@
package params
import (
libparams "github.com/qdm12/golibs/params"
)
func (r *reader) GetVersion() string {
version, _ := r.envParams.GetEnv("VERSION", libparams.Default("?"), libparams.CaseSensitiveValue())
return version
}
func (r *reader) GetBuildDate() string {
buildDate, _ := r.envParams.GetEnv("BUILD_DATE", libparams.Default("?"), libparams.CaseSensitiveValue())
return buildDate
}
func (r *reader) GetVcsRef() string {
buildDate, _ := r.envParams.GetEnv("VCS_REF", libparams.Default("?"), libparams.CaseSensitiveValue())
return buildDate
}