set default values to simplify config

Author: skudasov

framework/components/blockchain/blockchain.go

@@ -9,9 +9,9 @@ type Input struct {
 	Type                     string   `toml:"type" validate:"required,oneof=anvil geth" envconfig:"net_type"`
 	Image                    string   `toml:"image" validate:"required"`
 	Tag                      string   `toml:"tag" validate:"required"`
-	PullImage                bool     `toml:"pull_image"`
-	Port                     string   `toml:"port" validate:"required"`
-	ChainID                  string   `toml:"chain_id" validate:"required"`
+	PullImage                bool     `toml:"pull_image" default:"true"`
+	Port                     string   `toml:"port" validate:"required" default:"8545"`
+	ChainID                  string   `toml:"chain_id" validate:"required" default:"31337"`
 	DockerCmdParamsOverrides []string `toml:"docker_cmd_params"`
 	Out                      *Output  `toml:"out"`
 }

framework/components/clnode/default.go

@@ -19,6 +19,10 @@ const defaultConfigTmpl = `
 [Log]
 Level = 'debug'
 
+[Pyroscope]
+ServerAddress = 'http://host.docker.internal:4040'
+Environment = 'local'
+
 [WebServer]
 HTTPWriteTimeout = '30s'
 SecureCookies = false

framework/components/simple_don/simple_don.go

@@ -6,14 +6,14 @@ import (
 )
 
 type Input struct {
-	Nodes int `toml:"nodes" validate:"required"`
-	*clnode.Input
-	Out *Output `toml:"out"`
+	Nodes    int           `toml:"nodes" validate:"required"`
+	NodeSpec *clnode.Input `toml:"node_spec" validate:"required"`
+	Out      *Output       `toml:"out"`
 }
 
 type Output struct {
 	UseCache bool             `toml:"use_cache"`
-	Nodes    []*clnode.Output `toml:"node"`
+	CLNodes  []*clnode.Output `toml:"cl_nodes"`
 }
 
 func NewSimpleDON(in *Input, bcOut *blockchain.Output, fakeUrl string) (*Output, error) {
@@ -26,18 +26,19 @@ func NewSimpleDON(in *Input, bcOut *blockchain.Output, fakeUrl string) (*Output,
 		if err != nil {
 			return nil, err
 		}
-		in.Input.Node.TestConfigOverrides = net
-		in.Input.DataProviderURL = fakeUrl
-		in.Input.Out = nil
-		o, err := clnode.NewNode(in.Input)
+		newIn := in.NodeSpec
+		newIn.Node.TestConfigOverrides = net
+		newIn.DataProviderURL = fakeUrl
+		newIn.Out = nil
+		o, err := clnode.NewNode(newIn)
 		if err != nil {
 			return nil, err
 		}
 		nodeOuts = append(nodeOuts, o)
 	}
 	out := &Output{
 		UseCache: true,
-		Nodes:    nodeOuts,
+		CLNodes:  nodeOuts,
 	}
 	in.Out = out
 	return out, nil

framework/config.go

@@ -68,7 +68,7 @@ func mergeInputs[T any]() (*T, error) {
 		L.Info().Str("Path", path).Msg("Loading configuration input")
 		data, err := os.ReadFile(filepath.Join(DefaultConfigDir, path))
 		if err != nil {
-			return nil, fmt.Errorf("error reading promtailConfig file %s: %w", path, err)
+			return nil, fmt.Errorf("error reading promtail config file %s: %w", path, err)
 		}
 		if L.GetLevel() == zerolog.DebugLevel {
 			fmt.Println(string(data))
@@ -304,7 +304,7 @@ func applyEnvConfig(prefix string, input interface{}) error {
 func getBaseConfigPath() (string, error) {
 	configs := os.Getenv("CTF_CONFIGS")
 	if configs == "" {
-		return "", fmt.Errorf("no %s env var is provided, you should provide at least one test promtailConfig in TOML", EnvVarTestConfigs)
+		return "", fmt.Errorf("no %s env var is provided, you should provide at least one test config in TOML", EnvVarTestConfigs)
 	}
 	return strings.Split(configs, ",")[0], nil
 }

framework/promtail.go

@@ -83,7 +83,7 @@ scrape_configs:
 
 	filePath := PathRoot + "/promtail-config.yml"
 
-	// Create the file where the promtailConfig will be written
+	// Create the file where the promtail config will be written
 	configFile, err := os.CreateTemp("", "promtail-config.yml")
 	if err != nil {
 		return "", fmt.Errorf("could not create promtail-config.yml file: %w", err)
@@ -92,15 +92,15 @@ scrape_configs:
 
 	tmpl, err := template.New("promtail").Parse(configTemplate)
 	if err != nil {
-		return "", fmt.Errorf("could not parse promtailConfig template: %w", err)
+		return "", fmt.Errorf("could not parse promtail config template: %w", err)
 	}
 
 	err = tmpl.Execute(configFile, secrets)
 	if err != nil {
-		return "", fmt.Errorf("could not execute promtailConfig template: %w", err)
+		return "", fmt.Errorf("could not execute promtail config template: %w", err)
 	}
 
-	fmt.Printf("Promtail promtailConfig written to %s\n", filePath)
+	fmt.Printf("Promtail config written to %s\n", filePath)
 	return configFile.Name(), nil
 }
 

framework/secretsmanager.go

@@ -72,7 +72,7 @@ func NewAWSSecretsManager(requestTimeout time.Duration) (*AWSSecretsManager, err
 	}
 	cfg.Region = region
 	if err != nil {
-		return nil, fmt.Errorf("unable to load AWS SDK promtailConfig, %v", err)
+		return nil, fmt.Errorf("unable to load AWS SDK config, %v", err)
 	}
 	l := log.Logger.With().Str("Component", "AWSSecretsManager").Logger()
 	l.Info().Msg("Connecting to AWS Secrets Manager")