github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15596 from zhengguoyong/alias_util_errors_packagename

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-19 02:35:37 -07:00
parent 44a9877bd4 f8f9afb874
commit 75c977d200
29 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/describe.go
View File

@@ -29,7 +29,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// DescribeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of
@@ -142,7 +142,7 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s
fmt.Fprintf(out, "%s\n\n", s)
}
return errors.NewAggregate(allErrs)
return utilerrors.NewAggregate(allErrs)
}
func DescribeMatchingResources(mapper meta.RESTMapper, typer runtime.ObjectTyper, f *cmdutil.Factory, namespace, rsrc, prefix string, out io.Writer, originalError error) error {

4
pkg/kubectl/cmd/label.go
View File

@@ -28,7 +28,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/strategicpatch"
"k8s.io/kubernetes/pkg/util/validation"
)
@@ -106,7 +106,7 @@ func validateNoOverwrites(meta *api.ObjectMeta, labels map[string]string) error
allErrs = append(allErrs, fmt.Errorf("'%s' already has a value (%s), and --overwrite is false", key, value))
}
}
return errors.NewAggregate(allErrs)
return utilerrors.NewAggregate(allErrs)
}
func parseLabels(spec []string) (map[string]string, []string, error) {

4
pkg/kubectl/cmd/scale.go
View File

@@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// ScaleOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of
@@ -149,5 +149,5 @@ func RunScale(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri
cmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "scaled")
}
return errors.NewAggregate(errs)
return utilerrors.NewAggregate(errs)
}

4
pkg/kubectl/generate.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// GeneratorParam is a parameter for a generator
@@ -60,7 +60,7 @@ func ValidateParams(paramSpec []GeneratorParam, params map[string]interface{}) e
}
}
}
return errors.NewAggregate(allErrs)
return utilerrors.NewAggregate(allErrs)
}
// MakeParams is a utility that creates generator parameters from a command line

4
pkg/kubectl/resource/builder.go
View File

@@ -28,7 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/sets"
)
@@ -520,7 +520,7 @@ func (b *Builder) resourceTupleMappings() (map[string]*meta.RESTMapping, error)
func (b *Builder) visitorResult() *Result {
if len(b.errs) > 0 {
return &Result{err: errors.NewAggregate(b.errs)}
return &Result{err: utilerrors.NewAggregate(b.errs)}
}
if b.selectAll {

6
pkg/kubectl/resource/builder_test.go
View File

@@ -36,7 +36,7 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/fake"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/watch"
watchjson "k8s.io/kubernetes/pkg/watch/json"
)
@@ -829,7 +829,7 @@ func TestContinueOnErrorVisitor(t *testing.T) {
if count != 3 {
t.Fatalf("did not visit all infos: %d", count)
}
agg, ok := err.(errors.Aggregate)
agg, ok := err.(utilerrors.Aggregate)
if !ok {
t.Fatalf("unexpected error: %v", err)
}
@@ -1068,7 +1068,7 @@ func TestReceiveMultipleErrors(t *testing.T) {
t.Fatalf("unexpected response: %v %t %#v", err, singular, test.Infos)
}
errs, ok := err.(errors.Aggregate)
errs, ok := err.(utilerrors.Aggregate)
if !ok {
t.Fatalf("unexpected error: %v", reflect.TypeOf(err))
}

10
pkg/kubectl/resource/result.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/watch"
)
@@ -41,7 +41,7 @@ type Result struct {
sources []Visitor
singular bool
ignoreErrors []errors.Matcher
ignoreErrors []utilerrors.Matcher
// populated by a call to Infos
info []*Info
@@ -56,7 +56,7 @@ type Result struct {
// err.
func (r *Result) IgnoreErrors(fns ...ErrMatchFunc) *Result {
for _, fn := range fns {
r.ignoreErrors = append(r.ignoreErrors, errors.Matcher(fn))
r.ignoreErrors = append(r.ignoreErrors, utilerrors.Matcher(fn))
}
return r
}
@@ -77,7 +77,7 @@ func (r *Result) Visit(fn VisitorFunc) error {
return r.err
}
err := r.visitor.Visit(fn)
return errors.FilterOut(err, r.ignoreErrors...)
return utilerrors.FilterOut(err, r.ignoreErrors...)
}
// IntoSingular sets the provided boolean pointer to true if the Builder input
@@ -106,7 +106,7 @@ func (r *Result) Infos() ([]*Info, error) {
infos = append(infos, info)
return nil
})
err = errors.FilterOut(err, r.ignoreErrors...)
err = utilerrors.FilterOut(err, r.ignoreErrors...)
r.info, r.err = infos, err
return infos, err

8
pkg/kubectl/resource/visitor.go
View File

@@ -29,7 +29,7 @@ import (
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/yaml"
"k8s.io/kubernetes/pkg/watch"
)
@@ -196,7 +196,7 @@ func (l EagerVisitorList) Visit(fn VisitorFunc) error {
errs = append(errs, err)
}
}
return errors.NewAggregate(errs)
return utilerrors.NewAggregate(errs)
}
func ValidateSchema(data []byte, schema validation.Schema) error {
@@ -307,7 +307,7 @@ func (v ContinueOnErrorVisitor) Visit(fn VisitorFunc) error {
if len(errs) == 1 {
return errs[0]
}
return errors.NewAggregate(errs)
return utilerrors.NewAggregate(errs)
}
// FlattenListVisitor flattens any objects that runtime.ExtractList recognizes as a list
@@ -343,7 +343,7 @@ func (v FlattenListVisitor) Visit(fn VisitorFunc) error {
runtime.ObjectTyper
runtime.Decoder
}{v.Mapper, info.Mapping.Codec}); len(errs) > 0 {
return errors.NewAggregate(errs)
return utilerrors.NewAggregate(errs)
}
for i := range items {
item, err := v.InfoForObject(items[i])