Skip to content

Commit e5c7d40

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #22908 from soltysh/staging_oc_1
Move oc/lib, oc/util, oc/originpolymorphichelpers and cmd/util/term to staging
2 parents f3c7ab3 + 3f1a61a commit e5c7d40

File tree

63 files changed

+149
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+149
-158
lines changed

‎hack/import-restrictions.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,9 @@
494494
"github.com/openshift/origin/pkg/template/client/v1",
495495
"github.com/openshift/origin/pkg/user/generated",
496496
"github.com/openshift/origin/pkg/security/generated",
497-
"github.com/openshift/origin/pkg/template/generated"
497+
"github.com/openshift/origin/pkg/template/generated",
498+
499+
"vendor/github.com/openshift/oc"
498500
],
499501
"allowedImportPackages": [
500502
"github.com/openshift/origin/pkg/api/legacy",
@@ -530,7 +532,6 @@
530532
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy",
531533
"github.com/openshift/origin/pkg/cmd/templates",
532534
"github.com/openshift/origin/pkg/cmd/util",
533-
"github.com/openshift/origin/pkg/cmd/util/term",
534535
"github.com/openshift/origin/pkg/image/apis/image",
535536
"github.com/openshift/origin/pkg/image/apis/image/v1/trigger",
536537
"github.com/openshift/origin/pkg/image/apis/image/docker10",

‎pkg/cmd/server/admin/decrypt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"io/ioutil"
99
"os"
1010

11-
"github.com/openshift/origin/pkg/cmd/util/term"
11+
"github.com/openshift/oc/pkg/helpers/term"
1212
"github.com/spf13/cobra"
1313

1414
"k8s.io/cli-runtime/pkg/genericclioptions"

‎pkg/cmd/server/admin/encrypt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"unicode"
1313
"unicode/utf8"
1414

15-
"github.com/openshift/origin/pkg/cmd/util/term"
15+
"github.com/openshift/oc/pkg/helpers/term"
1616
"github.com/spf13/cobra"
1717

1818
"k8s.io/cli-runtime/pkg/genericclioptions"

‎pkg/cmd/templates/templater.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/template"
88
"unicode"
99

10-
"github.com/openshift/origin/pkg/cmd/util/term"
10+
"github.com/openshift/oc/pkg/helpers/term"
1111
ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
1212

1313
"github.com/spf13/cobra"

‎pkg/cmd/util/filepath.go

-15
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,10 @@ package util
22

33
import (
44
"fmt"
5-
"os"
65
"path/filepath"
76
"strings"
87
)
98

10-
func MakeAbs(path, base string) (string, error) {
11-
if filepath.IsAbs(path) {
12-
return path, nil
13-
}
14-
if len(base) == 0 {
15-
cwd, err := os.Getwd()
16-
if err != nil {
17-
return "", err
18-
}
19-
base = cwd
20-
}
21-
return filepath.Join(base, path), nil
22-
}
23-
249
// ResolvePaths updates the given refs to be absolute paths, relative to the given base directory
2510
func ResolvePaths(refs []*string, base string) error {
2611
for _, ref := range refs {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"k8s.io/apimachinery/pkg/util/sets"
77

88
buildv1 "github.com/openshift/api/build/v1"
9-
"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
9+
buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
1010
)
1111

1212
// Resolver knows how to resolve the set of candidate objects to prune

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/util/sets"
1111

1212
buildv1 "github.com/openshift/api/build/v1"
13-
"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
13+
buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
1414
)
1515

1616
type mockResolver struct {

‎pkg/oc/cli/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2020
ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
2121

22+
"github.com/openshift/oc/pkg/helpers/term"
2223
"github.com/openshift/origin/pkg/cmd/flagtypes"
2324
"github.com/openshift/origin/pkg/cmd/infra/deployer"
2425
"github.com/openshift/origin/pkg/cmd/recycle"
2526
"github.com/openshift/origin/pkg/cmd/templates"
26-
"github.com/openshift/origin/pkg/cmd/util/term"
2727
"github.com/openshift/origin/pkg/oc/cli/admin"
2828
"github.com/openshift/origin/pkg/oc/cli/admin/buildchain"
2929
sync "github.com/openshift/origin/pkg/oc/cli/admin/groups/sync"

‎pkg/oc/cli/create/imagestreamtag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
imagev1 "github.com/openshift/api/image/v1"
1616
imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
1717
"github.com/openshift/library-go/pkg/image/reference"
18-
utilenv "github.com/openshift/origin/pkg/oc/util/env"
18+
utilenv "github.com/openshift/oc/pkg/helpers/env"
1919
)
2020

2121
const ImageStreamTagRecommendedName = "imagestreamtag"

‎pkg/oc/cli/debug/debug.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ import (
4747
appsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
4848
imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
4949
"github.com/openshift/library-go/pkg/image/reference"
50+
"github.com/openshift/oc/pkg/helpers/conditions"
51+
utilenv "github.com/openshift/oc/pkg/helpers/env"
5052
appsutil "github.com/openshift/origin/pkg/apps/util"
5153
imageapi "github.com/openshift/origin/pkg/image/apis/image"
5254
imageutil "github.com/openshift/origin/pkg/image/util"
53-
"github.com/openshift/origin/pkg/oc/lib/conditions"
5455
generateapp "github.com/openshift/origin/pkg/oc/lib/newapp/app"
55-
utilenv "github.com/openshift/origin/pkg/oc/util/env"
5656
)
5757

5858
const (

‎pkg/oc/cli/login/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
kclientcmdapi "k8s.io/client-go/tools/clientcmd/api"
1616
kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
1717

18-
"github.com/openshift/origin/pkg/cmd/util/term"
18+
"github.com/openshift/oc/pkg/helpers/term"
1919
)
2020

2121
// getMatchingClusters examines the kubeconfig for all clusters that point to the same server

‎pkg/oc/cli/login/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"k8s.io/kubernetes/pkg/kubectl/util/templates"
1717
"k8s.io/kubernetes/pkg/kubectl/util/term"
1818

19+
kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
1920
"github.com/openshift/origin/pkg/cmd/flagtypes"
20-
kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
2121
)
2222

