test: use T.Setenv to set env vars in tests (#8366)

This commit replaces `os.Setenv` with `t.Setenv` in tests. The environment variable is automatically restored to its original value when the test and all its subtests complete. Reference: https://pkg.go.dev/testing#T.Setenv Signed-off-by: Eng Zer Jun <[email protected]>
keptn-contrib · Jul 11, 2022 · 3d8f8bd · 3d8f8bd
1 parent 1aeba59
commit 3d8f8bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/pkg/helm/generated_chart_handler_test.go b/pkg/helm/generated_chart_handler_test.go
@@ -3,7 +3,6 @@ package helm
 import (
 	"errors"
 	"log"
-	"os"
 	"strings"
 	"testing"
 
@@ -133,8 +132,8 @@ func Test_getVirtualServicePublicHost(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			os.Setenv("HOSTNAME_TEMPLATE", tt.hostnameTemplate)
-			os.Setenv("INGRESS_HOSTNAME_SUFFIX", tt.hostnameSuffix)
+			t.Setenv("HOSTNAME_TEMPLATE", tt.hostnameTemplate)
+			t.Setenv("INGRESS_HOSTNAME_SUFFIX", tt.hostnameSuffix)
 			got, err := getVirtualServicePublicHost(tt.args.svc, tt.args.project, tt.args.stageName)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("getVirtualServicePublicHost() error = %v, wantErr %v", err, tt.wantErr)

diff --git a/pkg/mesh/ingress_config_test.go b/pkg/mesh/ingress_config_test.go
@@ -1,10 +1,10 @@
 package mesh
 
 import (
-	"github.com/keptn/go-utils/pkg/lib/v0_2_0"
-	"os"
 	"reflect"
 	"testing"
+
+	"github.com/keptn/go-utils/pkg/lib/v0_2_0"
 )
 
 func TestGetPublicDeploymentURI(t *testing.T) {
@@ -64,10 +64,10 @@ func TestGetPublicDeploymentURI(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			os.Setenv("INGRESS_HOSTNAME_SUFFIX", tt.ingressHostNameSuffix)
-			os.Setenv("INGRESS_PORT", tt.ingressPort)
-			os.Setenv("INGRESS_PROTOCOL", tt.ingressProtocol)
-			os.Setenv("HOSTNAME_TEMPLATE", tt.hostNameTemplate)
+			t.Setenv("INGRESS_HOSTNAME_SUFFIX", tt.ingressHostNameSuffix)
+			t.Setenv("INGRESS_PORT", tt.ingressPort)
+			t.Setenv("INGRESS_PROTOCOL", tt.ingressProtocol)
+			t.Setenv("HOSTNAME_TEMPLATE", tt.hostNameTemplate)
 			if got := GetPublicDeploymentURI(tt.args.event); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("GetPublicDeploymentURI() = %v, want %v", got, tt.want)
 			}