public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix conflict

This commit is contained in:
Nikola Jokic 2025-03-07 13:43:26 +01:00
parent 5c3da5216b
commit 553ac61a2d
No known key found for this signature in database
GPG Key ID: 09265A4BEA4F568A
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ghalistener/config/config_client_test.go
View File

@ -46,7 +46,7 @@ func TestCustomerServerRootCA(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
certsString = string(rootCA) 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) require.NoError(t, err)
certsString = certsString + string(intermediate) certsString = certsString + string(intermediate)

4
github/fake/fake.go
View File

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

8
test/e2e/e2e_test.go
View File

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