2323
var (

‎pkg/oc/cli/login/loginoptions.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121

2222
userv1 "github.com/openshift/api/user/v1"
2323
projectv1typedclient "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
24+
"github.com/openshift/oc/pkg/helpers/errors"
25+
cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
26+
"github.com/openshift/oc/pkg/helpers/project"
27+
loginutil "github.com/openshift/oc/pkg/helpers/project"
28+
"github.com/openshift/oc/pkg/helpers/term"
2429
"github.com/openshift/origin/pkg/client/config"
25-
cmdutil "github.com/openshift/origin/pkg/cmd/util"
26-
"github.com/openshift/origin/pkg/cmd/util/term"
27-
"github.com/openshift/origin/pkg/oc/lib/errors"
28-
cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
2930
"github.com/openshift/origin/pkg/oc/lib/tokencmd"
30-
"github.com/openshift/origin/pkg/oc/util/project"
31-
loginutil "github.com/openshift/origin/pkg/oc/util/project"
3231
)
3332

3433
const defaultClusterURL = "https://localhost:8443"
@@ -366,7 +365,7 @@ func (o *LoginOptions) SaveConfig() (bool, error) {
366365
if err != nil {
367366
return false, err
368367
}
369-
baseDir, err := cmdutil.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
368+
baseDir, err := kclientcmdapi.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
370369
if err != nil {
371370
return false, err
372371
}

‎pkg/oc/cli/logout/logout.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"k8s.io/kubernetes/pkg/kubectl/util/templates"
1717

1818
oauthv1client "github.com/openshift/client-go/oauth/clientset/versioned/typed/oauth/v1"
19-
kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
20-
"github.com/openshift/origin/pkg/oc/util/project"
19+
kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
20+
"github.com/openshift/oc/pkg/helpers/project"
2121
)
2222

2323
type LogoutOptions struct {

‎pkg/oc/cli/logs/logs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
appsv1 "github.com/openshift/api/apps/v1"
2121
buildv1 "github.com/openshift/api/build/v1"
2222
buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
23+
ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
2324
buildapi "github.com/openshift/origin/pkg/build/apis/build"
24-
ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
2525
)
2626

2727
// LogsRecommendedCommandName is the recommended command name

‎pkg/oc/cli/project/project.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020

2121
projectv1 "github.com/openshift/api/project/v1"
2222
projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
23+
cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
2324
oapi "github.com/openshift/origin/pkg/api"
2425
clientcfg "github.com/openshift/origin/pkg/client/config"
25-
cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
2626
)
2727

2828
type ProjectOptions struct {

‎pkg/oc/cli/projects/projects.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717

1818
projectv1 "github.com/openshift/api/project/v1"
1919
projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
20+
cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
2021
oapi "github.com/openshift/origin/pkg/api"
2122
clientcfg "github.com/openshift/origin/pkg/client/config"
2223
ocproject "github.com/openshift/origin/pkg/oc/cli/project"
23-
cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
2424
)
2525

2626
type ProjectsOptions struct {

‎pkg/oc/cli/requestproject/request_project.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
projectv1 "github.com/openshift/api/project/v1"
1515
projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
16+
cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
1617
ocproject "github.com/openshift/origin/pkg/oc/cli/project"
17-
cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
1818
)
1919

2020
// RequestProjectOptions contains all the options for running the RequestProject cli command.

‎pkg/oc/cli/secrets/basicauth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"k8s.io/kubernetes/pkg/kubectl/util/templates"
1717
kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
1818

19-
"github.com/openshift/origin/pkg/cmd/util/term"
19+
"github.com/openshift/oc/pkg/helpers/term"
2020
)
2121

2222
// CreateBasicAuthSecretRecommendedCommandName represents name of subcommand for `oc secrets` command

‎pkg/oc/cli/serviceaccounts/gettoken.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"k8s.io/kubernetes/pkg/kubectl/util/templates"
1515
sautil "k8s.io/kubernetes/pkg/serviceaccount"
1616

17-
"github.com/openshift/origin/pkg/cmd/util/term"
17+
"github.com/openshift/oc/pkg/helpers/term"
1818
)
1919

