Refactor Builder.visitorResult by extra methonds.

pkg/kubectl/resource/builder.go

@@ -533,6 +533,31 @@ func (b *Builder) visitorResult() *Result {
 
 	// visit selectors
 	if b.selector != nil {
+		return b.visitBySelector()
+	}
+
+	// visit items specified by resource and name
+	if len(b.resourceTuples) != 0 {
+		return b.visitByResource()
+	}
+
+	// visit items specified by name
+	if len(b.names) != 0 {
+		return b.visitByName()
+	}
+
+	// visit items specified by paths
+	if len(b.paths) != 0 {
+		return b.visitByPaths()
+	}
+
+	if len(b.resources) != 0 {
+		return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}
+	}
+	return &Result{err: missingResourceError}
+}
+
+func (b *Builder) visitBySelector() *Result {
 	if len(b.names) != 0 {
 		return &Result{err: fmt.Errorf("name cannot be provided when a selector is specified")}
 	}
@@ -571,10 +596,9 @@ func (b *Builder) visitorResult() *Result {
 		return &Result{visitor: EagerVisitorList(visitors), sources: visitors}
 	}
 	return &Result{visitor: VisitorList(visitors), sources: visitors}
-	}
+}
 
-	// visit items specified by resource and name
-	if len(b.resourceTuples) != 0 {
+func (b *Builder) visitByResource() *Result {
 	// if b.singular is false, this could be by default, so double-check length
 	// of resourceTuples to determine if in fact it is singular or not
 	isSingular := b.singular
@@ -639,10 +663,9 @@ func (b *Builder) visitorResult() *Result {
 		visitors = VisitorList(items)
 	}
 	return &Result{singular: isSingular, visitor: visitors, sources: items}
-	}
+}
 
-	// visit items specified by name
-	if len(b.names) != 0 {
+func (b *Builder) visitByName() *Result {
 	isSingular := len(b.names) == 1
 
 	if len(b.paths) != 0 {
@@ -681,10 +704,9 @@ func (b *Builder) visitorResult() *Result {
 		visitors = append(visitors, info)
 	}
 	return &Result{singular: isSingular, visitor: VisitorList(visitors), sources: visitors}
-	}
+}
 
-	// visit items specified by paths
-	if len(b.paths) != 0 {
+func (b *Builder) visitByPaths() *Result {
 	singular := !b.dir && !b.stream && len(b.paths) == 1
 	if len(b.resources) != 0 {
 		return &Result{singular: singular, err: fmt.Errorf("when paths, URLs, or stdin is provided as input, you may not specify resource arguments as well")}
@@ -710,12 +732,6 @@ func (b *Builder) visitorResult() *Result {
 		visitors = NewDecoratedVisitor(visitors, RetrieveLatest)
 	}
 	return &Result{singular: singular, visitor: visitors, sources: b.paths}
-	}
-
-	if len(b.resources) != 0 {
-		return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}
-	}
-	return &Result{err: missingResourceError}
 }
 
 // Do returns a Result object with a Visitor for the resources identified by the Builder.