pass stepName to maven utils for mavenBuild

SAP · Jun 16, 2023 · a4f99ae · a4f99ae
1 parent a57004b
commit a4f99ae
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/cmd/mavenBuild.go b/cmd/mavenBuild.go
@@ -23,7 +23,7 @@ const (
 )
 
 func mavenBuild(config mavenBuildOptions, telemetryData *telemetry.CustomData, commonPipelineEnvironment *mavenBuildCommonPipelineEnvironment) {
-	utils := maven.NewUtilsBundle()
+	utils := maven.NewUtilsBundle("mavenBuild")
 
 	err := runMavenBuild(&config, telemetryData, utils, commonPipelineEnvironment)
 	if err != nil {

diff --git a/cmd/mavenExecuteIntegration.go b/cmd/mavenExecuteIntegration.go
@@ -2,17 +2,18 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/SAP/jenkins-library/pkg/log"
-	"github.com/SAP/jenkins-library/pkg/maven"
-	"github.com/SAP/jenkins-library/pkg/telemetry"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"unicode"
+
+	"github.com/SAP/jenkins-library/pkg/log"
+	"github.com/SAP/jenkins-library/pkg/maven"
+	"github.com/SAP/jenkins-library/pkg/telemetry"
 )
 
 func mavenExecuteIntegration(config mavenExecuteIntegrationOptions, _ *telemetry.CustomData) {
-	err := runMavenExecuteIntegration(&config, maven.NewUtilsBundle())
+	err := runMavenExecuteIntegration(&config, maven.NewUtilsBundle(""))
 	if err != nil {
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}

diff --git a/cmd/mavenExecuteStaticCodeChecks.go b/cmd/mavenExecuteStaticCodeChecks.go
@@ -1,14 +1,15 @@
 package cmd
 
 import (
+	"strconv"
+
 	"github.com/SAP/jenkins-library/pkg/log"
 	"github.com/SAP/jenkins-library/pkg/maven"
 	"github.com/SAP/jenkins-library/pkg/telemetry"
-	"strconv"
 )
 
 func mavenExecuteStaticCodeChecks(config mavenExecuteStaticCodeChecksOptions, telemetryData *telemetry.CustomData) {
-	err := runMavenStaticCodeChecks(&config, telemetryData, maven.NewUtilsBundle())
+	err := runMavenStaticCodeChecks(&config, telemetryData, maven.NewUtilsBundle(""))
 	if err != nil {
 		log.Entry().WithError(err).Fatal("step execution failed")
 	}

diff --git a/pkg/maven/maven.go b/pkg/maven/maven.go
@@ -59,11 +59,13 @@ type utilsBundle struct {
 	*piperhttp.Client
 }
 
-func NewUtilsBundle() Utils {
+func NewUtilsBundle(stepName string) Utils {
 	utils := utilsBundle{
-		Command: &command.Command{},
-		Files:   &piperutils.Files{},
-		Client:  &piperhttp.Client{},
+		Command: &command.Command{
+			StepName: stepName,
+		},
+		Files:  &piperutils.Files{},
+		Client: &piperhttp.Client{},
 	}
 	utils.Stdout(log.Writer())
 	utils.Stderr(log.Writer())

diff --git a/pkg/versioning/maven.go b/pkg/versioning/maven.go
@@ -33,7 +33,7 @@ func (m *Maven) init() {
 	}
 
 	if m.utils == nil {
-		m.utils = maven.NewUtilsBundle()
+		m.utils = maven.NewUtilsBundle("")
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ func (m *Maven) init() { @@
     	}
     	if m.utils == nil {
-    		m.utils = maven.NewUtilsBundle()
+    		m.utils = maven.NewUtilsBundle("")
     	}
     }
@@ Expand Down @@