[chore]: dont set path for go in validate (#6273)

* fix: dont set path for go in validate Signed-off-by: sakshi1215 <[email protected]> * test Signed-off-by: sakshi1215 <[email protected]> * fix Signed-off-by: sakshi1215 <[email protected]> * add changelog entry Signed-off-by: sakshi1215 <[email protected]> * Update CHANGELOG.md * Update CHANGELOG.md * Update cmd/builder/internal/builder/config.go Co-authored-by: Dmitrii Anoshin <[email protected]> * fix Signed-off-by: Sakshi Patle <[email protected]> * fix Signed-off-by: Sakshi Patle <[email protected]> Signed-off-by: sakshi1215 <[email protected]> Signed-off-by: Sakshi Patle <[email protected]> Co-authored-by: Dmitrii Anoshin <[email protected]>
open-telemetry · Oct 25, 2022 · db0c250 · db0c250
1 parent 9a43339
commit db0c250
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go
@@ -90,6 +90,11 @@ func NewDefaultConfig() Config {
 
 // Validate checks whether the current configuration is valid
 func (c *Config) Validate() error {
+	return multierr.Combine(validateModules(c.Extensions), validateModules(c.Receivers), validateModules(c.Exporters), validateModules(c.Processors))
+}
+
+// SetGoPath sets go path
+func (c *Config) SetGoPath() error {
 	if !c.SkipCompilation || !c.SkipGetModules {
 		// #nosec G204
 		if _, err := exec.Command(c.Distribution.Go, "env").CombinedOutput(); err != nil {
@@ -99,11 +104,9 @@ func (c *Config) Validate() error {
 			}
 			c.Distribution.Go = path
 		}
-
 		c.Logger.Info("Using go", zap.String("go-executable", c.Distribution.Go))
 	}
-
-	return multierr.Combine(validateModules(c.Extensions), validateModules(c.Receivers), validateModules(c.Exporters), validateModules(c.Processors))
+	return nil
 }
 
 // ParseModules will parse the Modules entries and populate the missing values

diff --git a/cmd/builder/internal/builder/config_test.go b/cmd/builder/internal/builder/config_test.go
@@ -143,7 +143,8 @@ func TestInvalidModule(t *testing.T) {
 func TestNewDefaultConfig(t *testing.T) {
 	cfg := NewDefaultConfig()
 	require.NoError(t, cfg.ParseModules())
-	require.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.SetGoPath())
 }
 
 func TestNewBuiltinConfig(t *testing.T) {
@@ -156,6 +157,7 @@ func TestNewBuiltinConfig(t *testing.T) {
 	require.NoError(t, k.UnmarshalWithConf("", &cfg, koanf.UnmarshalConf{Tag: "mapstructure"}))
 	assert.NoError(t, cfg.ParseModules())
 	assert.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.SetGoPath())
 
 	// Unlike the config initialized in NewDefaultConfig(), we expect
 	// the builtin default to be practically useful, so there must be
@@ -175,6 +177,7 @@ func TestSkipGoValidation(t *testing.T) {
 		SkipGetModules:  true,
 	}
 	assert.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.SetGoPath())
 }
 
 func TestSkipGoInitialization(t *testing.T) {
@@ -183,5 +186,6 @@ func TestSkipGoInitialization(t *testing.T) {
 		SkipGetModules:  true,
 	}
 	assert.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.SetGoPath())
 	assert.Zero(t, cfg.Distribution.Go)
 }
diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go
@@ -53,6 +53,7 @@ func TestGenerateAndCompileDefault(t *testing.T) {
 	cfg.Distribution.OtelColVersion = "0.52.0"
 
 	assert.NoError(t, cfg.Validate())
+	assert.NoError(t, cfg.SetGoPath())
 	require.NoError(t, GenerateAndCompile(cfg))
 
 	// Sleep for 1 second to make sure all processes using the files are completed

diff --git a/cmd/builder/internal/command.go b/cmd/builder/internal/command.go
@@ -69,6 +69,10 @@ configuration is provided, ocb will generate a default Collector.
 				return fmt.Errorf("invalid configuration: %w", err)
 			}
 
+			if err := cfg.SetGoPath(); err != nil {
+				return fmt.Errorf("go not found: %w", err)
+			}
+
 			if err := cfg.ParseModules(); err != nil {
 				return fmt.Errorf("invalid module configuration: %w", err)
 			}