Skip to content

Commit

Permalink
Factor out CoreConfig (#1009)
Browse files Browse the repository at this point in the history 
* Factor out CoreConfig
* Stylistically, Log should always go as last element.
* Standardize on driverConfig DriverConfig
* Correct variable name and variable passing mechanism.
* Fixing an incorrect reference.
* Fix unsafe reference.

---------

Co-authored-by: Joel Rieke <joel@skykomish.tini.com>
  • Loading branch information
@mrjrieke
mrjrieke and Joel Rieke committed Mar 26, 2024
1 parent 79a255b commit 4a5d52d
Show file tree
Hide file tree
Showing 77 changed files with 1,810 additions and 1,583 deletions.
2 changes: 2 additions & 0 deletions atrium/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ replace github.com/dolthub/go-mysql-server => github.com/trimble-oss/go-mysql-se

//replace github.com/trimble-oss/tierceron-nute => ../tierceron-nute

// replace github.com/trimble-oss/tierceron => ../

replace github.com/g3n/engine v0.2.0 => github.com/mrjrieke/engine v0.2.1-0.20220803142437-5cc7bcf0b99d

replace fyne.io/fyne/v2 v2.1.3 => github.com/mrjrieke/fyne/v2 v2.1.3-6
Expand Down
24 changes: 17 additions & 7 deletions atrium/speculatio/fenestra/data/serverdata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/trimble-oss/tierceron/atrium/buildopts/argosyopts"
flowcore "github.com/trimble-oss/tierceron/atrium/trcflow/core"

"github.com/trimble-oss/tierceron/pkg/core"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"
helperkv "github.com/trimble-oss/tierceron/pkg/vaulthelper/kv"

Expand Down Expand Up @@ -82,23 +83,29 @@ func createDetailedElements(detailedElements []*mashupsdk.MashupDetailedElement,

// Returns an array of mashup detailed elements populated with each Tenant's data and Childnodes
func GetData(insecure *bool, logger *log.Logger, envPtr *string) []*mashupsdk.MashupDetailedElement {
config := eUtils.DriverConfig{Insecure: *insecure, Log: logger, ExitOnFailure: true}
driverConfig := &eUtils.DriverConfig{
CoreConfig: core.CoreConfig{
ExitOnFailure: true,
Log: logger,
},
Insecure: *insecure,
}
secretID := ""
appRoleID := ""
address := ""
token := ""
empty := ""

autoErr := eUtils.AutoAuth(&config, &secretID, &appRoleID, &token, &empty, envPtr, &address, nil, "", false)
eUtils.CheckError(&config, autoErr, true)
autoErr := eUtils.AutoAuth(driverConfig, &secretID, &appRoleID, &token, &empty, envPtr, &address, nil, "", false)
eUtils.CheckError(&driverConfig.CoreConfig, autoErr, true)

mod, modErr := helperkv.NewModifier(*insecure, token, address, *envPtr, nil, true, logger)
mod.Direct = true
mod.Env = *envPtr
eUtils.CheckError(&config, modErr, true)
eUtils.CheckError(&driverConfig.CoreConfig, modErr, true)
logger.Printf("Building fleet.\n")
ArgosyFleet, argosyErr := argosyopts.BuildFleet(mod, logger)
eUtils.CheckError(&config, argosyErr, true)
eUtils.CheckError(&driverConfig.CoreConfig, argosyErr, true)
logger.Printf("Fleet built.\n")

DetailedElements := []*mashupsdk.MashupDetailedElement{}
Expand Down Expand Up @@ -158,9 +165,12 @@ func GetData(insecure *bool, logger *log.Logger, envPtr *string) []*mashupsdk.Ma
func GetHeadlessData(insecure *bool, logger *log.Logger) []*mashupsdk.MashupDetailedElement {
data, TimeData := argosyopts.GetStubbedDataFlowStatistics()

config := eUtils.DriverConfig{Insecure: *insecure, Log: logger, ExitOnFailure: true}
config := &core.CoreConfig{
ExitOnFailure: true,
Log: logger,
}
ArgosyFleet, argosyErr := argosyopts.BuildFleet(nil, logger)
eUtils.CheckError(&config, argosyErr, true)
eUtils.CheckError(config, argosyErr, true)

dfstatData := map[string]float64{}
statGroup := []float64{}
Expand Down
3 changes: 2 additions & 1 deletion atrium/speculatio/maintest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"log"
"os"

"github.com/trimble-oss/tierceron/pkg/core"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"
)

Expand All @@ -19,7 +20,7 @@ func main() {

f, err := os.OpenFile(*logFilePtr, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
logger := log.New(f, "[trcgorillaz]", log.LstdFlags)
eUtils.CheckError(&eUtils.DriverConfig{Log: logger, ExitOnFailure: true}, err, true)
eUtils.CheckError(&core.CoreConfig{ExitOnFailure: true, Log: logger}, err, true)

//pluginConfig := buildopts.BuildOptions.GetTestConfig(*tokenPtr, false)

Expand Down
10 changes: 8 additions & 2 deletions atrium/speculatio/spiralis/visualizer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"os"

"github.com/trimble-oss/tierceron/pkg/core"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"

"github.com/trimble-oss/tierceron/atrium/buildopts/argosyopts"
Expand Down Expand Up @@ -75,9 +76,14 @@ func main() {
DetailedElements = libraryElementBundle.DetailedElements
} else if *headless && !*custos {
data, TimeData := argosyopts.GetStubbedDataFlowStatistics()
config := eUtils.DriverConfig{Insecure: *insecure, Log: logger, ExitOnFailure: true}
driverConfig := eUtils.DriverConfig{
CoreConfig: core.CoreConfig{
ExitOnFailure: true,
Log: logger,
},
Insecure: *insecure}
ArgosyFleet, argosyErr := argosyopts.BuildFleet(nil, logger)
eUtils.CheckError(&config, argosyErr, true)
eUtils.CheckError(&driverConfig.CoreConfig, argosyErr, true)

dfstatData := map[string]float64{}
pointer := 0
Expand Down
12 changes: 6 additions & 6 deletions atrium/trcdb/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
var m sync.Mutex

// CreateEngine - creates a Tierceron query engine for query of configurations.
func CreateEngine(config *eUtils.DriverConfig,
func CreateEngine(driverConfig *eUtils.DriverConfig,
templatePaths []string, env string, dbname string) (*engine.TierceronEngine, error) {

te := &engine.TierceronEngine{Database: sqlememory.NewDatabase(dbname), Engine: nil, TableCache: map[string]*engine.TierceronTable{}, Context: sqles.NewEmptyContext(), Config: *config}
te := &engine.TierceronEngine{Database: sqlememory.NewDatabase(dbname), Engine: nil, TableCache: map[string]*engine.TierceronTable{}, Context: sqles.NewEmptyContext(), Config: *driverConfig}

var goMod *helperkv.Modifier
goMod, errModInit := helperkv.NewModifier(config.Insecure, config.Token, config.VaultAddress, config.Env, config.Regions, false, config.Log)
goMod, errModInit := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.Env, driverConfig.Regions, false, driverConfig.CoreConfig.Log)
if errModInit != nil {
return nil, errModInit
}
Expand All @@ -41,9 +41,9 @@ func CreateEngine(config *eUtils.DriverConfig,

var envEnterprises []string
goMod.Env = ""
tempEnterprises, err := goMod.List("values", config.Log)
tempEnterprises, err := goMod.List("values", driverConfig.CoreConfig.Log)
if err != nil {
eUtils.LogErrorObject(config, err, false)
eUtils.LogErrorObject(&driverConfig.CoreConfig, err, false)
return nil, err
}
if tempEnterprises != nil {
Expand All @@ -57,7 +57,7 @@ func CreateEngine(config *eUtils.DriverConfig,
// Load all vault table data into tierceron sql engine.
for _, envEnterprise := range envEnterprises {
wgEnterprise.Add(1)
go func(config *eUtils.DriverConfig, enterpriseEnv string) {
go func(driverConfig *eUtils.DriverConfig, enterpriseEnv string) {
defer wgEnterprise.Done()
if !strings.Contains(enterpriseEnv, ".") {
return
Expand Down
20 changes: 10 additions & 10 deletions atrium/trcdb/xdbutil/xdbmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ import (
)

// GenerateSeedsFromVaultToDb pulls all data from vault for each template into a database
func GenerateSeedsFromVaultToDb(config *eUtils.DriverConfig) (interface{}, error) {
if config.Diff { //Clean flag in trcx
_, err1 := os.Stat(config.EndDir + config.Env)
err := os.RemoveAll(config.EndDir + config.Env)
func GenerateSeedsFromVaultToDb(driverConfig *eUtils.DriverConfig) (interface{}, error) {
if driverConfig.Diff { //Clean flag in trcx
_, err1 := os.Stat(driverConfig.EndDir + driverConfig.Env)
err := os.RemoveAll(driverConfig.EndDir + driverConfig.Env)

if err != nil {
eUtils.LogErrorObject(config, err, false)
eUtils.LogErrorObject(&driverConfig.CoreConfig, err, false)
return nil, err
}

if err1 == nil {
eUtils.LogInfo(config, "Seed removed from"+config.EndDir+config.Env)
eUtils.LogInfo(&driverConfig.CoreConfig, "Seed removed from"+driverConfig.EndDir+driverConfig.Env)
}
return nil, nil
}

// Get files from directory
tempTemplatePaths := []string{}
for _, startDir := range config.StartDir {
for _, startDir := range driverConfig.StartDir {
//get files from directory
tp := xutil.GetDirFiles(startDir)
tempTemplatePaths = append(tempTemplatePaths, tp...)
Expand All @@ -43,10 +43,10 @@ func GenerateSeedsFromVaultToDb(config *eUtils.DriverConfig) (interface{}, error
}
}

tierceronEngine, err := trcdb.CreateEngine(config,
templatePaths, config.Env, config.VersionFilter[0])
tierceronEngine, err := trcdb.CreateEngine(driverConfig,
templatePaths, driverConfig.Env, driverConfig.VersionFilter[0])
if err != nil {
eUtils.LogErrorObject(config, err, false)
eUtils.LogErrorObject(&driverConfig.CoreConfig, err, false)
return nil, err
}

Expand Down
Loading

0 comments on commit 4a5d52d

Please sign in to comment.