From e8a218e7a4c30280560fbf0b032d407eb6b80081 Mon Sep 17 00:00:00 2001
From: Bogdan Drutu <bogdandrutu@gmail.com>
Date: Thu, 26 Mar 2020 09:32:05 -0700
Subject: [PATCH] Fix G07 errors in gosec evaluation (#704)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
---
 testbed/tests/scenarios.go  | 15 +++++++++++----
 testbed/tests/trace_test.go |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/testbed/tests/scenarios.go b/testbed/tests/scenarios.go
index 9e6366ec011..37dbda92b71 100644
--- a/testbed/tests/scenarios.go
+++ b/testbed/tests/scenarios.go
@@ -32,6 +32,7 @@ import (
 // createConfigFile creates a collector config file that corresponds to the
 // sender and receiver used in the test and returns the config file name.
 func createConfigFile(
+	t *testing.T,
 	sender testbed.DataSender, // Sender to send test data.
 	receiver testbed.DataReceiver, // Receiver to receive test data.
 	resultDir string, // Directory to write config file to.
@@ -128,14 +129,20 @@ service:
 	// Write the config string to a temporary file.
 	file, err := ioutil.TempFile("", "agent*.yaml")
 	if err != nil {
-		fmt.Print(err)
+		t.Error(err)
 		return ""
 	}
-	defer file.Close()
+
+	defer func() {
+		err := file.Close()
+		if err != nil {
+			t.Error(err)
+		}
+	}()
 
 	_, err = file.WriteString(config)
 	if err != nil {
-		fmt.Print(err)
+		t.Error(err)
 		return ""
 	}
 
@@ -156,7 +163,7 @@ func Scenario10kItemsPerSecond(
 		t.Fatal(err)
 	}
 
-	configFile := createConfigFile(sender, receiver, resultDir, nil)
+	configFile := createConfigFile(t, sender, receiver, resultDir, nil)
 	defer os.Remove(configFile)
 
 	if configFile == "" {
diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go
index 4fac7e30935..7db732b48d8 100644
--- a/testbed/tests/trace_test.go
+++ b/testbed/tests/trace_test.go
@@ -323,7 +323,7 @@ func TestTraceAttributesProcessor(t *testing.T) {
 `,
 			}
 
-			configFile := createConfigFile(test.sender, test.receiver, resultDir, processors)
+			configFile := createConfigFile(t, test.sender, test.receiver, resultDir, processors)
 			defer os.Remove(configFile)
 
 			if configFile == "" {