const string for Version, Release, Confversion
The Version (e,g, 4.4 ), Release (git hash) and Confversion (e.g. 44) must be compiled into the code so that they can't be changed during run time and ensure this with the compiler Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
committed by
Jonathon Anderson
parent
841d4cf674
commit
ff10bc95bb
@@ -14,17 +14,13 @@ type BuildConfig struct {
|
||||
WWChrootdir string `default:"@WWCHROOTDIR@"`
|
||||
WWProvisiondir string `default:"@WWPROVISIONDIR@"`
|
||||
WWClientdir string `default:"@WWCLIENTDIR@"`
|
||||
version string `default:"@VERSION@"`
|
||||
release string `default:"@RELEASE@"`
|
||||
}
|
||||
|
||||
func (conf BuildConfig) Version() string {
|
||||
return conf.version
|
||||
}
|
||||
const Version = "@VERSION@"
|
||||
const Release = "@RELEASE@"
|
||||
|
||||
func (conf BuildConfig) Release() string {
|
||||
return conf.release
|
||||
}
|
||||
// must be set .in file so that its available for tests
|
||||
const Confversion = "45"
|
||||
|
||||
type TFTPConf struct {
|
||||
Enabled bool `yaml:"enabled" default:"true"`
|
||||
|
||||
@@ -51,8 +51,6 @@ func TestDefaultRootConf(t *testing.T) {
|
||||
assert.NotEmpty(t, conf.Paths.WWOverlaydir)
|
||||
assert.NotEmpty(t, conf.Paths.WWChrootdir)
|
||||
assert.NotEmpty(t, conf.Paths.WWProvisiondir)
|
||||
assert.NotEmpty(t, conf.Paths.Version)
|
||||
assert.NotEmpty(t, conf.Paths.Release)
|
||||
assert.NotEmpty(t, conf.Paths.WWClientdir)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package overlay
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/warewulf/warewulf/internal/pkg/node"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func Test_createIgnitionJson(t *testing.T) {
|
||||
|
||||
@@ -11,8 +11,9 @@ import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/warewulf/warewulf/internal/pkg/config"
|
||||
"github.com/warewulf/warewulf/internal/pkg/node"
|
||||
)
|
||||
|
||||
@@ -62,7 +63,7 @@ func New(t *testing.T) (env *TestEnv) {
|
||||
env.WriteFile(t, path.Join(Datadir, "warewulf/defaults.conf"), initDefaultsConf)
|
||||
|
||||
// re-read warewulf.conf
|
||||
conf := config.New()
|
||||
conf := warewulfconf.New()
|
||||
err = conf.Read(env.GetPath(path.Join(Sysconfdir, "warewulf/warewulf.conf")))
|
||||
assert.NoError(t, err)
|
||||
|
||||
|
||||
@@ -11,8 +11,7 @@ import (
|
||||
Return the version of wwctl
|
||||
*/
|
||||
func GetVersion() string {
|
||||
conf := warewulfconf.Get()
|
||||
return fmt.Sprintf("%s-%s", conf.Paths.Version(), conf.Paths.Release())
|
||||
return fmt.Sprintf("%s-%s", warewulfconf.Version, warewulfconf.Release)
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user