start breaking deps on pkg/oc

juanvallejo · juanvallejo · commit a5e30bb0c3d4 · 2017-11-14T14:34:22.000-05:00
diff --git a/pkg/generate/app/cmd/describe.go b/pkg/generate/app/cmd/describe.go
@@ -5,6 +5,9 @@ import (
 	"io"
 	"sort"
 	"strings"
+	"time"
+
+	"github.com/docker/go-units"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -14,7 +17,6 @@ import (
 	"github.com/openshift/origin/pkg/generate"
 	"github.com/openshift/origin/pkg/generate/app"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
-	"github.com/openshift/origin/pkg/oc/cli/describe"
 )
 
 func displayName(meta metav1.ObjectMeta) string {
@@ -60,7 +62,7 @@ func describeLocatedImage(refInput *app.ComponentInput, baseNamespace string) st
 		if image := match.Image; image != nil {
 			shortID := imageapi.ShortDockerImageID(image, 7)
 			if !image.Created.IsZero() {
-				shortID = fmt.Sprintf("%s (%s old)", shortID, describe.FormatRelativeTime(image.Created.Time))
+				shortID = fmt.Sprintf("%s (%s old)", shortID, formatRelativeTime(image.Created.Time))
 			}
 			return fmt.Sprintf("Found image %s in image stream %q under tag %q for %q", shortID, localOrRemoteName(match.ImageStream.ObjectMeta, baseNamespace), match.ImageTag, refInput)
 		}
@@ -69,7 +71,7 @@ func describeLocatedImage(refInput *app.ComponentInput, baseNamespace string) st
 		image := match.Image
 		shortID := imageapi.ShortDockerImageID(image, 7)
 		if !image.Created.IsZero() {
-			shortID = fmt.Sprintf("%s (%s old)", shortID, describe.FormatRelativeTime(image.Created.Time))
+			shortID = fmt.Sprintf("%s (%s old)", shortID, formatRelativeTime(image.Created.Time))
 		}
 		return fmt.Sprintf("Found Docker image %s from %s for %q", shortID, match.Meta["registry"], refInput)
 	default:
@@ -295,3 +297,8 @@ func describeGeneratedJob(out io.Writer, ref app.ComponentReference, pod *kapi.P
 		}
 	}
 }
