If gcp routes belong to network that contain filter, delete them.

- For #80.

gcp/compute/client.go

@@ -2,6 +2,7 @@ package compute
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	gcpcompute "google.golang.org/api/compute/v1"
@@ -79,6 +80,15 @@ func NewClient(project string, service *gcpcompute.Service, logger logger) clien
 	}
 }
 
+func (c client) GetNetworkName(url string) string {
+	a := strings.Split(url, "/networks/")
+	if len(a) > 1 {
+		name := a[1]
+		return name
+	}
+	return ""
+}
+
 func (c client) ListAddresses(region string) ([]*gcpcompute.Address, error) {
 	var token string
 	list := []*gcpcompute.Address{}

gcp/compute/fakes/instances_client.go

@@ -3,7 +3,7 @@ package fakes
 import (
 	"sync"
 
-	compute "google.golang.org/api/compute/v1"
+	gcpcompute "google.golang.org/api/compute/v1"
 )
 
 type InstancesClient struct {
@@ -19,17 +19,28 @@ type InstancesClient struct {
 		}
 		Stub func(string, string) error
 	}
+	GetNetworkNameCall struct {
+		sync.Mutex
+		CallCount int
+		Receives  struct {
+			Url string
+		}
+		Returns struct {
+			Name string
+		}
+		Stub func(string) string
+	}
 	ListInstancesCall struct {
 		sync.Mutex
 		CallCount int
 		Receives  struct {
 			Zone string
 		}
 		Returns struct {
-			InstanceSlice []*compute.Instance
+			InstanceSlice []*gcpcompute.Instance
 			Error         error
 		}
-		Stub func(string) ([]*compute.Instance, error)
+		Stub func(string) ([]*gcpcompute.Instance, error)
 	}
 }
 
@@ -44,7 +55,17 @@ func (f *InstancesClient) DeleteInstance(param1 string, param2 string) error {
 	}
 	return f.DeleteInstanceCall.Returns.Error
 }
