Merge pull request #85 from RoseSecurity/fix-sorting-error

refactor: use type any and sort unused attrs

Author: RoseSecurity

internal/analyzer.go

@@ -6,6 +6,7 @@ package internal
 import (
 	"fmt"
 	"path/filepath"
+	"sort"
 	"strings"
 )
 
@@ -67,35 +68,37 @@ func printDiff(resources []Resource, schema ProviderSchema, model, tool, prompt,
 	return nil
 }
 
-func findUnusedAttributes(usedAttrs map[string]string, possibleAttrs map[string]interface{}) []string {
-    validNames := make(map[string]struct{})
+func findUnusedAttributes(usedAttrs map[string]string, possibleAttrs map[string]any) []string {
+	validNames := make(map[string]struct{})
 
-    if blockAny, ok := possibleAttrs["block"]; ok {
-        if block, ok := blockAny.(map[string]interface{}); ok {
-            //Attributes at the current block level
-            if attrsAny, ok := block["attributes"]; ok {
-                if attrsMap, ok := attrsAny.(map[string]interface{}); ok {
-                    for name := range attrsMap {
-                        validNames[name] = struct{}{}
-                    }
-                }
-            }
-            // Nested block types at this level (their names appear as top-level blocks in HCL)
-            if blockTypesAny, ok := block["block_types"]; ok {
-                if btMap, ok := blockTypesAny.(map[string]interface{}); ok {
-                    for name := range btMap {
-                        validNames[name] = struct{}{}
-                    }
-                }
-            }
-        }
-    }
+	if blockAny, ok := possibleAttrs["block"]; ok {
+		if block, ok := blockAny.(map[string]any); ok {
+			// Attributes at the current block level
+			if attrsAny, ok := block["attributes"]; ok {
+				if attrsMap, ok := attrsAny.(map[string]any); ok {
+					for name := range attrsMap {
+						validNames[name] = struct{}{}
+					}
+				}
+			}
+			// Nested block types at this level (their names appear as top-level blocks in HCL)
+			if blockTypesAny, ok := block["block_types"]; ok {
+				if btMap, ok := blockTypesAny.(map[string]any); ok {
+					for name := range btMap {
+						validNames[name] = struct{}{}
+					}
+				}
+			}
+		}
+	}
+
+	var unused []string
+	for name := range validNames {
+		if _, used := usedAttrs[name]; !used {
+			unused = append(unused, name)
+		}
+	}
+	sort.Strings(unused)
 
-    var unused []string
-    for name := range validNames {
-        if _, used := usedAttrs[name]; !used {
-            unused = append(unused, name)
-        }
-    }
-    return unused
+	return unused
 }

internal/dry_run.go

@@ -6,6 +6,7 @@ package internal
 import (
 	"fmt"
 	"path/filepath"
+	"sort"
 	"strings"
 )
 
@@ -65,35 +66,37 @@ func testPossibleAttributes(resources []Resource, schema ProviderSchema, tool st
 }
 
 // testFindUnusedAttributes identifies unused attributes by comparing used and possible attributes.
-func testFindUnusedAttributes(usedAttrs map[string]string, possibleAttrs map[string]interface{}) []string {
-    // Mirror logic in analyzer's findUnusedAttributes: only consider names
-    // under block.attributes and block.block_types.
-    validNames := make(map[string]struct{})
+func testFindUnusedAttributes(usedAttrs map[string]string, possibleAttrs map[string]any) []string {
+	// Mirror logic in analyzer's findUnusedAttributes: only consider names
+	// under block.attributes and block.block_types.
+	validNames := make(map[string]struct{})
 
-    if blockAny, ok := possibleAttrs["block"]; ok {
-        if block, ok := blockAny.(map[string]interface{}); ok {
-            if attrsAny, ok := block["attributes"]; ok {
-                if attrsMap, ok := attrsAny.(map[string]interface{}); ok {
-                    for name := range attrsMap {
-                        validNames[name] = struct{}{}
-                    }
-                }
-            }
-            if blockTypesAny, ok := block["block_types"]; ok {
-                if btMap, ok := blockTypesAny.(map[string]interface{}); ok {
-                    for name := range btMap {
-                        validNames[name] = struct{}{}
-                    }
-                }
-            }
-        }
-    }
+	if blockAny, ok := possibleAttrs["block"]; ok {
+		if block, ok := blockAny.(map[string]any); ok {
+			if attrsAny, ok := block["attributes"]; ok {
+				if attrsMap, ok := attrsAny.(map[string]any); ok {
+					for name := range attrsMap {
+						validNames[name] = struct{}{}
+					}
+				}
+			}
+			if blockTypesAny, ok := block["block_types"]; ok {
+				if btMap, ok := blockTypesAny.(map[string]any); ok {
+					for name := range btMap {
+						validNames[name] = struct{}{}
+					}
+				}
+			}
+		}
+	}
+
+	var unused []string
+	for name := range validNames {
+		if _, used := usedAttrs[name]; !used {
+			unused = append(unused, name)
+		}
+	}
+	sort.Strings(unused)
 
-    var unused []string
-    for name := range validNames {
-        if _, used := usedAttrs[name]; !used {
-            unused = append(unused, name)
-        }
-    }
-    return unused
+	return unused
 }