From 06b407bb13d04dc9f3c0ff988a3c32e6f499f288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Mon, 7 Sep 2026 14:16:54 +0200 Subject: [PATCH 1/2] chore(test): Avoid printing test-credentials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit openshift-ci hides the entire file when the password is in the URL. Signed-off-by: Oliver Gondža --- .../openshift/e2e/ginkgo/fixture/gitserver/repo.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go b/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go index 9d914a7cd9f..92478444606 100644 --- a/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go +++ b/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go @@ -26,7 +26,7 @@ type Repo struct { repoName string cloneDir *os.Root - transport Transport + clonedOver Transport } // GetRepoHttpURL returns the HTTPS clone URL reachable from inside the cluster. @@ -54,10 +54,10 @@ func (r Repo) getRepoSshURLLocal() string { return fmt.Sprintf("ssh://%s@127.0.0.1:%d/%s/%s.git", giteaSSHLogin, r.server.localSSHPort, r.server.httpUsername, r.repoName) } -func (r *Repo) Clone(t Transport) (cleanup func(), err error) { - r.transport = t +func (r *Repo) Clone(transport Transport) (cleanup func(), err error) { + r.clonedOver = transport - if t == TransportSSH { + if transport == TransportSSH { if _, err := r.server.getSSHKeyFile(); err != nil { return nil, err } @@ -80,11 +80,11 @@ func (r *Repo) Clone(t Transport) (cleanup func(), err error) { } cloneURL := r.getRepoSshURLLocal() - if t == TransportHTTPS { + if transport == TransportHTTPS { cloneURL = r.getRepoHttpURLWithCredentials() } - GinkgoWriter.Println("Cloning repo:", cloneURL) + GinkgoWriter.Println("Cloning repo %q over %s", r.repoName, transport) out, err := r.git("clone", cloneURL, ".") if err != nil { @@ -149,7 +149,7 @@ func (r *Repo) git(args ...string) (string, error) { cmd := exec.Command("git", args...) // #nosec G204 // Binary is specified by literal cmd.Dir = r.cloneDir.Name() - if r.transport == TransportHTTPS { + if r.clonedOver == TransportHTTPS { cmd.Env = append(os.Environ(), "GIT_SSL_NO_VERIFY=true") } else { sshKeyFile, err := r.server.getSSHKeyFile() From cc08788f585486067cf7e567cb7a56c0da7dc273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Tue, 8 Sep 2026 13:16:17 +0200 Subject: [PATCH 2/2] fix: Fix static analysis errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Gondža --- test/openshift/e2e/ginkgo/fixture/gitserver/repo.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go b/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go index 92478444606..42a18d299ec 100644 --- a/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go +++ b/test/openshift/e2e/ginkgo/fixture/gitserver/repo.go @@ -25,7 +25,7 @@ type Repo struct { server *Server repoName string - cloneDir *os.Root + cloneDir *os.Root clonedOver Transport } @@ -84,7 +84,7 @@ func (r *Repo) Clone(transport Transport) (cleanup func(), err error) { cloneURL = r.getRepoHttpURLWithCredentials() } - GinkgoWriter.Println("Cloning repo %q over %s", r.repoName, transport) + GinkgoWriter.Printf("Cloning repo %q over %s", r.repoName, transport) out, err := r.git("clone", cloneURL, ".") if err != nil {