Merge pull request #22908 from soltysh/staging_oc_1

Move oc/lib, oc/util, oc/originpolymorphichelpers and cmd/util/term to staging

hack/import-restrictions.json

@@ -494,7 +494,9 @@
       "github.com/openshift/origin/pkg/template/client/v1",
       "github.com/openshift/origin/pkg/user/generated",
       "github.com/openshift/origin/pkg/security/generated",
-      "github.com/openshift/origin/pkg/template/generated"
+      "github.com/openshift/origin/pkg/template/generated",
+
+      "vendor/github.com/openshift/oc"
     ],
     "allowedImportPackages": [
       "github.com/openshift/origin/pkg/api/legacy",
@@ -530,7 +532,6 @@
       "github.com/openshift/origin/pkg/cmd/server/bootstrappolicy",
       "github.com/openshift/origin/pkg/cmd/templates",
       "github.com/openshift/origin/pkg/cmd/util",
-      "github.com/openshift/origin/pkg/cmd/util/term",
       "github.com/openshift/origin/pkg/image/apis/image",
       "github.com/openshift/origin/pkg/image/apis/image/v1/trigger",
       "github.com/openshift/origin/pkg/image/apis/image/docker10",

pkg/cmd/server/admin/decrypt.go

@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/server/admin/encrypt.go

@@ -12,7 +12,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/templates/templater.go

@@ -7,7 +7,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	"github.com/spf13/cobra"

pkg/cmd/util/filepath.go

@@ -2,25 +2,10 @@ package util
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 )
 
