Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
May 28, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ddadb7
Removed unused files
soltysh May 27, 2019
398008c
Replace our MakeAbs with client-go's one
soltysh May 27, 2019
8f05a3c
Move oc/lib, oc/util and cmd/util/term to staging
soltysh May 27, 2019
a2cd2b7
Add OWNERS and README.md for oc
soltysh May 27, 2019
e505918
React to moves - boring
soltysh May 27, 2019
842bab4
React to moves - not so nice
soltysh May 27, 2019
19df760
Update import restrictions
soltysh May 27, 2019
3f1a61a
bump(*): make vendor/github.com/openshift/oc symlink
soltysh May 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions hack/import-restrictions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/admin/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/admin/encrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/templates/templater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 0 additions & 15 deletions pkg/cmd/util/filepath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/admin/prune/builds/resolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/admin/prune/builds/resolvers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/create/imagestreamtag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/cli/debug/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/login/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
13 changes: 6 additions & 7 deletions pkg/oc/cli/login/loginoptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/cli/logout/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/logs/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/project/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/projects/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/requestproject/request_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/secrets/basicauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/serviceaccounts/gettoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/serviceaccounts/newtoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/set/deploymenthook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/set/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/shim_kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/cli/startbuild/startbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/oc/cli/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
37 changes: 0 additions & 37 deletions pkg/oc/lib/buildapihelpers/sortinternal.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions pkg/oc/lib/describe/describer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/lib/describe/projectstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
4 changes: 0 additions & 4 deletions pkg/oc/lib/doc.go
View file
Open in desktop

This file was deleted.

Loading