Fixing #270 & #268

Azure · Nov 6, 2024 · 6552394 · 6552394
1 parent 35ca1eb
commit 6552394
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/internal/scanners/pip/pip.go b/internal/scanners/pip/pip.go
@@ -42,7 +42,7 @@ func (c *PublicIPScanner) Scan(scanContext *azqr.ScanContext) ([]azqr.AzqrServic
 			SubscriptionName: c.config.SubscriptionName,
 			ResourceGroup:    azqr.GetResourceGroupFromResourceID(*w.ID),
 			ServiceName:      *w.Name,
-			Type:             *w.Type,
+			Type:             parseType(w.Type),
 			Location:         *w.Location,
 			Recommendations:  rr,
 		})
@@ -67,3 +67,12 @@ func (c *PublicIPScanner) list() ([]*armnetwork.PublicIPAddress, error) {
 func (a *PublicIPScanner) ResourceTypes() []string {
 	return []string{"Microsoft.Network/publicIPAddresses"}
 }
+
+
+func parseType(t *string) string {
+	if t == nil {
+		return "Microsoft.Network/publicIPAddresses"
+	}
+	return *t
+}
+
diff --git a/internal/scanners/rt/rt.go b/internal/scanners/rt/rt.go
@@ -43,7 +43,7 @@ func (c *RouteTableScanner) Scan(scanContext *azqr.ScanContext) ([]azqr.AzqrServ
 			ResourceGroup:    azqr.GetResourceGroupFromResourceID(*w.ID),
 			ServiceName:      *w.Name,
 			Type:             *w.Type,
-			Location:         *w.Location,
+			Location:         parseLocation(w.Location),
 			Recommendations:  rr,
 		})
 	}
@@ -68,3 +68,9 @@ func (a *RouteTableScanner) ResourceTypes() []string {
 	return []string{"Microsoft.Network/routeTables"}
 }
 
+func parseLocation(l *string) string {
+	if l == nil {
+		return ""
+	}
+	return *l
+}