Skip to content

Commit

Permalink
Format all code (#1136)
Browse files Browse the repository at this point in the history
  • Loading branch information
isaac-boaz-trimble committed Jul 3, 2024
1 parent 7626c89 commit 673c8d0
Show file tree
Hide file tree
Showing 29 changed files with 4,045 additions and 4,042 deletions.
24 changes: 12 additions & 12 deletions atrium/buildopts/argosyopts/options_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ var data []string = []string{"One", "Two", "Three", "Four", "Five",

// using tests from 8/24/22
var TimeData = map[string][]float64{
data[0]: []float64{0.0, .650, .95, 5.13, 317.85, 317.85},
data[1]: []float64{0.0, 0.3, 0.56, 5.06, 78.4, 78.4},
data[2]: []float64{0.0, 0.2, 0.38, 5.33, 78.4, 78.4},
data[3]: []float64{0.0, 0.34, 0.36, 5.25, 141.93, 141.93},
data[4]: []float64{0.0, 0.24, 0.52, 4.87, 141.91, 141.91},
data[5]: []float64{0.0, 0.24, 0.6, 5.39, 148.01, 148.01},
data[6]: []float64{0.0, 0.11, 0.13, 4.89, 32.47, 32.47},
data[7]: []float64{0.0, 0.08, 0.1, 4.82, 32.49, 32.49},
data[8]: []float64{0.0, 0.33, 0.5, 5.21, 89.53, 89.53},
data[9]: []float64{0.0, 0.3, 0.62, 5, 599.99}, //when test fails no repeat at end
data[10]: []float64{0.0, 0.19, 0.47, 4.87, 38.5, 38.5},
data[11]: []float64{0.0, 0.26, 0.58, 5, 39.08, 39.08},
data[0]: {0.0, .650, .95, 5.13, 317.85, 317.85},
data[1]: {0.0, 0.3, 0.56, 5.06, 78.4, 78.4},
data[2]: {0.0, 0.2, 0.38, 5.33, 78.4, 78.4},
data[3]: {0.0, 0.34, 0.36, 5.25, 141.93, 141.93},
data[4]: {0.0, 0.24, 0.52, 4.87, 141.91, 141.91},
data[5]: {0.0, 0.24, 0.6, 5.39, 148.01, 148.01},
data[6]: {0.0, 0.11, 0.13, 4.89, 32.47, 32.47},
data[7]: {0.0, 0.08, 0.1, 4.82, 32.49, 32.49},
data[8]: {0.0, 0.33, 0.5, 5.21, 89.53, 89.53},
data[9]: {0.0, 0.3, 0.62, 5, 599.99}, //when test fails no repeat at end
data[10]: {0.0, 0.19, 0.47, 4.87, 38.5, 38.5},
data[11]: {0.0, 0.26, 0.58, 5, 39.08, 39.08},
}

// GetStubbedDataFlowStatistics returns the list data being tracked along with time data for the data being tracked.
Expand Down
24 changes: 12 additions & 12 deletions atrium/buildopts/argosyopts/options_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ var data []string = []string{"One", "Two", "Three", "Four", "Five",
"Ten", "Eleven", "Twelve"}

var TimeData = map[string][]float64{
data[0]: []float64{0.0, .650, .95, 5.13, 317.85, 317.85},
data[1]: []float64{0.0, 0.3, 0.56, 5.06, 78.4, 78.4},
data[2]: []float64{0.0, 0.2, 0.38, 5.33, 78.4, 78.4},
data[3]: []float64{0.0, 0.34, 0.36, 5.25, 141.93, 141.93},
data[4]: []float64{0.0, 0.24, 0.52, 4.87, 141.91, 141.91},
data[5]: []float64{0.0, 0.24, 0.6, 5.39, 148.01, 148.01},
data[6]: []float64{0.0, 0.11, 0.13, 4.89, 32.47, 32.47},
data[7]: []float64{0.0, 0.08, 0.1, 4.82, 32.49, 32.49},
data[8]: []float64{0.0, 0.33, 0.5, 5.21, 89.53, 89.53},
data[9]: []float64{0.0, 0.3, 0.62, 5, 599.99}, //when test fails no repeat at end
data[10]: []float64{0.0, 0.19, 0.47, 4.87, 38.5, 38.5},
data[11]: []float64{0.0, 0.26, 0.58, 5, 39.08, 39.08},
data[0]: {0.0, .650, .95, 5.13, 317.85, 317.85},
data[1]: {0.0, 0.3, 0.56, 5.06, 78.4, 78.4},
data[2]: {0.0, 0.2, 0.38, 5.33, 78.4, 78.4},
data[3]: {0.0, 0.34, 0.36, 5.25, 141.93, 141.93},
data[4]: {0.0, 0.24, 0.52, 4.87, 141.91, 141.91},
data[5]: {0.0, 0.24, 0.6, 5.39, 148.01, 148.01},
data[6]: {0.0, 0.11, 0.13, 4.89, 32.47, 32.47},
data[7]: {0.0, 0.08, 0.1, 4.82, 32.49, 32.49},
data[8]: {0.0, 0.33, 0.5, 5.21, 89.53, 89.53},
data[9]: {0.0, 0.3, 0.62, 5, 599.99}, //when test fails no repeat at end
data[10]: {0.0, 0.19, 0.47, 4.87, 38.5, 38.5},
data[11]: {0.0, 0.26, 0.58, 5, 39.08, 39.08},
}

var pointer int
Expand Down
2 changes: 1 addition & 1 deletion atrium/speculatio/spiralis/ttdirender/element.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func (er *ElementRenderer) InitRenderLoop(worldApp *g3nworld.WorldApp) bool {
for k, v := range er.LocationCache {
copyCache[k] = v
}
for key, _ := range copyCache {
for key := range copyCache {
element := worldApp.ConcreteElements[key]
if element.GetDetailedElement().Genre != "Solid" && element.GetDetailedElement().Name != "TenantDataBase" {
er.initLocnCache(worldApp, element)
Expand Down
108 changes: 54 additions & 54 deletions atrium/trcdb/xdbutil/xdbmanager.go
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
package xdbutil

import (
"os"

trcdb "github.com/trimble-oss/tierceron/atrium/trcdb"
"github.com/trimble-oss/tierceron/pkg/trcx/xutil"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"
)

// GenerateSeedsFromVaultToDb pulls all data from vault for each template into a database
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(&driverConfig.CoreConfig, err, false)
return nil, err
}

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

// Get files from directory
tempTemplatePaths := []string{}
for _, startDir := range driverConfig.StartDir {
//get files from directory
tp := xutil.GetDirFiles(startDir)
tempTemplatePaths = append(tempTemplatePaths, tp...)
}

//Duplicate path remover
keys := make(map[string]bool)
templatePaths := []string{}
for _, path := range tempTemplatePaths {
if _, value := keys[path]; !value {
keys[path] = true
templatePaths = append(templatePaths, path)
}
}

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

return tierceronEngine, nil
}
package xdbutil

import (
"os"

trcdb "github.com/trimble-oss/tierceron/atrium/trcdb"
"github.com/trimble-oss/tierceron/pkg/trcx/xutil"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"
)

// GenerateSeedsFromVaultToDb pulls all data from vault for each template into a database
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(&driverConfig.CoreConfig, err, false)
return nil, err
}

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

// Get files from directory
tempTemplatePaths := []string{}
for _, startDir := range driverConfig.StartDir {
//get files from directory
tp := xutil.GetDirFiles(startDir)
tempTemplatePaths = append(tempTemplatePaths, tp...)
}

//Duplicate path remover
keys := make(map[string]bool)
templatePaths := []string{}
for _, path := range tempTemplatePaths {
if _, value := keys[path]; !value {
keys[path] = true
templatePaths = append(templatePaths, path)
}
}

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

return tierceronEngine, nil
}
6 changes: 3 additions & 3 deletions atrium/vestibulum/trcsh/kube/native/trckube.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
kubectlutil "k8s.io/kubectl/pkg/util"

"github.com/go-git/go-billy/v5"
trcshMemFs "github.com/trimble-oss/tierceron/atrium/vestibulum/trcsh"
"github.com/trimble-oss/tierceron/atrium/vestibulum/trcsh/kube/native/path"
"github.com/trimble-oss/tierceron/atrium/vestibulum/trcsh/kube/native/trccreate"
trcshMemFs "github.com/trimble-oss/tierceron/atrium/vestibulum/trcsh"
"github.com/trimble-oss/tierceron/pkg/capauth"
"github.com/trimble-oss/tierceron/pkg/core"
eUtils "github.com/trimble-oss/tierceron/pkg/utils"
Expand Down Expand Up @@ -125,7 +125,7 @@ func ParseTrcKubeContext(trcKubeContext *TrcKubeContext, deployArgs []string) *T
trcKubeContext = &TrcKubeContext{}
}

for i, _ := range deployArgs {
for i := range deployArgs {
if deployArgs[i] == "set-context" {
if i+1 < len(deployArgs) {
trcKubeContext.Context = deployArgs[i+1]
Expand Down Expand Up @@ -161,7 +161,7 @@ func ParseTrcKubeDeployDirective(trcKubeDirective *TrcKubeDirective, deployArgs
trcKubeDirective.Action = deployArgs[0]
deployArgs = deployArgs[1:]

for i, _ := range deployArgs {
for i := range deployArgs {
if trcKubeDirective.Action == "create" && (deployArgs[i] == "secret" || deployArgs[i] == "configmap") {
trcKubeDirective.Object = deployArgs[i]
if i+1 < len(deployArgs) {
Expand Down
4 changes: 2 additions & 2 deletions atrium/vestibulum/trcsh/trcshmemfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type TrcshMemFs struct {
BillyFs billy.Filesystem
}

func (t *TrcshMemFs)WriteToMemFile(driverConfig *eUtils.DriverConfig, memCacheLocal *sync.Mutex, byteData *[]byte, path string){
func (t *TrcshMemFs) WriteToMemFile(driverConfig *eUtils.DriverConfig, memCacheLocal *sync.Mutex, byteData *[]byte, path string) {

configMemFs := driverConfig.MemFs.(*TrcshMemFs)

Expand All @@ -37,4 +37,4 @@ func (t *TrcshMemFs)WriteToMemFile(driverConfig *eUtils.DriverConfig, memCacheLo
eUtils.LogInfo(&driverConfig.CoreConfig, "Unexpected memfile exists:"+path)
eUtils.CheckError(&driverConfig.CoreConfig, err, true)
}
}
}
Loading

0 comments on commit 673c8d0

Please sign in to comment.