-func MakeAbs(path, base string) (string, error) {
-	if filepath.IsAbs(path) {
-		return path, nil
-	}
-	if len(base) == 0 {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return "", err
-		}
-		base = cwd
-	}
-	return filepath.Join(base, path), nil
-}
-
 // ResolvePaths updates the given refs to be absolute paths, relative to the given base directory
 func ResolvePaths(refs []*string, base string) error {
 	for _, ref := range refs {

pkg/oc/cli/admin/prune/builds/resolvers.go

@@ -6,7 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
+	buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 )
 
 // Resolver knows how to resolve the set of candidate objects to prune

pkg/oc/cli/admin/prune/builds/resolvers_test.go

@@ -10,7 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
+	buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 )
 
 type mockResolver struct {

pkg/oc/cli/cli.go

@@ -19,11 +19,11 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
 
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	"github.com/openshift/origin/pkg/cmd/infra/deployer"
 	"github.com/openshift/origin/pkg/cmd/recycle"
 	"github.com/openshift/origin/pkg/cmd/templates"
-	"github.com/openshift/origin/pkg/cmd/util/term"
 	"github.com/openshift/origin/pkg/oc/cli/admin"
 	"github.com/openshift/origin/pkg/oc/cli/admin/buildchain"
 	sync "github.com/openshift/origin/pkg/oc/cli/admin/groups/sync"

pkg/oc/cli/create/imagestreamtag.go

@@ -15,7 +15,7 @@ import (
 	imagev1 "github.com/openshift/api/image/v1"
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	"github.com/openshift/library-go/pkg/image/reference"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 )
 
 const ImageStreamTagRecommendedName = "imagestreamtag"

pkg/oc/cli/debug/debug.go

@@ -47,12 +47,12 @@ import (
 	appsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	"github.com/openshift/library-go/pkg/image/reference"
+	"github.com/openshift/oc/pkg/helpers/conditions"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageutil "github.com/openshift/origin/pkg/image/util"
-	"github.com/openshift/origin/pkg/oc/lib/conditions"
 	generateapp "github.com/openshift/origin/pkg/oc/lib/newapp/app"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 const (

pkg/oc/cli/login/helpers.go

@@ -15,7 +15,7 @@ import (
 	kclientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 // getMatchingClusters examines the kubeconfig for all clusters that point to the same server

pkg/oc/cli/login/login.go

@@ -16,8 +16,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	"k8s.io/kubernetes/pkg/kubectl/util/term"
 
+	kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
-	kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 var (

pkg/oc/cli/login/loginoptions.go

@@ -21,14 +21,13 @@ import (
 
 	userv1 "github.com/openshift/api/user/v1"
 	projectv1typedclient "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	"github.com/openshift/oc/pkg/helpers/errors"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
+	"github.com/openshift/oc/pkg/helpers/project"
+	loginutil "github.com/openshift/oc/pkg/helpers/project"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/openshift/origin/pkg/client/config"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/cmd/util/term"
-	"github.com/openshift/origin/pkg/oc/lib/errors"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 	"github.com/openshift/origin/pkg/oc/lib/tokencmd"
-	"github.com/openshift/origin/pkg/oc/util/project"
-	loginutil "github.com/openshift/origin/pkg/oc/util/project"
 )
 
 const defaultClusterURL = "https://localhost:8443"
@@ -366,7 +365,7 @@ func (o *LoginOptions) SaveConfig() (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	baseDir, err := cmdutil.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
+	baseDir, err := kclientcmdapi.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
 	if err != nil {
 		return false, err
 	}

pkg/oc/cli/logout/logout.go

@@ -16,8 +16,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	oauthv1client "github.com/openshift/client-go/oauth/clientset/versioned/typed/oauth/v1"
-	kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
-	"github.com/openshift/origin/pkg/oc/util/project"
+	kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
+	"github.com/openshift/oc/pkg/helpers/project"
 )
 
 type LogoutOptions struct {

pkg/oc/cli/logs/logs.go

@@ -20,8 +20,8 @@ import (
 	appsv1 "github.com/openshift/api/apps/v1"
 	buildv1 "github.com/openshift/api/build/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
 )
 
 // LogsRecommendedCommandName is the recommended command name

pkg/oc/cli/project/project.go

@@ -20,9 +20,9 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	oapi "github.com/openshift/origin/pkg/api"
 	clientcfg "github.com/openshift/origin/pkg/client/config"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 type ProjectOptions struct {

pkg/oc/cli/projects/projects.go

@@ -17,10 +17,10 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	oapi "github.com/openshift/origin/pkg/api"
 	clientcfg "github.com/openshift/origin/pkg/client/config"
 	ocproject "github.com/openshift/origin/pkg/oc/cli/project"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 type ProjectsOptions struct {

pkg/oc/cli/requestproject/request_project.go

@@ -13,8 +13,8 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	ocproject "github.com/openshift/origin/pkg/oc/cli/project"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 // RequestProjectOptions contains all the options for running the RequestProject cli command.

pkg/oc/cli/secrets/basicauth.go

@@ -16,7 +16,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 // CreateBasicAuthSecretRecommendedCommandName represents name of subcommand for `oc secrets` command

pkg/oc/cli/serviceaccounts/gettoken.go

@@ -14,7 +14,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	sautil "k8s.io/kubernetes/pkg/serviceaccount"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 const (

pkg/oc/cli/serviceaccounts/newtoken.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	sautil "k8s.io/kubernetes/pkg/serviceaccount"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	osautil "github.com/openshift/origin/pkg/oc/lib/serviceaccount"
 )
 

pkg/oc/cli/set/deploymenthook.go

@@ -19,8 +19,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	appsv1 "github.com/openshift/api/apps/v1"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 var (

pkg/oc/cli/set/env.go

@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	buildv1 "github.com/openshift/api/build/v1"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 	"github.com/openshift/origin/pkg/pod/envresolve"
 )
 

pkg/oc/cli/shim_kubectl.go

@@ -10,9 +10,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/generate/versioned"
 	"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
 
+	"github.com/openshift/oc/pkg/helpers/clientcmd"
 	"github.com/openshift/origin/pkg/api/legacygroupification"
 	"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
-	"github.com/openshift/origin/pkg/oc/util/clientcmd"
 	oversion "github.com/openshift/origin/pkg/version"
 )
 

pkg/oc/cli/startbuild/startbuild.go

@@ -40,11 +40,11 @@ import (
 	buildv1 "github.com/openshift/api/build/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	"github.com/openshift/library-go/pkg/git"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
+	ocerrors "github.com/openshift/oc/pkg/helpers/errors"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildclientmanual "github.com/openshift/origin/pkg/build/client/v1"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	ocerrors "github.com/openshift/origin/pkg/oc/lib/errors"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 var (

pkg/oc/cli/status/status.go

@@ -18,8 +18,8 @@ import (
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	loginutil "github.com/openshift/oc/pkg/helpers/project"
 	"github.com/openshift/origin/pkg/oc/lib/describe"
-	loginutil "github.com/openshift/origin/pkg/oc/util/project"
 	dotutil "github.com/openshift/origin/pkg/util/dot"
 )
 

pkg/oc/lib/describe/describer.go

@@ -46,6 +46,8 @@ import (
 	buildv1clienttyped "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	onetworktypedclient "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
 	quotaclient "github.com/openshift/client-go/quota/clientset/versioned/typed/quota/v1"
+	ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	oapi "github.com/openshift/origin/pkg/api"
 	"github.com/openshift/origin/pkg/api/legacy"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -56,8 +58,6 @@ import (
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 	oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
-	ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"
 	projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
 	quotaconvert "github.com/openshift/origin/pkg/quota/apis/quota"

pkg/oc/lib/describe/projectstatus.go

@@ -36,10 +36,11 @@ import (
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	loginerrors "github.com/openshift/oc/pkg/helpers/errors"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	oapi "github.com/openshift/origin/pkg/api"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	loginerrors "github.com/openshift/origin/pkg/oc/lib/errors"
 	appsedges "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph"
 	appsanalysis "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/analysis"
 	appsgraph "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/nodes"
@@ -56,7 +57,6 @@ import (
 	routeedges "github.com/openshift/origin/pkg/oc/lib/graph/routegraph"
 	routeanalysis "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/analysis"
 	routegraph "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/nodes"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
 	"github.com/openshift/origin/pkg/util/errors"
 	"github.com/openshift/origin/pkg/util/parallel"
 )