2020
const (

‎pkg/oc/cli/serviceaccounts/newtoken.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"k8s.io/kubernetes/pkg/kubectl/util/templates"
2222
sautil "k8s.io/kubernetes/pkg/serviceaccount"
2323

24-
"github.com/openshift/origin/pkg/cmd/util/term"
24+
"github.com/openshift/oc/pkg/helpers/term"
2525
osautil "github.com/openshift/origin/pkg/oc/lib/serviceaccount"
2626
)
2727

‎pkg/oc/cli/set/deploymenthook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"k8s.io/kubernetes/pkg/kubectl/util/templates"
2020

2121
appsv1 "github.com/openshift/api/apps/v1"
22+
utilenv "github.com/openshift/oc/pkg/helpers/env"
2223
cmdutil "github.com/openshift/origin/pkg/cmd/util"
23-
utilenv "github.com/openshift/origin/pkg/oc/util/env"
2424
)
2525

2626
var (

‎pkg/oc/cli/set/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"k8s.io/kubernetes/pkg/kubectl/util/templates"
2929

3030
buildv1 "github.com/openshift/api/build/v1"
31+
utilenv "github.com/openshift/oc/pkg/helpers/env"
3132
cmdutil "github.com/openshift/origin/pkg/cmd/util"
32-
utilenv "github.com/openshift/origin/pkg/oc/util/env"
3333
"github.com/openshift/origin/pkg/pod/envresolve"
3434
)
3535

‎pkg/oc/cli/shim_kubectl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"k8s.io/kubernetes/pkg/kubectl/generate/versioned"
1111
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
1212

13+
"github.com/openshift/oc/pkg/helpers/clientcmd"
1314
"github.com/openshift/origin/pkg/api/legacygroupification"
1415
"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
15-
"github.com/openshift/origin/pkg/oc/util/clientcmd"
1616
oversion "github.com/openshift/origin/pkg/version"
1717
)
1818

‎pkg/oc/cli/startbuild/startbuild.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ import (
4040
buildv1 "github.com/openshift/api/build/v1"
4141
buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
4242
"github.com/openshift/library-go/pkg/git"
43+
utilenv "github.com/openshift/oc/pkg/helpers/env"
44+
ocerrors "github.com/openshift/oc/pkg/helpers/errors"
4345
buildapi "github.com/openshift/origin/pkg/build/apis/build"
4446
buildclientmanual "github.com/openshift/origin/pkg/build/client/v1"
4547
cmdutil "github.com/openshift/origin/pkg/cmd/util"
46-
ocerrors "github.com/openshift/origin/pkg/oc/lib/errors"
47-
utilenv "github.com/openshift/origin/pkg/oc/util/env"
4848
)
4949

5050
var (

‎pkg/oc/cli/status/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
1919
projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
2020
routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
21+
loginutil "github.com/openshift/oc/pkg/helpers/project"
2122
"github.com/openshift/origin/pkg/oc/lib/describe"
22-
loginutil "github.com/openshift/origin/pkg/oc/util/project"
2323
dotutil "github.com/openshift/origin/pkg/util/dot"
2424
)
2525

‎pkg/oc/lib/buildapihelpers/sortinternal.go

-37
This file was deleted.

‎pkg/oc/lib/describe/describer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ import (
4646
buildv1clienttyped "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
4747
onetworktypedclient "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
4848
quotaclient "github.com/openshift/client-go/quota/clientset/versioned/typed/quota/v1"
49+
ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
50+
routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
4951
oapi "github.com/openshift/origin/pkg/api"
5052
"github.com/openshift/origin/pkg/api/legacy"
5153
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -56,8 +58,6 @@ import (
5658
imageapi "github.com/openshift/origin/pkg/image/apis/image"
5759
imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
5860
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
59-
ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
60-
"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
6161
projectapi "github.com/openshift/origin/pkg/project/apis/project"
6262
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
6363
quotaconvert "github.com/openshift/origin/pkg/quota/apis/quota"

‎pkg/oc/lib/describe/projectstatus.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ import (
3636
imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
3737
projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
3838
routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
39+
loginerrors "github.com/openshift/oc/pkg/helpers/errors"
40+
routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
3941
oapi "github.com/openshift/origin/pkg/api"
4042
appsutil "github.com/openshift/origin/pkg/apps/util"
4143
buildapi "github.com/openshift/origin/pkg/build/apis/build"
42-
loginerrors "github.com/openshift/origin/pkg/oc/lib/errors"
4344
appsedges "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph"
4445
appsanalysis "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/analysis"
4546
appsgraph "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/nodes"
@@ -56,7 +57,6 @@ import (
5657
routeedges "github.com/openshift/origin/pkg/oc/lib/graph/routegraph"
5758
routeanalysis "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/analysis"
5859
routegraph "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/nodes"
59-
"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
6060
"github.com/openshift/origin/pkg/util/errors"
6161
"github.com/openshift/origin/pkg/util/parallel"
6262
)

‎pkg/oc/lib/doc.go

-4
This file was deleted.

0 commit comments

Comments
 (0)