+
+// formatRelativeTime converts a time field into a human readable age string (hours, minutes, days).
+func formatRelativeTime(t time.Time) string {
+	return units.HumanDuration(time.Now().Sub(t))
+}
diff --git a/pkg/oc/cli/describe/helpers.go b/pkg/oc/cli/describe/helpers.go
@@ -8,7 +8,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	units "github.com/docker/go-units"
+	"github.com/docker/go-units"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -76,7 +76,7 @@ func formatString(out *tabwriter.Writer, label string, v interface{}) {
 }
 
 func formatTime(out *tabwriter.Writer, label string, t time.Time) {
-	fmt.Fprintf(out, fmt.Sprintf("%s:\t%s ago\n", label, formatRelativeTime(t)))
+	fmt.Fprintf(out, fmt.Sprintf("%s:\t%s ago\n", label, units.HumanDuration(timeNowFn().Sub(t))))
 }
 
 func formatLabels(labelMap map[string]string) string {
@@ -133,12 +133,7 @@ func formatToHumanDuration(dur time.Duration) string {
 }
 
 func formatRelativeTime(t time.Time) string {
-	return units.HumanDuration(timeNowFn().Sub(t))
-}
-
-// FormatRelativeTime converts a time field into a human readable age string (hours, minutes, days).
-func FormatRelativeTime(t time.Time) string {
-	return formatRelativeTime(t)
+	return units.HumanDuration(time.Now().Sub(t))
 }
 
 func formatMeta(out *tabwriter.Writer, m metav1.ObjectMeta) {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ import (`
`5`	`5`	`"io"`
`6`	`6`	`"sort"`
`7`	`7`	`"strings"`
	`8`	`+ "time"`
	`9`	`+`
	`10`	`+ "github.com/docker/go-units"`
`8`	`11`
`9`	`12`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`10`	`13`	`"k8s.io/apimachinery/pkg/util/sets"`
`@@ -14,7 +17,6 @@ import (`
`14`	`17`	`"github.com/openshift/origin/pkg/generate"`
`15`	`18`	`"github.com/openshift/origin/pkg/generate/app"`
`16`	`19`	`imageapi "github.com/openshift/origin/pkg/image/apis/image"`
`17`		`- "github.com/openshift/origin/pkg/oc/cli/describe"`
`18`	`20`	`)`
`19`	`21`
`20`	`22`	`func displayName(meta metav1.ObjectMeta) string {`
`@@ -60,7 +62,7 @@ func describeLocatedImage(refInput *app.ComponentInput, baseNamespace string) st`
`60`	`62`	`if image := match.Image; image != nil {`
`61`	`63`	`shortID := imageapi.ShortDockerImageID(image, 7)`
`62`	`64`	`if !image.Created.IsZero() {`
`63`		`- shortID = fmt.Sprintf("%s (%s old)", shortID, describe.FormatRelativeTime(image.Created.Time))`
	`65`	`+ shortID = fmt.Sprintf("%s (%s old)", shortID, formatRelativeTime(image.Created.Time))`
`64`	`66`	`}`
`65`	`67`	`return fmt.Sprintf("Found image %s in image stream %q under tag %q for %q", shortID, localOrRemoteName(match.ImageStream.ObjectMeta, baseNamespace), match.ImageTag, refInput)`
`66`	`68`	`}`
`@@ -69,7 +71,7 @@ func describeLocatedImage(refInput *app.ComponentInput, baseNamespace string) st`
`69`	`71`	`image := match.Image`
`70`	`72`	`shortID := imageapi.ShortDockerImageID(image, 7)`
`71`	`73`	`if !image.Created.IsZero() {`
`72`		`- shortID = fmt.Sprintf("%s (%s old)", shortID, describe.FormatRelativeTime(image.Created.Time))`
	`74`	`+ shortID = fmt.Sprintf("%s (%s old)", shortID, formatRelativeTime(image.Created.Time))`
`73`	`75`	`}`
`74`	`76`	`return fmt.Sprintf("Found Docker image %s from %s for %q", shortID, match.Meta["registry"], refInput)`
`75`	`77`	`default:`
`@@ -295,3 +297,8 @@ func describeGeneratedJob(out io.Writer, ref app.ComponentReference, pod *kapi.P`
`295`	`297`	`}`
`296`	`298`	`}`
`297`	`299`	`}`
	`300`	`+`
	`301`	`+// formatRelativeTime converts a time field into a human readable age string (hours, minutes, days).`
	`302`	`+func formatRelativeTime(t time.Time) string {`
	`303`	`+ return units.HumanDuration(time.Now().Sub(t))`
	`304`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"text/tabwriter"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- units "github.com/docker/go-units"`
	`11`	`+ "github.com/docker/go-units"`
`12`	`12`
`13`	`13`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`14`	`14`	`"k8s.io/apimachinery/pkg/labels"`
`@@ -76,7 +76,7 @@ func formatString(out *tabwriter.Writer, label string, v interface{}) {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func formatTime(out *tabwriter.Writer, label string, t time.Time) {`
`79`		`- fmt.Fprintf(out, fmt.Sprintf("%s:\t%s ago\n", label, formatRelativeTime(t)))`
	`79`	`+ fmt.Fprintf(out, fmt.Sprintf("%s:\t%s ago\n", label, units.HumanDuration(timeNowFn().Sub(t))))`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func formatLabels(labelMap map[string]string) string {`
`@@ -133,12 +133,7 @@ func formatToHumanDuration(dur time.Duration) string {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`func formatRelativeTime(t time.Time) string {`
`136`		`- return units.HumanDuration(timeNowFn().Sub(t))`
`137`		`-}`
`138`		`-`
`139`		`-// FormatRelativeTime converts a time field into a human readable age string (hours, minutes, days).`
`140`		`-func FormatRelativeTime(t time.Time) string {`
`141`		`- return formatRelativeTime(t)`
	`136`	`+ return units.HumanDuration(time.Now().Sub(t))`
`142`	`137`	`}`
`143`	`138`
`144`	`139`	`func formatMeta(out *tabwriter.Writer, m metav1.ObjectMeta) {`