checkpoint

Signed-off-by: Jeff Ortel <jortel@redhat.com>

Author: jortel

cmd/main.go

@@ -94,7 +94,12 @@ func addonManager(db *gorm.DB) (mgr manager.Manager, err error) {
 
 // main.
 func main() {
-	log.Info("Started", "settings", Settings)
+	log.Info(
+		"Starting",
+		"build",
+		Settings.Hub.Build,
+		"settings",
+		Settings)
 	var err error
 	defer func() {
 		if err != nil {

seed/seed.go

@@ -1,7 +1,6 @@
 package seed
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 
@@ -124,21 +123,23 @@ func matchBuild(db *gorm.DB) (matched bool, err error) {
 	if err != nil {
 		return
 	}
+	if build == "" {
+		return
+	}
 	matched = build == Settings.Hub.Build
 	log.Info("Seed build (version)", "matched", matched)
 	return
 }
 
 // getBuild returns the hub build version that seeded.
 func getBuild(db *gorm.DB) (version string, err error) {
-	setting := &model.Setting{}
-	err = db.First(setting, model.Setting{Key: BuildKey}).Error
+	setting := &model.Setting{
+		Key: BuildKey,
+	}
+	db = db.Where("key", BuildKey)
+	err = db.FirstOrCreate(setting).Error
 	if err != nil {
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			err = liberr.Wrap(err)
-		} else {
-			err = nil
-		}
+		err = liberr.Wrap(err)
 		return
 	}
 	if n, cast := setting.Value.(string); cast {
@@ -153,7 +154,8 @@ func saveBuild(db *gorm.DB) (err error) {
 		Key:   BuildKey,
 		Value: Settings.Hub.Build,
 	}
-	err = db.Save(setting).Error
+	db = db.Where("key", BuildKey)
+	err = db.Updates(setting).Error
 	if err != nil {
 		err = liberr.Wrap(err)
 		return

settings/hub.go

@@ -10,6 +10,7 @@ import (
 
 const (
 	EnvNamespace               = "NAMESPACE"
+	EnvBuild                   = "BUILD"
 	EnvDbPath                  = "DB_PATH"
 	EnvDbMaxCon                = "DB_MAX_CONNECTION"
 	EnvDbSeedPath              = "DB_SEED_PATH"
@@ -367,10 +368,13 @@ func (r *Hub) namespace() (ns string, err error) {
 // build returns the hub build version.
 // This is expected to be the output of `git describe`.
 // Examples:
-//
-//	v0.6.0
 //	v0.6.0-ea89gcd
+//	v0.6.0
 func (r *Hub) build() (version string, err error) {
+	version, found := os.LookupEnv(EnvBuild)
+	if found {
+		return
+	}
 	f, err := os.Open("/etc/hub-build")
 	if err != nil {
 		if os.IsNotExist(err) {