Refactor code to replace ioutil with os package for file operations and improve logging format

BraisVQ · BraisVQ · commit a0c81dbf169d · 2026-02-06T11:08:41.000+01:00
diff --git a/tests/create-projects/jenkinsfile_test.go b/tests/create-projects/jenkinsfile_test.go
@@ -5,8 +5,9 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -101,7 +102,7 @@ func TestCreateProjectThruWebhookProxyJenkinsFile(t *testing.T) {
 
 	defer reponse.Body.Close()
 
-	bodyBytes, _ := ioutil.ReadAll(reponse.Body)
+	bodyBytes, _ := io.ReadAll(reponse.Body)
 
 	if reponse.StatusCode >= http.StatusAccepted {
 		t.Fatalf("Could not post request: %s", string(bodyBytes))
@@ -154,7 +155,7 @@ func TestCreateProjectThruWebhookProxyJenkinsFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expected, err := ioutil.ReadFile("golden/jenkins-create-project-stages.json")
+	expected, err := os.ReadFile("golden/jenkins-create-project-stages.json")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/quickstarter/quickstarter_test.go b/tests/quickstarter/quickstarter_test.go
@@ -72,7 +72,7 @@ func TestQuickstarter(t *testing.T) {
 	}
 	dir, err := os.Getwd()
 	if err != nil {
-		logger.Error(fmt.Sprintf("Failed to get working directory: %v", err))
+		logger.Error("Failed to get working directory: %v", err)
 		return
 	}
 	quickstarterPaths = utils.RemoveExcludedQuickstarters(t, dir, quickstarterPaths)
@@ -138,17 +138,16 @@ func TestQuickstarter(t *testing.T) {
 
 				// Check if step should be skipped
 				if steps.ShouldSkipStep(t, &step, tmplData) {
-					logger.Info(fmt.Sprintf("⊘ Skipping step %d: %s (skip=%v, skipIf=%q)", i+1, step.Type, step.Skip, step.SkipIf))
-					continue
-				}
-
-				logger.Step(
-					i+1,
-					len(s.Steps),
-					step.Type,
-					step.Description,
-				)
+				logger.Info("⊘ Skipping step %d: %s (skip=%v, skipIf=%q)", i+1, step.Type, step.Skip, step.SkipIf)
+				continue
+			}
 
+			logger.Step(
+				i+1,
+				len(s.Steps),
+				step.Type,
+				step.Description,
+			)
 				report.RecordStepStart(i, step.Type, step.Description)
 
 				repoName := fmt.Sprintf("%s-%s", strings.ToLower(utils.PROJECT_NAME), step.ComponentID)
diff --git a/tests/quickstarter/reporting/export.go b/tests/quickstarter/reporting/export.go
@@ -3,7 +3,7 @@ package reporting
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 )
 
 // JUnitTestSuite represents a JUnit test suite
@@ -75,7 +75,7 @@ func ExportJUnitXML(report *TestReport, outputPath string) error {
 		return err
 	}
 
-	if err := ioutil.WriteFile(outputPath, data, 0644); err != nil {
+	if err := os.WriteFile(outputPath, data, 0644); err != nil {
 		return fmt.Errorf("failed to write JUnit report: %w", err)
 	}
 
@@ -89,7 +89,7 @@ func ExportJSON(report *TestReport, outputPath string) error {
 		return err
 	}
 
-	if err := ioutil.WriteFile(outputPath, data, 0644); err != nil {
+	if err := os.WriteFile(outputPath, data, 0644); err != nil {
 		return fmt.Errorf("failed to write JSON report: %w", err)
 	}
 
diff --git a/tests/quickstarter/steps.go b/tests/quickstarter/steps.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/ghodss/yaml"
@@ -23,7 +23,7 @@ type TestSteps struct {
 // It does not allow extra fields to avoid typos, and checks if the given
 // step types are known.
 func readSteps(folder string) (*TestSteps, error) {
-	yamlContent, err := ioutil.ReadFile(folder + "/steps.yml")
+	yamlContent, err := os.ReadFile(folder + "/steps.yml")
 	if err != nil {
 		return nil, fmt.Errorf("Cannot read file: %w", err)
 	}
diff --git a/tests/quickstarter/steps/bitbucket.go b/tests/quickstarter/steps/bitbucket.go
@@ -172,7 +172,7 @@ func executeBitbucketDeleteFiles(t *testing.T, step TestStep, params *TestStepBi
 	logger.Waiting("Executing Bitbucket delete-files script")
 	stdout, stderr, err := utils.RunScriptFromBaseDir("tests/scripts/delete-files-from-bitbucket-with-git.sh", scriptArgs, []string{})
 	if err != nil {
-		logger.Error(fmt.Sprintf("Bitbucket delete-files script output:\n%s", stdout))
+		logger.Error("Bitbucket delete-files script output:\n%s", stdout)
 		logger.Failure("Delete files from Bitbucket", err)
 		t.Fatalf(
 			"Execution of `delete-files-from-bitbucket-with-git.sh` failed: \nStdOut: %s\nStdErr: %s\nErr: %s\n",
@@ -261,7 +261,7 @@ func uploadFileToBitbucket(t *testing.T, uploadParams *TestStepUploadParams, tmp
 		fmt.Sprintf("--filename=%s", filename),
 	}, []string{})
 	if err != nil {
-		logger.Error(fmt.Sprintf("BitBucket upload script output:\n%s", stdout))
+		logger.Error("BitBucket upload script output:\n%s", stdout)
 		logger.Failure("Upload file to BitBucket", err)
 		t.Fatalf(
 			"Execution of `upload-file-to-bitbucket-with-git.sh` failed: \nStdOut: %s\nStdErr: %s\nErr: %s\n",
@@ -449,7 +449,7 @@ func recreateBitbucketRepo(config map[string]string, project string, repo string
 
 	// If deletion was scheduled (202), wait for it to complete
 	if resp.StatusCode == http.StatusAccepted {
-		logger.Info(fmt.Sprintf("Repository %s/%s scheduled for deletion, waiting...", project, repo))
+		logger.Info("Repository %s/%s scheduled for deletion, waiting...", project, repo)
 		// Wait for repository to be deleted
 		for i := 0; i < 30; i++ {
 			time.Sleep(2 * time.Second)
@@ -464,7 +464,7 @@ func recreateBitbucketRepo(config map[string]string, project string, repo string
 			if i == 29 {
 				return fmt.Errorf("Timeout waiting for repository %s/%s to be deleted", project, repo)
 			}
-			logger.Info(fmt.Sprintf("Waiting for repository deletion (attempt %d/30)...", i+1))
+			logger.Info("Waiting for repository deletion (attempt %d/30)...", i+1)
 		}
 	}
 
diff --git a/tests/quickstarter/steps/openshift.go b/tests/quickstarter/steps/openshift.go
@@ -13,12 +13,12 @@ import (
 func deleteOpenShiftResources(projectID string, componentID string, namespace string) error {
 	// Check if resources should be kept
 	if os.Getenv("KEEP_RESOURCES") == "true" {
-		logger.Warn(fmt.Sprintf("KEEP_RESOURCES=true: Skipping cleanup for component: %s in namespace: %s", componentID, namespace))
+		logger.Warn("KEEP_RESOURCES=true: Skipping cleanup for component: %s in namespace: %s", componentID, namespace)
 		return nil
 	}
 	logger.Running(fmt.Sprintf("Cleanup for component: %s in namespace: %s", componentID, namespace))
 	label := fmt.Sprintf("app=%s-%s", projectID, componentID)
-	logger.Debug(fmt.Sprintf("Delete resources labelled with: %s", label))
+	logger.Debug("Delete resources labelled with: %s", label)
 	stdout, stderr, err := runOcCmd([]string{
 		"-n", namespace,
 		"delete", "all", "-l", label,
@@ -41,7 +41,7 @@ func deleteOpenShiftResources(projectID string, componentID string, namespace st
 func deleteOpenShiftResourceByName(resourceType string, resourceName string, namespace string) error {
 	// Check if resources should be kept
 	if os.Getenv("KEEP_RESOURCES") == "true" {
-		logger.Warn(fmt.Sprintf("KEEP_RESOURCES=true: Skipping cleanup for resource: %s/%s in namespace: %s", resourceType, resourceName, namespace))
+		logger.Warn("KEEP_RESOURCES=true: Skipping cleanup for resource: %s/%s in namespace: %s", resourceType, resourceName, namespace)
 		return nil
 	}
 	logger.Running(fmt.Sprintf("Cleanup for resource: %s/%s in %s", resourceType, resourceName, namespace))
@@ -70,7 +70,7 @@ func deleteOpenShiftResourceByName(resourceType string, resourceName string, nam
 func deleteHelmRelease(releaseName string, namespace string) error {
 	// Check if resources should be kept
 	if os.Getenv("KEEP_RESOURCES") == "true" {
-		logger.Warn(fmt.Sprintf("KEEP_RESOURCES=true: Skipping cleanup for Helm release: %s in namespace: %s", releaseName, namespace))
+		logger.Warn("KEEP_RESOURCES=true: Skipping cleanup for Helm release: %s in namespace: %s", releaseName, namespace)
 		return nil
 	}
 	logger.Waiting(fmt.Sprintf("Checking for Helm release: %s in %s", releaseName, namespace))
@@ -95,7 +95,7 @@ func deleteHelmRelease(releaseName string, namespace string) error {
 
 	// If the release doesn't exist, skip cleanup
 	if stdout == "" || len(bytes.TrimSpace([]byte(stdout))) == 0 {
-		logger.Info(fmt.Sprintf("Helm release %s not found, skipping cleanup", releaseName))
+		logger.Info("Helm release %s not found, skipping cleanup", releaseName)
 		return nil
 	}
 
diff --git a/tests/quickstarter/steps/portforward.go b/tests/quickstarter/steps/portforward.go
@@ -94,7 +94,7 @@ func (m *PortForwardManager) startPortForward(serviceName, namespace, remotePort
 		if attempt > 1 {
 			// Try next port
 			currentPort = startPort + attempt - 1
-			logger.Warn(fmt.Sprintf("Port %d in use, trying port %d...", currentPort-1, currentPort))
+			logger.Warn("Port %d in use, trying port %d...", currentPort-1, currentPort)
 		}
 
 		pf, err := m.startPortForwardAttempt(serviceName, namespace, remotePort, currentPort)
diff --git a/tests/quickstarter/steps/provision.go b/tests/quickstarter/steps/provision.go
@@ -52,7 +52,7 @@ func ExecuteProvision(t *testing.T, step TestStep, testdataPath string, tmplData
 			}
 			namespace := fmt.Sprintf("%s-%s", projectName, tmpNamespace)
 			if err := deleteOpenShiftResourceByName(it.ResourceType, it.ResourceName, namespace); err != nil {
-				logger.Warn(fmt.Sprintf("Failed to cleanup resource %s/%s: %v", it.ResourceType, it.ResourceName, err))
+				logger.Warn("Failed to cleanup resource %s/%s: %v", it.ResourceType, it.ResourceName, err)
 			} else {
 				logger.KeyValue(fmt.Sprintf("Cleaned %s", it.ResourceType), it.ResourceName)
 			}
@@ -113,27 +113,27 @@ func ExecuteProvision(t *testing.T, step TestStep, testdataPath string, tmplData
 	t.Cleanup(func() {
 		// Check if resources should be kept
 		if os.Getenv("KEEP_RESOURCES") == "true" {
-			logger.Warn(fmt.Sprintf("KEEP_RESOURCES=true: Skipping resource cleanup for component %s", step.ComponentID))
+			logger.Warn("KEEP_RESOURCES=true: Skipping resource cleanup for component %s", step.ComponentID)
 			return
 		}
 		logger.Running(fmt.Sprintf("Cleaning up resources for component %s", step.ComponentID))
 		if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameCD); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup CD resources: %v", err))
+			logger.Warn("Failed to cleanup CD resources: %v", err)
 		}
 		if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameDev); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup DEV resources: %v", err))
+			logger.Warn("Failed to cleanup DEV resources: %v", err)
 		}
 		if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameTest); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup TEST resources: %v", err))
+			logger.Warn("Failed to cleanup TEST resources: %v", err)
 		}
 		if err := deleteHelmRelease(step.ComponentID, projectNameCD); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in CD namespace: %v", err))
+			logger.Warn("Failed to cleanup Helm release in CD namespace: %v", err)
 		}
 		if err := deleteHelmRelease(step.ComponentID, projectNameDev); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in DEV namespace: %v", err))
+			logger.Warn("Failed to cleanup Helm release in DEV namespace: %v", err)
 		}
 		if err := deleteHelmRelease(step.ComponentID, projectNameTest); err != nil {
-			logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in TEST namespace: %v", err))
+			logger.Warn("Failed to cleanup Helm release in TEST namespace: %v", err)
 		}
 		logger.Success("Resource cleanup completed")
 	})
diff --git a/tests/quickstarter/steps/template.go b/tests/quickstarter/steps/template.go
@@ -1,7 +1,6 @@
 package steps
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -58,7 +57,7 @@ func CreateTemplateData(config map[string]string, componentID string, buildName
 		if value, ok := os.LookupEnv(tmplVar); ok {
 			key := strings.TrimPrefix(tmplVar, "TMPL_")
 			data[key] = value
-			logger.Debug(fmt.Sprintf("Loading environment variable: %s -> %s = '%s'", tmplVar, key, value))
+			logger.Debug("Loading environment variable: %s -> %s = '%s'", tmplVar, key, value)
 		}
 	}
 
@@ -71,7 +70,7 @@ func CreateTemplateData(config map[string]string, componentID string, buildName
 				// Only add if not already added above
 				if _, exists := data[key]; !exists {
 					data[key] = pair[1]
-					logger.Debug(fmt.Sprintf("Loading environment variable: %s -> %s = '%s'", pair[0], key, pair[1]))
+					logger.Debug("Loading environment variable: %s -> %s = '%s'", pair[0], key, pair[1])
 				}
 			}
 		}
diff --git a/tests/quickstarter/steps/url_resolver.go b/tests/quickstarter/steps/url_resolver.go
@@ -52,7 +52,7 @@ func ResolveServiceURL(t *testing.T, rawURL string, tmplData TemplateData) strin
 	serviceURL, err := parseInternalServiceURL(rendered)
 	if err != nil {
 		// Can't parse, return as-is and let it fail naturally
-		logger.Warn(fmt.Sprintf("Could not parse service URL: %s (error: %v)", rendered, err))
+		logger.Warn("Could not parse service URL: %s (error: %v)", rendered, err)
 		return rendered
 	}
 
diff --git a/tests/quickstarter/steps/verification.go b/tests/quickstarter/steps/verification.go
@@ -26,7 +26,7 @@ type VerificationContext struct {
 // definition are present.
 func verifyPipelineRun(t *testing.T, step TestStep, verify *TestStepVerify, testdataPath string, repoName string, buildName string, config map[string]string, projectName string) {
 	if verify == nil {
-		logger.Info(fmt.Sprintf("No verification defined for build: %s", buildName))
+		logger.Info("No verification defined for build: %s", buildName)
 		return
 	}
 
@@ -48,7 +48,7 @@ func verifyPipelineRun(t *testing.T, step TestStep, verify *TestStepVerify, test
 		strategy = VerifyStrategyAggregate
 	}
 	if strategy != VerifyStrategyAggregate && strategy != VerifyStrategyFailFast {
-		logger.Warn(fmt.Sprintf("Unknown verify strategy %q, defaulting to aggregate", strategy))
+		logger.Warn("Unknown verify strategy %q, defaulting to aggregate", strategy)
 		strategy = VerifyStrategyAggregate
 	}
 
@@ -241,7 +241,7 @@ func retrieveSonarScan(projectKey string, config map[string]string) (string, err
 	}, []string{})
 
 	if err != nil {
-		logger.Error(fmt.Sprintf("Execution of print-sonar-scan-run.sh failed: stdout=%s, stderr=%s", stdout, stderr))
+		logger.Error("Execution of print-sonar-scan-run.sh failed: stdout=%s, stderr=%s", stdout, stderr)
 		return "", err
 	}
 	logger.Success("Sonar scan result retrieved")
diff --git a/tests/quickstarter/steps/wait.go b/tests/quickstarter/steps/wait.go
@@ -109,7 +109,7 @@ func waitForPodReady(t *testing.T, params *TestStepWaitParams, namespace string,
 	deadline := time.Now().Add(timeout)
 	for time.Now().Before(deadline) {
 		// Use oc wait command
-		logger.Debug(fmt.Sprintf("Executing command: oc wait --for=condition=Ready %s -n %s --timeout=%s", resource, namespace, interval.String()))
+		logger.Debug("Executing command: oc wait --for=condition=Ready %s -n %s --timeout=%s", resource, namespace, interval.String())
 		cmd := exec.Command("oc", "wait", "--for=condition=Ready", "pod", resource,
 			"-n", namespace,
 			"--timeout="+interval.String())
@@ -125,7 +125,7 @@ func waitForPodReady(t *testing.T, params *TestStepWaitParams, namespace string,
 
 		// Check if it's a timeout (continue waiting) or a real error
 		if !strings.Contains(stderr.String(), "timed out") {
-			logger.Warn(fmt.Sprintf("oc wait command error: %s (retrying...)", stderr.String()))
+			logger.Warn("oc wait command error: %s (retrying...)", stderr.String())
 		}
 
 		time.Sleep(interval)
diff --git a/tests/utils/jenkins.go b/tests/utils/jenkins.go
@@ -5,8 +5,9 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"strings"
 	"time"
 
@@ -59,15 +60,15 @@ func RunJenkinsPipeline(jenkinsFile string, req RequestBuild, pipelineComponentP
 	}
 	defer response.Body.Close()
 
-	bodyBytes, err := ioutil.ReadAll(response.Body)
+	bodyBytes, err := io.ReadAll(response.Body)
 	if err != nil {
 		return "", err
 	}
 
 	fmt.Printf("Pipeline: %s, response: %s\n", pipelineComponentPart, string(bodyBytes))
 
 	if response.StatusCode >= http.StatusAccepted {
-		bodyBytes, err := ioutil.ReadAll(response.Body)
+		bodyBytes, err := io.ReadAll(response.Body)
 		if err != nil {
 			return "", err
 		}
@@ -259,7 +260,7 @@ func VerifyJenkinsRunAttachments(projectName string, buildName string, artifacts
 }
 
 func VerifyJenkinsStages(goldenFile string, gotStages string) error {
-	wantStages, err := ioutil.ReadFile(goldenFile)
+	wantStages, err := os.ReadFile(goldenFile)
 	if err != nil {
 		return fmt.Errorf("Failed to load golden file to verify Jenkins stages: %w", err)
 	}
diff --git a/tests/utils/provisioning.go b/tests/utils/provisioning.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 )
@@ -65,7 +65,7 @@ func (api *ProvisionAPI) CreateProject() ([]byte, error) {
 	fmt.Printf("Provision app raw logs: %s\n", stdout)
 
 	// get the (json) response from the script created file
-	log, err := ioutil.ReadFile("response.txt")
+	log, err := os.ReadFile("response.txt")
 	if err != nil {
 		return nil, fmt.Errorf("Could not read response file?!, %s", err)
 	}
@@ -126,7 +126,7 @@ func (api *ProvisionAPI) CreateComponent() ([]byte, error) {
 	fmt.Printf("Provision app raw logs:%s\n", stages)
 
 	// get the (json) response from the script created file
-	log, err := ioutil.ReadFile("response.txt")
+	log, err := os.ReadFile("response.txt")
 	if err != nil {
 		return nil, fmt.Errorf("Could not read response file?!, %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package reporting`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
`6`		`- "io/ioutil"`
	`6`	`+ "os"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// JUnitTestSuite represents a JUnit test suite`
`@@ -75,7 +75,7 @@ func ExportJUnitXML(report *TestReport, outputPath string) error {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`
`78`		`- if err := ioutil.WriteFile(outputPath, data, 0644); err != nil {`
	`78`	`+ if err := os.WriteFile(outputPath, data, 0644); err != nil {`
`79`	`79`	`return fmt.Errorf("failed to write JUnit report: %w", err)`
`80`	`80`	`}`
`81`	`81`
`@@ -89,7 +89,7 @@ func ExportJSON(report *TestReport, outputPath string) error {`
`89`	`89`	`return err`
`90`	`90`	`}`
`91`	`91`
`92`		`- if err := ioutil.WriteFile(outputPath, data, 0644); err != nil {`
	`92`	`+ if err := os.WriteFile(outputPath, data, 0644); err != nil {`
`93`	`93`	`return fmt.Errorf("failed to write JSON report: %w", err)`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (m *PortForwardManager) startPortForward(serviceName, namespace, remotePort`
`94`	`94`	`if attempt > 1 {`
`95`	`95`	`// Try next port`
`96`	`96`	`currentPort = startPort + attempt - 1`
`97`		`- logger.Warn(fmt.Sprintf("Port %d in use, trying port %d...", currentPort-1, currentPort))`
	`97`	`+ logger.Warn("Port %d in use, trying port %d...", currentPort-1, currentPort)`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`pf, err := m.startPortForwardAttempt(serviceName, namespace, remotePort, currentPort)`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func ExecuteProvision(t *testing.T, step TestStep, testdataPath string, tmplData`
`52`	`52`	`}`
`53`	`53`	`namespace := fmt.Sprintf("%s-%s", projectName, tmpNamespace)`
`54`	`54`	`if err := deleteOpenShiftResourceByName(it.ResourceType, it.ResourceName, namespace); err != nil {`
`55`		`- logger.Warn(fmt.Sprintf("Failed to cleanup resource %s/%s: %v", it.ResourceType, it.ResourceName, err))`
	`55`	`+ logger.Warn("Failed to cleanup resource %s/%s: %v", it.ResourceType, it.ResourceName, err)`
`56`	`56`	`} else {`
`57`	`57`	`logger.KeyValue(fmt.Sprintf("Cleaned %s", it.ResourceType), it.ResourceName)`
`58`	`58`	`}`
`@@ -113,27 +113,27 @@ func ExecuteProvision(t *testing.T, step TestStep, testdataPath string, tmplData`
`113`	`113`	`t.Cleanup(func() {`
`114`	`114`	`// Check if resources should be kept`
`115`	`115`	`if os.Getenv("KEEP_RESOURCES") == "true" {`
`116`		`- logger.Warn(fmt.Sprintf("KEEP_RESOURCES=true: Skipping resource cleanup for component %s", step.ComponentID))`
	`116`	`+ logger.Warn("KEEP_RESOURCES=true: Skipping resource cleanup for component %s", step.ComponentID)`
`117`	`117`	`return`
`118`	`118`	`}`
`119`	`119`	`logger.Running(fmt.Sprintf("Cleaning up resources for component %s", step.ComponentID))`
`120`	`120`	`if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameCD); err != nil {`
`121`		`- logger.Warn(fmt.Sprintf("Failed to cleanup CD resources: %v", err))`
	`121`	`+ logger.Warn("Failed to cleanup CD resources: %v", err)`
`122`	`122`	`}`
`123`	`123`	`if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameDev); err != nil {`
`124`		`- logger.Warn(fmt.Sprintf("Failed to cleanup DEV resources: %v", err))`
	`124`	`+ logger.Warn("Failed to cleanup DEV resources: %v", err)`
`125`	`125`	`}`
`126`	`126`	`if err := deleteOpenShiftResources(projectName, step.ComponentID, projectNameTest); err != nil {`
`127`		`- logger.Warn(fmt.Sprintf("Failed to cleanup TEST resources: %v", err))`
	`127`	`+ logger.Warn("Failed to cleanup TEST resources: %v", err)`
`128`	`128`	`}`
`129`	`129`	`if err := deleteHelmRelease(step.ComponentID, projectNameCD); err != nil {`
`130`		`- logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in CD namespace: %v", err))`
	`130`	`+ logger.Warn("Failed to cleanup Helm release in CD namespace: %v", err)`
`131`	`131`	`}`
`132`	`132`	`if err := deleteHelmRelease(step.ComponentID, projectNameDev); err != nil {`
`133`		`- logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in DEV namespace: %v", err))`
	`133`	`+ logger.Warn("Failed to cleanup Helm release in DEV namespace: %v", err)`
`134`	`134`	`}`
`135`	`135`	`if err := deleteHelmRelease(step.ComponentID, projectNameTest); err != nil {`
`136`		`- logger.Warn(fmt.Sprintf("Failed to cleanup Helm release in TEST namespace: %v", err))`
	`136`	`+ logger.Warn("Failed to cleanup Helm release in TEST namespace: %v", err)`
`137`	`137`	`}`
`138`	`138`	`logger.Success("Resource cleanup completed")`
`139`	`139`	`})`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package steps`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
`5`	`4`	`"os"`
`6`	`5`	`"strconv"`
`7`	`6`	`"strings"`
`@@ -58,7 +57,7 @@ func CreateTemplateData(config map[string]string, componentID string, buildName`
`58`	`57`	`if value, ok := os.LookupEnv(tmplVar); ok {`
`59`	`58`	`key := strings.TrimPrefix(tmplVar, "TMPL_")`
`60`	`59`	`data[key] = value`
`61`		`- logger.Debug(fmt.Sprintf("Loading environment variable: %s -> %s = '%s'", tmplVar, key, value))`
	`60`	`+ logger.Debug("Loading environment variable: %s -> %s = '%s'", tmplVar, key, value)`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`
`@@ -71,7 +70,7 @@ func CreateTemplateData(config map[string]string, componentID string, buildName`
`71`	`70`	`// Only add if not already added above`
`72`	`71`	`if _, exists := data[key]; !exists {`
`73`	`72`	`data[key] = pair[1]`
`74`		`- logger.Debug(fmt.Sprintf("Loading environment variable: %s -> %s = '%s'", pair[0], key, pair[1]))`
	`73`	`+ logger.Debug("Loading environment variable: %s -> %s = '%s'", pair[0], key, pair[1])`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func ResolveServiceURL(t *testing.T, rawURL string, tmplData TemplateData) strin`
`52`	`52`	`serviceURL, err := parseInternalServiceURL(rendered)`
`53`	`53`	`if err != nil {`
`54`	`54`	`// Can't parse, return as-is and let it fail naturally`
`55`		`- logger.Warn(fmt.Sprintf("Could not parse service URL: %s (error: %v)", rendered, err))`
	`55`	`+ logger.Warn("Could not parse service URL: %s (error: %v)", rendered, err)`
`56`	`56`	`return rendered`
`57`	`57`	`}`
`58`	`58`