From 70523a76492f9f328ec420e99efe8ad2a773d25a Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Fri, 5 Aug 2016 10:13:15 -0400 Subject: [PATCH] move cmd tools to common build cmd package --- pkg/build/cmd/doc.go | 2 ++ pkg/build/{reaper => cmd}/reaper.go | 2 +- pkg/build/{reaper => cmd}/reaper_test.go | 2 +- pkg/build/reaper/doc.go | 2 -- pkg/cmd/util/clientcmd/factory.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 pkg/build/cmd/doc.go rename pkg/build/{reaper => cmd}/reaper.go (99%) rename pkg/build/{reaper => cmd}/reaper_test.go (99%) delete mode 100644 pkg/build/reaper/doc.go diff --git a/pkg/build/cmd/doc.go b/pkg/build/cmd/doc.go new file mode 100644 index 000000000000..e9cc603aae7d --- /dev/null +++ b/pkg/build/cmd/doc.go @@ -0,0 +1,2 @@ +// Package cmd provides command helpers for builds +package cmd diff --git a/pkg/build/reaper/reaper.go b/pkg/build/cmd/reaper.go similarity index 99% rename from pkg/build/reaper/reaper.go rename to pkg/build/cmd/reaper.go index 4dbf74a0480c..11fb11a55ab6 100644 --- a/pkg/build/reaper/reaper.go +++ b/pkg/build/cmd/reaper.go @@ -1,4 +1,4 @@ -package reaper +package cmd import ( "sort" diff --git a/pkg/build/reaper/reaper_test.go b/pkg/build/cmd/reaper_test.go similarity index 99% rename from pkg/build/reaper/reaper_test.go rename to pkg/build/cmd/reaper_test.go index 9cb0b19ae3aa..ebdd1ef2114b 100644 --- a/pkg/build/reaper/reaper_test.go +++ b/pkg/build/cmd/reaper_test.go @@ -1,4 +1,4 @@ -package reaper +package cmd import ( "fmt" diff --git a/pkg/build/reaper/doc.go b/pkg/build/reaper/doc.go deleted file mode 100644 index 8b34de772e9d..000000000000 --- a/pkg/build/reaper/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package reaper implements the Reaper interface for buildConfigs -package reaper diff --git a/pkg/cmd/util/clientcmd/factory.go b/pkg/cmd/util/clientcmd/factory.go index 1fd2b45040a6..9e83bd7e0f6c 100644 --- a/pkg/cmd/util/clientcmd/factory.go +++ b/pkg/cmd/util/clientcmd/factory.go @@ -43,7 +43,7 @@ import ( authorizationapi "github.com/openshift/origin/pkg/authorization/api" authorizationreaper "github.com/openshift/origin/pkg/authorization/reaper" buildapi "github.com/openshift/origin/pkg/build/api" - buildreaper "github.com/openshift/origin/pkg/build/reaper" + buildcmd "github.com/openshift/origin/pkg/build/cmd" buildutil "github.com/openshift/origin/pkg/build/util" "github.com/openshift/origin/pkg/client" "github.com/openshift/origin/pkg/cmd/cli/describe" @@ -330,7 +330,7 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory { if err != nil { return nil, err } - return buildreaper.NewBuildConfigReaper(oc), nil + return buildcmd.NewBuildConfigReaper(oc), nil } return kReaperFunc(mapping) }