Use filter for azure delete calls.

Author: Genevieve LEsperance

azure/deleter.go

@@ -16,7 +16,7 @@ type logger interface {
 }
 
 type resource interface {
-	Delete() error
+	Delete(filter string) error
 }
 
 type Deleter struct {
@@ -25,7 +25,7 @@ type Deleter struct {
 
 func (d Deleter) Delete(filter string) error {
 	for _, r := range d.resources {
-		if err := r.Delete(); err != nil {
+		if err := r.Delete(filter); err != nil {
 			return err
 		}
 	}

azure/fakes/logger.go

@@ -12,7 +12,8 @@ type Logger struct {
 	}
 
 	PromptCall struct {
-		Receives struct {
+		CallCount int
+		Receives  struct {
 			Message string
 		}
 		Returns struct {
@@ -29,6 +30,7 @@ func (l *Logger) Printf(message string, a ...interface{}) {
 }
 
 func (l *Logger) Prompt(message string) bool {
+	l.PromptCall.CallCount++
 	l.PromptCall.Receives.Message = message
 
 	return l.PromptCall.Returns.Proceed

azure/groups.go

@@ -2,13 +2,14 @@ package azure
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
 	"github.com/Azure/go-autorest/autorest"
 )
 
 type groupsClient interface {
-	List(filter string, top *int32) (resources.GroupListResult, error)
+	List(query string, top *int32) (resources.GroupListResult, error)
 	Delete(name string, channel <-chan struct{}) (<-chan autorest.Response, <-chan error)
 }
 
@@ -24,7 +25,7 @@ func NewGroups(client groupsClient, logger logger) Groups {
 	}
 }
 
-func (r Groups) Delete() error {
+func (r Groups) Delete(filter string) error {
 	groups, err := r.client.List("", nil)
 	if err != nil {
 		return fmt.Errorf("Listing resource groups: %s", err)
@@ -33,6 +34,10 @@ func (r Groups) Delete() error {
 	for _, g := range *groups.Value {
 		n := *g.Name
 
+		if !strings.Contains(n, filter) {
+			continue
+		}
+
 		proceed := r.logger.Prompt(fmt.Sprintf("Are you sure you want to delete resource group %s?", n))
 		if !proceed {
 			continue

azure/groups_test.go

@@ -15,13 +15,15 @@ var _ = Describe("Groups", func() {
 	var (
 		client *fakes.GroupsClient
 		logger *fakes.Logger
+		filter string
 
 		groups azure.Groups
 	)
 
 	BeforeEach(func() {
 		client = &fakes.GroupsClient{}
 		logger = &fakes.Logger{}
+		filter = "banana"
 
 		groups = azure.NewGroups(client, logger)
 	})
@@ -31,7 +33,7 @@ var _ = Describe("Groups", func() {
 			logger.PromptCall.Returns.Proceed = true
 			client.ListCall.Returns.Output = resources.GroupListResult{
 				Value: &[]resources.Group{{
-					Name: aws.String("banana"),
+					Name: aws.String("banana-group"),
 				}},
 			}
 			errChan := make(chan error, 1)
@@ -40,13 +42,13 @@ var _ = Describe("Groups", func() {
 		})
 
 		It("deletes resource groups", func() {
-			err := groups.Delete()
+			err := groups.Delete(filter)
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(client.ListCall.CallCount).To(Equal(1))
 			Expect(client.DeleteCall.CallCount).To(Equal(1))
-			Expect(client.DeleteCall.Receives.Name).To(Equal("banana"))
-			Expect(logger.PrintfCall.Messages).To(Equal([]string{"SUCCESS deleting resource group banana\n"}))
+			Expect(client.DeleteCall.Receives.Name).To(Equal("banana-group"))
+			Expect(logger.PrintfCall.Messages).To(Equal([]string{"SUCCESS deleting resource group banana-group\n"}))
 		})
 
 		Context("when client fails to list resource groups", func() {
@@ -55,19 +57,43 @@ var _ = Describe("Groups", func() {
 			})
 
 			It("returns the error", func() {
-				err := groups.Delete()
+				err := groups.Delete(filter)
 				Expect(err).To(MatchError("Listing resource groups: some error"))
 
 				Expect(client.ListCall.CallCount).To(Equal(1))
 				Expect(client.DeleteCall.CallCount).To(Equal(0))
 			})
 		})
 
+		Context("when the user responds no to the prompt", func() {
+			BeforeEach(func() {
+				logger.PromptCall.Returns.Proceed = false
+			})
+
+			It("does not delete the resource group", func() {
+				err := groups.Delete(filter)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(logger.PromptCall.Receives.Message).To(Equal("Are you sure you want to delete resource group banana-group?"))
+				Expect(client.DeleteCall.CallCount).To(Equal(0))
+			})
+		})
+
+		Context("when the resource group name does not contain the filter", func() {
+			It("does not delete it", func() {
+				err := groups.Delete("grape")
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(logger.PromptCall.CallCount).To(Equal(0))
+				Expect(client.DeleteCall.CallCount).To(Equal(0))
+			})
+		})
+
 		Context("when client fails to delete the resource group", func() {
 			BeforeEach(func() {
 				client.ListCall.Returns.Output = resources.GroupListResult{
 					Value: &[]resources.Group{{
-						Name: aws.String("banana"),
+						Name: aws.String("banana-group"),
 					}},
 				}
 				errChan := make(chan error, 1)
@@ -76,27 +102,13 @@ var _ = Describe("Groups", func() {
 			})
 
 			It("logs the error", func() {
-				err := groups.Delete()
+				err := groups.Delete(filter)
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(client.ListCall.CallCount).To(Equal(1))
 				Expect(client.DeleteCall.CallCount).To(Equal(1))
-				Expect(client.DeleteCall.Receives.Name).To(Equal("banana"))
-				Expect(logger.PrintfCall.Messages).To(Equal([]string{"ERROR deleting resource group banana: some error\n"}))
-			})
-		})
-
-		Context("when the user responds no to the prompt", func() {
-			BeforeEach(func() {
-				logger.PromptCall.Returns.Proceed = false
-			})
-
-			It("does not delete the resource group", func() {
-				err := groups.Delete()
-				Expect(err).NotTo(HaveOccurred())
-
-				Expect(logger.PromptCall.Receives.Message).To(Equal("Are you sure you want to delete resource group banana?"))
-				Expect(client.DeleteCall.CallCount).To(Equal(0))
+				Expect(client.DeleteCall.Receives.Name).To(Equal("banana-group"))
+				Expect(logger.PrintfCall.Messages).To(Equal([]string{"ERROR deleting resource group banana-group: some error\n"}))
 			})
 		})
 	})