move pkg/build/{prune,cmd} into pkg/oc/cli/builds

containerpope · Feb 13, 2018 · 1da8003 · 1da8003
1 parent d3da6a3
commit 1da8003
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 7 deletions.
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -463,9 +463,7 @@
       "github.com/openshift/origin/pkg/build/apis/build/install",
       "github.com/openshift/origin/pkg/build/client",
       "github.com/openshift/origin/pkg/build/client/internalversion",
-      "github.com/openshift/origin/pkg/build/cmd",
       "github.com/openshift/origin/pkg/build/controller/build/apis/defaults",
-      "github.com/openshift/origin/pkg/build/prune",
       "github.com/openshift/origin/pkg/build/registry/build",
       "github.com/openshift/origin/pkg/build/registry/buildconfig",
       "github.com/openshift/origin/pkg/build/util",

diff --git a/pkg/oc/admin/prune/builds.go b/pkg/oc/admin/prune/builds.go
@@ -16,7 +16,7 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildclient "github.com/openshift/origin/pkg/build/client"
 	buildinternalclient "github.com/openshift/origin/pkg/build/generated/internalclientset"
-	"github.com/openshift/origin/pkg/build/prune"
+	"github.com/openshift/origin/pkg/oc/cli/builds/prune"
 	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 

diff --git a/pkg/oc/cli/builds/OWNERS b/pkg/oc/cli/builds/OWNERS
@@ -0,0 +1,12 @@
+reviewers:
+  - bparees
+  - smarterclayton
+  - mfojtik
+  - soltysh
+  - csrwng
+  - gabemontero
+approvers:
+  - bparees
+  - smarterclayton
+  - mfojtik
+  - soltysh
diff --git a/pkg/build/cmd/doc.go → pkg/oc/cli/builds/doc.go b/pkg/build/cmd/doc.go → pkg/oc/cli/builds/doc.go
@@ -1,2 +1,2 @@
 // Package cmd provides command helpers for builds
-package cmd
+package builds
diff --git a/pkg/build/prune/data.go → pkg/oc/cli/builds/prune/data.go b/pkg/build/prune/data.go → pkg/oc/cli/builds/prune/data.go
diff --git a/pkg/build/prune/data_test.go → pkg/oc/cli/builds/prune/data_test.go b/pkg/build/prune/data_test.go → pkg/oc/cli/builds/prune/data_test.go
diff --git a/pkg/build/prune/prune.go → pkg/oc/cli/builds/prune/prune.go b/pkg/build/prune/prune.go → pkg/oc/cli/builds/prune/prune.go
diff --git a/pkg/build/prune/prune_test.go → pkg/oc/cli/builds/prune/prune_test.go b/pkg/build/prune/prune_test.go → pkg/oc/cli/builds/prune/prune_test.go
diff --git a/pkg/build/prune/resolvers.go → pkg/oc/cli/builds/prune/resolvers.go b/pkg/build/prune/resolvers.go → pkg/oc/cli/builds/prune/resolvers.go
diff --git a/pkg/build/prune/resolvers_test.go → pkg/oc/cli/builds/prune/resolvers_test.go b/pkg/build/prune/resolvers_test.go → pkg/oc/cli/builds/prune/resolvers_test.go
diff --git a/pkg/build/cmd/reaper.go → pkg/oc/cli/builds/reaper.go b/pkg/build/cmd/reaper.go → pkg/oc/cli/builds/reaper.go
@@ -1,4 +1,4 @@
-package cmd
+package builds
 
 import (
 	"sort"

diff --git a/pkg/build/cmd/reaper_test.go → pkg/oc/cli/builds/reaper_test.go b/pkg/build/cmd/reaper_test.go → pkg/oc/cli/builds/reaper_test.go
@@ -1,4 +1,4 @@
-package cmd
+package builds
 
 import (
 	"fmt"

diff --git a/pkg/oc/cli/util/clientcmd/factory_object_mapping.go b/pkg/oc/cli/util/clientcmd/factory_object_mapping.go
@@ -33,11 +33,11 @@ import (
 	authorizationreaper "github.com/openshift/origin/pkg/authorization/reaper"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildmanualclient "github.com/openshift/origin/pkg/build/client/internalversion"
-	buildcmd "github.com/openshift/origin/pkg/build/cmd"
 	buildclient "github.com/openshift/origin/pkg/build/generated/internalclientset"
 	buildutil "github.com/openshift/origin/pkg/build/util"
 	configcmd "github.com/openshift/origin/pkg/bulk"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	buildcmd "github.com/openshift/origin/pkg/oc/cli/builds"
 	deploymentcmd "github.com/openshift/origin/pkg/oc/cli/deploymentconfigs"
 	"github.com/openshift/origin/pkg/oc/cli/describe"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"