fix conflict

cmd/ghalistener/config/config_client_test.go

@@ -46,7 +46,7 @@ func TestCustomerServerRootCA(t *testing.T) {
 	require.NoError(t, err)
 	certsString = string(rootCA)
 
-	intermediate, err := os.ReadFile(filepath.Join(certsFolder, "intermediate.pem"))
+	intermediate, err := os.ReadFile(filepath.Join(certsFolder, "intermediate.crt"))
 	require.NoError(t, err)
 	certsString = certsString + string(intermediate)
 

github/fake/fake.go

@@ -31,7 +31,7 @@ type ListRunnersHandler struct {
 
 func (h *ListRunnersHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	w.WriteHeader(h.Status)
-	fmt.Fprintf(w, h.Body)
+	fmt.Fprintf(w, "%s", h.Body)
 }
 
 type Handler struct {
@@ -52,7 +52,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
-	fmt.Fprintf(w, h.Body)
+	fmt.Fprintf(w, "%s", h.Body)
 }
 
 type MapHandler struct {

test/e2e/e2e_test.go

@@ -654,7 +654,7 @@ func (e *env) checkGitHubToken(t *testing.T, tok string) error {
 			t.Logf("%v", ioerr)
 			return err
 		}
-		t.Logf(string(b))
+		t.Log(string(b))
 		return err
 	}
 
@@ -667,7 +667,7 @@ func (e *env) checkGitHubToken(t *testing.T, tok string) error {
 				t.Logf("%v", ioerr)
 				return err
 			}
-			t.Logf(string(b))
+			t.Log(string(b))
 			return err
 		}
 	}
@@ -679,7 +679,7 @@ func (e *env) checkGitHubToken(t *testing.T, tok string) error {
 				t.Logf("%v", ioerr)
 				return err
 			}
-			t.Logf(string(b))
+			t.Log(string(b))
 			return err
 		}
 	}
@@ -693,7 +693,7 @@ func (e *env) checkGitHubToken(t *testing.T, tok string) error {
 				t.Logf("%v", ioerr)
 				return err
 			}
-			t.Logf(string(b))
+			t.Log(string(b))
 			return err
 		}
 	}