From 5ac578b076e784f125e2c37b7fcda7e918d8d0c1 Mon Sep 17 00:00:00 2001
From: rajula96reddy <rajula96reddy@gmail.com>
Date: Tue, 14 Jan 2020 16:16:36 +0530
Subject: [PATCH] Created new error type & made corresponding changes

---
 cmd/minikube/cmd/service.go     | 13 +++++++++++--
 pkg/minikube/service/service.go | 27 +++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index b84891209117..eb41de0fbef0 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -45,6 +46,14 @@ var (
 	interval           int
 )
 
+// type serviceNotFoundError struct {
+// 	Err error
+// }
+
+// func (t serviceNotFoundError) Error() string {
+// 	return "Service not found: " + t.Err.Error()
+// }
+
 // serviceCmd represents the service command
 var serviceCmd = &cobra.Command{
 	Use:   "service [flags] SERVICE",
@@ -74,10 +83,10 @@ var serviceCmd = &cobra.Command{
 		if !cluster.IsMinikubeRunning(api) {
 			os.Exit(1)
 		}
-
 		urls, err := service.WaitForService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval)
 		if err != nil {
-			if err.Error() == "Service not found in namespace" {
+			var s *service.SVCNotFoundError
+			if errors.As(err, &s) {
 				exit.WithCodeT(exit.Data, `Service '{{.service}}' was not found in '{{.namespace}}' namespace.
 You may select another namespace by using 'minikube service {{.service}} -n <namespace>'. Or list out all the services using 'minikube service list'`, out.V{"service": svc, "namespace": namespace})
 			}
diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
index ed3e5ec7eb64..26a49f4f7b77 100644
--- a/pkg/minikube/service/service.go
+++ b/pkg/minikube/service/service.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"sort"
 	"strings"
 	"text/template"
 	"time"
@@ -48,9 +49,9 @@ import (
 const (
 	defaultK8sClientTimeout = 60 * time.Second
 	// DefaultWait is the default wait time, in seconds
-	DefaultWait = 20
+	DefaultWait = 2
 	// DefaultInterval is the default interval, in seconds
-	DefaultInterval = 6
+	DefaultInterval = 1
 )
 
 // K8sClient represents a kubernetes client
@@ -264,19 +265,37 @@ func PrintServiceList(writer io.Writer, data [][]string) {
 	table.Render()
 }
 
+// SVCNotFoundError error type handles 'service not found' scenarios
+type SVCNotFoundError struct {
+	Err error
+}
+
+// Error method for SVCNotFoundError type
+func (t SVCNotFoundError) Error() string {
+	return "Service not found"
+}
+
 // WaitForService waits for a service, and return the urls when available
 func WaitForService(api libmachine.API, namespace string, service string, urlTemplate *template.Template, urlMode bool, https bool,
 	wait int, interval int) ([]string, error) {
-
 	var urlList []string
 	// Convert "Amount of time to wait" and "interval of each check" to attempts
 	if interval == 0 {
 		interval = 1
 	}
+	services, err := GetServiceURLs(api, namespace, urlTemplate)
+	if err != nil {
+		return nil, err
+	}
+	searchServices := sort.Search(len(services), func(i int) bool { return services[i].Name == service })
+	if searchServices == len(services) {
+		return nil, &SVCNotFoundError{err}
+	}
+
 	chkSVC := func() error { return CheckService(namespace, service) }
 
 	if err := retry.Expo(chkSVC, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return nil, errors.New("Service not found in namespace")
+		return nil, &SVCNotFoundError{err}
 	}
 
 	serviceURL, err := GetServiceURLsForService(api, namespace, service, urlTemplate)