fix: bug where v2 resource lister was not being used

ekristen · Feb 14, 2022 · e8b6493 · e8b6493
1 parent 45174b3
commit e8b6493
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/pkg/nuke/scan.go b/pkg/nuke/scan.go
@@ -88,6 +88,7 @@ func (s *scanner) list(authorizers azure.Authorizers, tenantId, subscriptionId,
 	for _, r := range rs {
 		s.items <- &queue.Item{
 			Authorizers:    authorizers,
+			TenantId:       tenantId,
 			SubscriptionId: subscriptionId,
 			ResourceGroup:  resourceGroup,
 			Resource:       r,

diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go
@@ -31,6 +31,7 @@ type Item struct {
 	Reason string
 
 	Authorizers    azure.Authorizers
+	TenantId       string
 	SubscriptionId string
 	ResourceGroup  string
 
@@ -57,15 +58,20 @@ func (i *Item) Print() {
 
 // List gets all resource items of the same resource type like the Item.
 func (i *Item) List() ([]resource.Resource, error) {
-	listers := resource.GetListers()
+	listers := resource.GetListersV2()
 	/*
 		sess, err := i.Region.Session(i.Type)
 		if err != nil {
 			return nil, err
 		}
 		return listers[i.Type](sess)
 	*/
-	return listers[i.Type](i.Authorizers, i.SubscriptionId, i.ResourceGroup)
+	return listers[i.Type](resource.ListerOpts{
+		Authorizers:    i.Authorizers,
+		TenantId:       i.TenantId,
+		SubscriptionId: i.SubscriptionId,
+		ResourceGroup:  i.ResourceGroup,
+	})
 }
 
 func (i *Item) GetProperty(key string) (string, error) {

diff --git a/resources/disk.go b/resources/disk.go
@@ -14,7 +14,8 @@ import (
 
 type Disk struct {
 	client compute.DisksClient
-	name   *string
+	name   string
+	rg     string
 }
 
 func init() {
@@ -51,7 +52,8 @@ func ListDisk(opts resource.ListerOpts) ([]resource.Resource, error) {
 		for _, g := range list.Values() {
 			resources = append(resources, &Disk{
 				client: client,
-				name:   g.Name,
+				name:   *g.Name,
+				rg:     opts.ResourceGroup,
 			})
 		}
 
@@ -64,18 +66,18 @@ func ListDisk(opts resource.ListerOpts) ([]resource.Resource, error) {
 }
 
 func (r *Disk) Remove() error {
-	_, err := r.client.Delete(context.TODO(), "Default", *r.name)
+	_, err := r.client.Delete(context.TODO(), r.rg, r.name)
 	return err
 }
 
 func (r *Disk) Properties() types.Properties {
 	properties := types.NewProperties()
 
-	properties.Set("Name", *r.name)
+	properties.Set("Name", r.name)
 
 	return properties
 }
 
 func (r *Disk) String() string {
-	return *r.name
+	return r.name
 }