compat_otp: lint, vet, owners, etc.

stbenjam · stbenjam · commit c3a9176691b5 · 2025-08-11T11:57:47.000-04:00
diff --git a/test/extended/util/compat_otp/architecture/architecture.go b/test/extended/util/compat_otp/architecture/architecture.go
@@ -62,7 +62,7 @@ func SkipNonAmd64SingleArch(oc *exutil.CLI) (Architecture Architecture) {
 func GetAvailableArchitecturesSet(oc *exutil.CLI) []Architecture {
 	output, err := oc.WithoutNamespace().AsAdmin().Run("get").Args("nodes", "-o=jsonpath={.items[*].status.nodeInfo.architecture}").Output()
 	if err != nil {
-		e2e.Failf("unable to get the cluster architecture: ", err)
+		e2e.Failf("unable to get the cluster architecture: %v", err)
 	}
 	if output == "" {
 		e2e.Failf("the retrieved architecture is empty")
@@ -135,7 +135,7 @@ func (a Architecture) String() string {
 func ClusterArchitecture(oc *exutil.CLI) (architecture Architecture) {
 	output, err := oc.WithoutNamespace().AsAdmin().Run("get").Args("nodes", "-o=jsonpath={.items[*].status.nodeInfo.architecture}").Output()
 	if err != nil {
-		e2e.Failf("unable to get the cluster architecture: ", err)
+		e2e.Failf("unable to get the cluster architecture: %v", err)
 	}
 	if output == "" {
 		e2e.Failf("the retrieved architecture is empty")
diff --git a/test/extended/util/compat_otp/cloud/cloud.go b/test/extended/util/compat_otp/cloud/cloud.go
@@ -1,6 +1,5 @@
 package cloud
 
-
 import (
 	"context"
 	"fmt"
diff --git a/test/extended/util/compat_otp/clusterinfra/machine_helpers.go b/test/extended/util/compat_otp/clusterinfra/machine_helpers.go
@@ -172,7 +172,7 @@ func GetLatestMachineFromMachineSet(oc *exutil.CLI, machineSet string) string {
 		o.Expect(err).NotTo(o.HaveOccurred())
 		parsedMachineCreationTime, err := time.Parse(time.RFC3339, machineCreationTime)
 		if err != nil {
-			e2e.Logf("Error parsing time:", err)
+			e2e.Logf("Error parsing time: %v", err)
 			return ""
 		}
 		if parsedMachineCreationTime.After(newest) {
diff --git a/test/extended/util/compat_otp/container/quay_client.go b/test/extended/util/compat_otp/container/quay_client.go
@@ -100,10 +100,10 @@ func (c *QuayCLI) TryDeleteTag(imageIndex string) (bool, error) {
 		return false, err
 	}
 	response, err := client.Do(reqest)
-	defer response.Body.Close()
 	if err != nil {
 		return false, err
 	}
+	defer response.Body.Close()
 	if response.StatusCode != 204 {
 		e2e.Logf("delete %s failed, response code is %d", imageIndex, response.StatusCode)
 		return false, nil
@@ -140,10 +140,10 @@ func (c *QuayCLI) CheckTagNotExist(imageIndex string) (bool, error) {
 		return false, err
 	}
 	response, err := client.Do(reqest)
-	defer response.Body.Close()
 	if err != nil {
 		return false, err
 	}
+	defer response.Body.Close()
 	if response.StatusCode == 404 {
 		e2e.Logf("tag %s not exist", imageIndex)
 		return true, nil
@@ -198,10 +198,10 @@ func (c *QuayCLI) GetTags(imageIndex string) ([]TagInfo, error) {
 		return result, err
 	}
 	response, err := client.Do(reqest)
-	defer response.Body.Close()
 	if err != nil {
 		return result, err
 	}
+	defer response.Body.Close()
 	e2e.Logf("%s", response.Status)
 	if response.StatusCode != 200 {
 		e2e.Logf("get %s failed, response code is %d", imageIndex, response.StatusCode)
@@ -263,10 +263,10 @@ func (c *QuayCLI) TryChangeTag(imageTag, manifestDigest string) (bool, error) {
 		return false, err
 	}
 	response, err := client.Do(request)
-	defer response.Body.Close()
 	if err != nil {
 		return false, err
 	}
+	defer response.Body.Close()
 	if response.StatusCode != 201 {
 		e2e.Logf("change %s failed, response code is %d", imageTag, response.StatusCode)
 		return false, nil
diff --git a/test/extended/util/compat_otp/db/sqlit.go b/test/extended/util/compat_otp/db/sqlit.go
@@ -1,6 +1,5 @@
 package db
 
-
 import (
 	"database/sql"
 	"fmt"
@@ -244,7 +243,7 @@ func (c *Sqlit) Query(dbFilePath string, table string, column string) ([]string,
 		}
 		return valueList, nil
 	default:
-		err := fmt.Errorf("do not support to query table " + table)
+		err := fmt.Errorf("do not support to query table %s", table)
 		return nil, err
 	}
 }
diff --git a/test/extended/util/compat_otp/framework.go b/test/extended/util/compat_otp/framework.go
@@ -1,7 +1,5 @@
 package compat_otp
 
-import exutil "github.com/openshift/origin/test/extended/util"
-
 import (
 	"bufio"
 	"context"
@@ -19,8 +17,22 @@ import (
 	"time"
 
 	g "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	o "github.com/onsi/gomega"
-
+	appsv1 "github.com/openshift/api/apps/v1"
+	buildv1 "github.com/openshift/api/build/v1"
+	configv1 "github.com/openshift/api/config/v1"
+	imagev1 "github.com/openshift/api/image/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
+	appsv1clienttyped "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
+	buildv1clienttyped "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	imagev1typedclient "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
+	"github.com/openshift/library-go/pkg/apps/appsutil"
+	"github.com/openshift/library-go/pkg/build/naming"
+	"github.com/openshift/library-go/pkg/git"
+	"github.com/openshift/library-go/pkg/image/imageutil"
+	exutil "github.com/openshift/origin/test/extended/util"
+	testdata "github.com/openshift/origin/test/extended/util/compat_otp/testdata"
 	authorizationapi "k8s.io/api/authorization/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -47,22 +59,6 @@ import (
 	e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
 	"k8s.io/kubernetes/test/e2e/framework/statefulset"
 	"k8s.io/kubernetes/test/utils/image"
-
-	appsv1 "github.com/openshift/api/apps/v1"
-	buildv1 "github.com/openshift/api/build/v1"
-	configv1 "github.com/openshift/api/config/v1"
-	imagev1 "github.com/openshift/api/image/v1"
-	operatorv1 "github.com/openshift/api/operator/v1"
-	appsv1clienttyped "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
-	buildv1clienttyped "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
-	imagev1typedclient "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
-	"github.com/openshift/library-go/pkg/apps/appsutil"
-	"github.com/openshift/library-go/pkg/build/naming"
-	"github.com/openshift/library-go/pkg/git"
-	"github.com/openshift/library-go/pkg/image/imageutil"
-	testdata "github.com/openshift/origin/test/extended/util/compat_otp/testdata"
-
-	. "github.com/onsi/gomega"
 )
 
 func init() {
@@ -424,7 +420,7 @@ func DumpPodStates(oc *exutil.CLI) {
 		e2e.Logf("Error dumping pod states: %v", err)
 		return
 	}
-	e2e.Logf(out)
+	e2e.Logf("%s", out)
 }
 
 // DumpPodStatesInNamespace dumps the state of all pods in the provided namespace.
@@ -435,7 +431,7 @@ func DumpPodStatesInNamespace(namespace string, oc *exutil.CLI) {
 		e2e.Logf("Error dumping pod states: %v", err)
 		return
 	}
-	e2e.Logf(out)
+	e2e.Logf("%s", out)
 }
 
 // DumpPodLogsStartingWith will dump any pod starting with the name prefix provided
@@ -514,7 +510,7 @@ func DumpPodsCommand(c kubernetes.Interface, ns string, selector labels.Selector
 	}
 	for name, stdout := range values {
 		stdout = strings.TrimSuffix(stdout, "\n")
-		e2e.Logf(name + ": " + strings.Join(strings.Split(stdout, "\n"), fmt.Sprintf("\n%s: ", name)))
+		e2e.Logf("%s: %s", name, strings.Join(strings.Split(stdout, "\n"), fmt.Sprintf("\n%s: ", name)))
 	}
 }
 
@@ -526,7 +522,7 @@ func DumpConfigMapStates(oc *exutil.CLI) {
 		e2e.Logf("Error dumping configMap states: %v", err)
 		return
 	}
-	e2e.Logf(out)
+	e2e.Logf("%s", out)
 }
 
 // GetMasterThreadDump will get a golang thread stack dump
diff --git a/test/extended/util/compat_otp/hypeshift_cluster.go b/test/extended/util/compat_otp/hypeshift_cluster.go
@@ -87,14 +87,14 @@ func ValidHypershiftAndGetGuestKubeConf(oc *exutil.CLI) (string, string, string)
 	if os.Getenv("GUEST_KUBECONFIG") != "" {
 		e2e.Logf("the kubeconfig you set GUEST_KUBECONFIG must be that of the hosted cluster %s in namespace %s", clusterName, hostedclusterNS)
 		hostedClusterKubeconfigFile = os.Getenv("GUEST_KUBECONFIG")
-		e2e.Logf(fmt.Sprintf("use a known hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile))
+		e2e.Logf("use a known hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile)
 	} else {
 		hostedClusterKubeconfigFile = "/tmp/guestcluster-kubeconfig-" + clusterName + "-" + GetRandomString()
 		output, err := exec.Command("bash", "-c", fmt.Sprintf("hypershift create kubeconfig --name %s --namespace %s > %s",
 			clusterName, hostedclusterNS, hostedClusterKubeconfigFile)).Output()
 		e2e.Logf("the cmd output: %s", string(output))
 		o.Expect(err).NotTo(o.HaveOccurred())
-		e2e.Logf(fmt.Sprintf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile))
+		e2e.Logf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile)
 	}
 	e2e.Logf("if you want hostedcluster controlplane namespace, you could get it by combining %s and %s with -", hostedclusterNS, clusterName)
 	return clusterName, hostedClusterKubeconfigFile, hostedclusterNS
@@ -140,14 +140,14 @@ func ValidHypershiftAndGetGuestKubeConfWithNoSkip(oc *exutil.CLI) (string, strin
 	if os.Getenv("GUEST_KUBECONFIG") != "" {
 		e2e.Logf("the kubeconfig you set GUEST_KUBECONFIG must be that of the guestcluster %s in namespace %s", clusterName, hostedclusterNS)
 		hostedClusterKubeconfigFile = os.Getenv("GUEST_KUBECONFIG")
-		e2e.Logf(fmt.Sprintf("use a known hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile))
+		e2e.Logf("use a known hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile)
 	} else {
 		hostedClusterKubeconfigFile = "/tmp/guestcluster-kubeconfig-" + clusterName + "-" + GetRandomString()
 		output, err := exec.Command("bash", "-c", fmt.Sprintf("hypershift create kubeconfig --name %s --namespace %s > %s",
 			clusterName, hostedclusterNS, hostedClusterKubeconfigFile)).Output()
 		e2e.Logf("the cmd output: %s", string(output))
 		o.Expect(err).NotTo(o.HaveOccurred())
-		e2e.Logf(fmt.Sprintf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile))
+		e2e.Logf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile)
 	}
 	e2e.Logf("if you want hostedcluster controlplane namespace, you could get it by combining %s and %s with -", hostedclusterNS, clusterName)
 	return clusterName, hostedClusterKubeconfigFile, hostedclusterNS
diff --git a/test/extended/util/compat_otp/jenkins/ref.go b/test/extended/util/compat_otp/jenkins/ref.go
@@ -5,6 +5,7 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/url"
 	"os"
 	"regexp"
@@ -20,6 +21,7 @@ import (
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	buildv1 "github.com/openshift/api/build/v1"
+
 	exutil "github.com/openshift/origin/test/extended/util"
 	exurl "github.com/openshift/origin/test/extended/util/compat_otp/url"
 )
@@ -89,7 +91,7 @@ func (j *JenkinsRef) Namespace() string {
 // BuildURI builds a URI for the Jenkins server.
 func (j *JenkinsRef) BuildURI(resourcePathFormat string, a ...interface{}) string {
 	resourcePath := fmt.Sprintf(resourcePathFormat, a...)
-	return fmt.Sprintf("http://%s:%v/%s", j.host, j.port, resourcePath)
+	return fmt.Sprintf("http://%s/%s", net.JoinHostPort(j.host, j.port), resourcePath)
 }
 
 // GetResource submits a GET request to this Jenkins server.
@@ -271,7 +273,7 @@ func (j *JenkinsRef) ProcessJenkinsJobUsingVars(filename, namespace string, vars
 			e2e.Logf("problem diagnosing /tmp: %v", dbgerr)
 		} else {
 			for _, file := range files {
-				e2e.Logf("found file %s under temp isdir %q mode %s", file.Name(), file.IsDir(), file.Mode().String())
+				e2e.Logf("found file %s under temp isdir %t mode %s", file.Name(), file.IsDir(), file.Mode().String())
 			}
 		}
 	}
@@ -333,7 +335,7 @@ func (j *JenkinsRef) GetJobConsoleLogsAndMatchViaBuildResult(br *exutil.BuildRes
 			return "", err
 		}
 		bldURI = strings.Trim(url.Path, "/")
-		return j.WaitForContent(match, 200, 10*time.Minute, bldURI)
+		return j.WaitForContent(match, 200, 10*time.Minute, "%s", bldURI)
 	}
 	return "", fmt.Errorf("build %#v is missing the build uri annontation", br.Build)
 }
@@ -476,7 +478,7 @@ func DumpLogs(oc *exutil.CLI, t *exutil.BuildResult) (string, error) {
 		return "", err
 	}
 	jenkinsRef := NewRef(oc)
-	log, _, err := jenkinsRef.GetResource(jenkinsLogURL.Path)
+	log, _, err := jenkinsRef.GetResource("%s", jenkinsLogURL.Path)
 	if err != nil {
 		return "", fmt.Errorf("cannot get jenkins log: %v", err)
 	}
diff --git a/test/extended/util/compat_otp/logext/log.go b/test/extended/util/compat_otp/logext/log.go
@@ -1,6 +1,5 @@
 package logext
 
-
 /*
   author: rioliu@redhat.com
 */
diff --git a/test/extended/util/compat_otp/nfs.go b/test/extended/util/compat_otp/nfs.go
@@ -52,7 +52,7 @@ func SetupK8SNFSServerAndVolume(oc *exutil.CLI, count int) (*kapiv1.Pod, []*kapi
 	pvs := []*kapiv1.PersistentVolume{}
 	volLabel := labels.Set{e2epv.VolumeSelectorKey: oc.Namespace()}
 	for i := 0; i < count; i++ {
-		e2e.Logf(fmt.Sprintf("Creating persistent volume %d", i))
+		e2e.Logf("Creating persistent volume %d", i)
 		pvConfig := e2epv.PersistentVolumeConfig{
 			NamePrefix: "nfs-",
 			Labels:     volLabel,
diff --git a/test/extended/util/compat_otp/psap.go b/test/extended/util/compat_otp/psap.go
@@ -64,7 +64,7 @@ func WaitOprResourceReady(oc *exutil.CLI, kind, name, namespace string, islongdu
 			}
 		case "daemonset":
 			kindNames, err = oc.AsAdmin().WithoutNamespace().Run("get").Args(kind, name, "-n", namespace, "-oname").Output()
-			e2e.Logf("daemonset name is:" + kindNames)
+			e2e.Logf("daemonset name is: %s", kindNames)
 			if len(kindNames) == 0 || err != nil {
 				isCreated = false
 			} else {
@@ -88,7 +88,7 @@ func WaitOprResourceReady(oc *exutil.CLI, kind, name, namespace string, islongdu
 			e2e.Logf("Invalid Resource Type")
 		}
 
-		e2e.Logf("desiredNum is: " + desiredNum + " readyNum is: " + readyNum)
+		e2e.Logf("desiredNum is: %s readyNum is: %s", desiredNum, readyNum)
 		//daemonset/deloyment has been created, but not running, need to compare desiredNum and readynum
 		//if isCreate is true and the two value is equal, the pod is ready
 		if isCreated && len(kindNames) != 0 && desiredNum == readyNum {
@@ -310,7 +310,7 @@ func AssertOprPodLogsbyFilterWithDuration(oc *exutil.CLI, podName string, namesp
 	o.Expect(err).NotTo(o.HaveOccurred())
 	o.Expect(podList).To(o.ContainSubstring(podName))
 
-	e2e.Logf("Got pods list as below: \n" + podList)
+	e2e.Logf("Got pods list as below: \n%s", podList)
 	//Filter pod name base on deployment name
 	regexpoprname, _ := regexp.Compile(".*" + podName + ".*")
 	podListArry := regexpoprname.FindAllString(podList, -1)
@@ -343,7 +343,7 @@ func AssertOprPodLogsbyFilter(oc *exutil.CLI, podName string, namespace string,
 	o.Expect(err).NotTo(o.HaveOccurred())
 	o.Expect(podList).To(o.ContainSubstring(podName))
 
-	e2e.Logf("Got pods list as below: \n" + podList)
+	e2e.Logf("Got pods list as below: \n%s", podList)
 	//Filter pod name base on deployment name
 	regexpoprname, _ := regexp.Compile(".*" + podName + ".*")
 	podListArry := regexpoprname.FindAllString(podList, -1)
@@ -878,7 +878,7 @@ func ValidHypershiftAndGetGuestKubeConf4SecondHostedCluster(oc *exutil.CLI) (str
 	o.Expect(err).NotTo(o.HaveOccurred())
 
 	clusterNames := strings.Split(clusterNamesStr, " ")
-	e2e.Logf(fmt.Sprintf("clusterNames is: %v", clusterNames))
+	e2e.Logf("clusterNames is: %v", clusterNames)
 	if len(clusterNames) < 2 {
 		g.Skip("there is no second hosted cluster, skip test run")
 	}
@@ -898,7 +898,7 @@ func ValidHypershiftAndGetGuestKubeConf4SecondHostedCluster(oc *exutil.CLI) (str
 		clusterName, hostedclusterNS, hostedClusterKubeconfigFile)).Output()
 	e2e.Logf("the cmd output: %s", string(output))
 	o.Expect(err).NotTo(o.HaveOccurred())
-	e2e.Logf(fmt.Sprintf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile))
+	e2e.Logf("create a new hosted cluster kubeconfig: %v", hostedClusterKubeconfigFile)
 	e2e.Logf("if you want hostedcluster controlplane namespace, you could get it by combining %s and %s with -", hostedclusterNS, clusterName)
 	return clusterName, hostedClusterKubeconfigFile, hostedclusterNS
 }
diff --git a/test/extended/util/compat_otp/rosa.go b/test/extended/util/compat_otp/rosa.go
@@ -32,7 +32,7 @@ func ROSALogin() {
 	cmd := fmt.Sprintf(`rosa login --env "%s" --token "%s"`, os.Getenv("TEST_ROSA_LOGIN_ENV"), os.Getenv("TEST_ROSA_TOKEN"))
 	_, err := exec.Command("bash", "-c", cmd).Output()
 	if err != nil {
-		e2e.Failf("rosa cli login error" + err.Error())
+		e2e.Failf("rosa cli login error: %v", err)
 	}
 }
 
diff --git a/test/extended/util/compat_otp/rosacli/cluster_utils.go b/test/extended/util/compat_otp/rosacli/cluster_utils.go
@@ -16,7 +16,7 @@ func RetrieveDesiredComputeNodes(clusterDescription *ClusterDescription) (nodesN
 		var isInt bool
 		nodesNb, isInt = clusterDescription.Nodes[0]["Compute (desired)"].(int)
 		if !isInt {
-			err = fmt.Errorf("'%v' is not an integer value")
+			err = fmt.Errorf("'%v' is not an integer value", clusterDescription.Nodes[0]["Compute (desired)"])
 		}
 	} else {
 		// Try autoscale one
diff --git a/test/extended/util/compat_otp/scheme/install.go b/test/extended/util/compat_otp/scheme/install.go
@@ -1,6 +1,5 @@
 package scheme
 
-
 import (
 	"github.com/openshift/api"
 )
diff --git a/test/extended/util/compat_otp/scheme/scheme.go b/test/extended/util/compat_otp/scheme/scheme.go
@@ -1,6 +1,5 @@
 package scheme
 
-
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/test/extended/util/compat_otp/terraform_test.go b/test/extended/util/compat_otp/terraform_test.go
diff --git a/test/extended/util/compat_otp/testdata/bindata.go b/test/extended/util/compat_otp/testdata/bindata.go
diff --git a/test/extended/util/compat_otp/version/OWNERS b/test/extended/util/compat_otp/version/OWNERS
diff --git a/test/extended/util/compat_otp/version/doc.go b/test/extended/util/compat_otp/version/doc.go
diff --git a/test/extended/util/compat_otp/version/version.go b/test/extended/util/compat_otp/version/version.go
diff --git a/test/extended/util/compat_otp/volumes.go b/test/extended/util/compat_otp/volumes.go

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func GetLatestMachineFromMachineSet(oc *exutil.CLI, machineSet string) string {`
`172`	`172`	`o.Expect(err).NotTo(o.HaveOccurred())`
`173`	`173`	`parsedMachineCreationTime, err := time.Parse(time.RFC3339, machineCreationTime)`
`174`	`174`	`if err != nil {`
`175`		`- e2e.Logf("Error parsing time:", err)`
	`175`	`+ e2e.Logf("Error parsing time: %v", err)`
`176`	`176`	`return ""`
`177`	`177`	`}`
`178`	`178`	`if parsedMachineCreationTime.After(newest) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package db`
`2`	`2`
`3`		`-`
`4`	`3`	`import (`
`5`	`4`	`"database/sql"`
`6`	`5`	`"fmt"`
`@@ -244,7 +243,7 @@ func (c *Sqlit) Query(dbFilePath string, table string, column string) ([]string,`
`244`	`243`	`}`
`245`	`244`	`return valueList, nil`
`246`	`245`	`default:`
`247`		`- err := fmt.Errorf("do not support to query table " + table)`
	`246`	`+ err := fmt.Errorf("do not support to query table %s", table)`
`248`	`247`	`return nil, err`
`249`	`248`	`}`
`250`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"encoding/xml"`
`6`	`6`	`"fmt"`
`7`	`7`	`"io/ioutil"`
	`8`	`+ "net"`
`8`	`9`	`"net/url"`
`9`	`10`	`"os"`
`10`	`11`	`"regexp"`
`@@ -20,6 +21,7 @@ import (`
`20`	`21`	`e2e "k8s.io/kubernetes/test/e2e/framework"`
`21`	`22`
`22`	`23`	`buildv1 "github.com/openshift/api/build/v1"`
	`24`	`+`
`23`	`25`	`exutil "github.com/openshift/origin/test/extended/util"`
`24`	`26`	`exurl "github.com/openshift/origin/test/extended/util/compat_otp/url"`
`25`	`27`	`)`
`@@ -89,7 +91,7 @@ func (j *JenkinsRef) Namespace() string {`
`89`	`91`	`// BuildURI builds a URI for the Jenkins server.`
`90`	`92`	`func (j *JenkinsRef) BuildURI(resourcePathFormat string, a ...interface{}) string {`
`91`	`93`	`resourcePath := fmt.Sprintf(resourcePathFormat, a...)`
`92`		`- return fmt.Sprintf("http://%s:%v/%s", j.host, j.port, resourcePath)`
	`94`	`+ return fmt.Sprintf("http://%s/%s", net.JoinHostPort(j.host, j.port), resourcePath)`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`// GetResource submits a GET request to this Jenkins server.`
`@@ -271,7 +273,7 @@ func (j *JenkinsRef) ProcessJenkinsJobUsingVars(filename, namespace string, vars`
`271`	`273`	`e2e.Logf("problem diagnosing /tmp: %v", dbgerr)`
`272`	`274`	`} else {`
`273`	`275`	`for _, file := range files {`
`274`		`- e2e.Logf("found file %s under temp isdir %q mode %s", file.Name(), file.IsDir(), file.Mode().String())`
	`276`	`+ e2e.Logf("found file %s under temp isdir %t mode %s", file.Name(), file.IsDir(), file.Mode().String())`
`275`	`277`	`}`
`276`	`278`	`}`
`277`	`279`	`}`
`@@ -333,7 +335,7 @@ func (j JenkinsRef) GetJobConsoleLogsAndMatchViaBuildResult(br exutil.BuildRes`
`333`	`335`	`return "", err`
`334`	`336`	`}`
`335`	`337`	`bldURI = strings.Trim(url.Path, "/")`
`336`		`- return j.WaitForContent(match, 200, 10*time.Minute, bldURI)`
	`338`	`+ return j.WaitForContent(match, 200, 10*time.Minute, "%s", bldURI)`
`337`	`339`	`}`
`338`	`340`	`return "", fmt.Errorf("build %#v is missing the build uri annontation", br.Build)`
`339`	`341`	`}`
`@@ -476,7 +478,7 @@ func DumpLogs(oc exutil.CLI, t exutil.BuildResult) (string, error) {`
`476`	`478`	`return "", err`
`477`	`479`	`}`
`478`	`480`	`jenkinsRef := NewRef(oc)`
`479`		`- log, _, err := jenkinsRef.GetResource(jenkinsLogURL.Path)`
	`481`	`+ log, _, err := jenkinsRef.GetResource("%s", jenkinsLogURL.Path)`
`480`	`482`	`if err != nil {`
`481`	`483`	`return "", fmt.Errorf("cannot get jenkins log: %v", err)`
`482`	`484`	`}`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 package logext
+-
 /*
   author: [email protected]
 */