-func (f *InstancesClient) ListInstances(param1 string) ([]*compute.Instance, error) {
+func (f *InstancesClient) GetNetworkName(param1 string) string {
+	f.GetNetworkNameCall.Lock()
+	defer f.GetNetworkNameCall.Unlock()
+	f.GetNetworkNameCall.CallCount++
+	f.GetNetworkNameCall.Receives.Url = param1
+	if f.GetNetworkNameCall.Stub != nil {
+		return f.GetNetworkNameCall.Stub(param1)
+	}
+	return f.GetNetworkNameCall.Returns.Name
+}
+func (f *InstancesClient) ListInstances(param1 string) ([]*gcpcompute.Instance, error) {
 	f.ListInstancesCall.Lock()
 	defer f.ListInstancesCall.Unlock()
 	f.ListInstancesCall.CallCount++

gcp/compute/fakes/routes_client.go

@@ -18,6 +18,17 @@ type RoutesClient struct {
 		}
 		Stub func(string) error
 	}
+	GetNetworkNameCall struct {
+		sync.Mutex
+		CallCount int
+		Receives  struct {
+			Url string
+		}
+		Returns struct {
+			Name string
+		}
+		Stub func(string) string
+	}
 	ListRoutesCall struct {
 		sync.Mutex
 		CallCount int
@@ -39,6 +50,16 @@ func (f *RoutesClient) DeleteRoute(param1 string) error {
 	}
 	return f.DeleteRouteCall.Returns.Error
 }
+func (f *RoutesClient) GetNetworkName(param1 string) string {
+	f.GetNetworkNameCall.Lock()
+	defer f.GetNetworkNameCall.Unlock()
+	f.GetNetworkNameCall.CallCount++
+	f.GetNetworkNameCall.Receives.Url = param1
+	if f.GetNetworkNameCall.Stub != nil {
+		return f.GetNetworkNameCall.Stub(param1)
+	}
+	return f.GetNetworkNameCall.Returns.Name
+}
 func (f *RoutesClient) ListRoutes() ([]*gcpcompute.Route, error) {
 	f.ListRoutesCall.Lock()
 	defer f.ListRoutesCall.Unlock()

gcp/compute/instance.go

@@ -14,21 +14,14 @@ type Instance struct {
 	zone        string
 }
 
-func NewInstance(
-	client instancesClient,
-	name, zone string,
-	tags *gcpcompute.Tags,
-	networkInterfaces []*gcpcompute.NetworkInterface,
-) Instance {
-
+func NewInstance(client instancesClient, name, zone string, tags *gcpcompute.Tags, networkInterfaces []*gcpcompute.NetworkInterface) Instance {
 	clearerName := name
 
 	extra := []string{}
 	for _, ni := range networkInterfaces {
-		link := strings.Split(ni.Network, "/networks/")
-		if len(link) > 1 {
-			networkName := link[1]
-			extra = append(extra, networkName)
+		network := client.GetNetworkName(ni.Network)
+		if len(network) > 0 {
+			extra = append(extra, network)
 		}
 	}
 

gcp/compute/instance_test.go

@@ -29,6 +29,8 @@ var _ = Describe("Instance", func() {
 		networkInterfaces = []*gcpcompute.NetworkInterface{{Network: "https://www.googleapis.com/compute/v1/projects/id/global/networks/kiwi-network"}}
 		tags = &gcpcompute.Tags{Items: []string{"tag-1"}}
 
+		client.GetNetworkNameCall.Returns.Name = "kiwi-network"
+
 		instance = compute.NewInstance(client, name, zone, tags, networkInterfaces)
 	})
 

gcp/compute/instances.go

@@ -10,6 +10,7 @@ import (
 
 //go:generate faux --interface instancesClient --output fakes/instances_client.go
 type instancesClient interface {
+	GetNetworkName(url string) (name string)
 	ListInstances(zone string) ([]*gcpcompute.Instance, error)
 	DeleteInstance(zone, instance string) error
 }

gcp/compute/instances_test.go

@@ -60,8 +60,10 @@ var _ = Describe("Instances", func() {
 					Zone:              "https://zone-1",
 					NetworkInterfaces: []*gcpcompute.NetworkInterface{{Network: "global/networks/kiwi"}},
 				}}
+				client.GetNetworkNameCall.Returns.Name = "kiwi-network"
 				filter = "kiwi"
 			})
+
 			It("will add it to the list to delete", func() {
 				list, err := instances.List(filter)
 				Expect(err).NotTo(HaveOccurred())

gcp/compute/route.go

@@ -1,22 +1,32 @@
 package compute
 
-import "fmt"
+import (
+	"fmt"
+)
 
 type Route struct {
-	client routesClient
-	name   string
+	client      routesClient
+	name        string
+	clearerName string
 }
 
-func NewRoute(client routesClient, name string) Route {
+func NewRoute(client routesClient, name, network string) Route {
+	clearerName := name
+
+	networkName := client.GetNetworkName(network)
+	if len(networkName) > 0 {
+		clearerName = fmt.Sprintf("%s (%s)", name, networkName)
+	}
+
 	return Route{
-		client: client,
-		name:   name,
+		client:      client,
+		name:        name,
+		clearerName: clearerName,
 	}
 }
 
 func (r Route) Delete() error {
 	err := r.client.DeleteRoute(r.name)
-
 	if err != nil {
 		return fmt.Errorf("Delete: %s", err)
 	}
@@ -25,7 +35,7 @@ func (r Route) Delete() error {
 }
 
 func (r Route) Name() string {
-	return r.name
+	return r.clearerName
 }
 
 func (r Route) Type() string {

gcp/compute/route_test.go

@@ -2,6 +2,7 @@ package compute_test
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/genevieve/leftovers/gcp/compute"
 	"github.com/genevieve/leftovers/gcp/compute/fakes"
@@ -12,17 +13,21 @@ import (
 
 var _ = Describe("Route", func() {
 	var (
-		client *fakes.RoutesClient
-		name   string
+		client  *fakes.RoutesClient
+		name    string
+		network string
 
 		route compute.Route
 	)
 
 	BeforeEach(func() {
 		client = &fakes.RoutesClient{}
 		name = "banana"
+		network = ".com/networks/kiwi-network"
 
-		route = compute.NewRoute(client, name)
+		client.GetNetworkNameCall.Returns.Name = "kiwi-network"
+
+		route = compute.NewRoute(client, name, network)
 	})
 
 	Describe("Delete", func() {
@@ -48,7 +53,7 @@ var _ = Describe("Route", func() {
 
 	Describe("Name", func() {
 		It("returns the name", func() {
-			Expect(route.Name()).To(Equal(name))
+			Expect(route.Name()).To(Equal(fmt.Sprintf("%s (kiwi-network)", name)))
 		})
 	})
 

gcp/compute/routes.go

@@ -10,6 +10,7 @@ import (
 
 //go:generate faux --interface routesClient --output fakes/routes_client.go
 type routesClient interface {
+	GetNetworkName(url string) (name string)
 	ListRoutes() ([]*gcpcompute.Route, error)
 	DeleteRoute(route string) error
 }
@@ -35,9 +36,9 @@ func (r Routes) List(filter string) ([]common.Deletable, error) {
 
 	var resources []common.Deletable
 	for _, route := range routes {
-		resource := NewRoute(r.client, route.Name)
+		resource := NewRoute(r.client, route.Name, route.Network)
 
-		if !strings.Contains(route.Name, filter) || strings.Contains(route.Name, "default") {
+		if !strings.Contains(resource.Name(), filter) || strings.Contains(route.Name, "default") {
 			continue
 		}
 

gcp/compute/routes_test.go

@@ -49,6 +49,22 @@ var _ = Describe("Routes", func() {
 			Expect(list).To(HaveLen(1))
 		})
 
+		Context("when the route name does not contain the filter, but the network does", func() {
+			BeforeEach(func() {
+				client.ListRoutesCall.Returns.RouteSlice = []*gcpcompute.Route{{
+					Name:    "banana-route",
+					Network: ".com/networks/kiwi-network",
+				}}
+				client.GetNetworkNameCall.Returns.Name = "kiwi-network"
+			})
+			It("returns the route in the list to delete", func() {
+				list, err := routes.List("kiwi")
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(list).To(HaveLen(1))
+			})
+		})
+
 		Context("when the client fails to list routes", func() {
 			BeforeEach(func() {
 				client.ListRoutesCall.Returns.Error = errors.New("some error")