Merge pull request #85 from Cloud-Code-AI/84-refc-add-regions-in-aws-report-generation

Added region based data in report

Author: sauravpanda

README.md

@@ -43,6 +43,78 @@ Note: Make sure to run gather command first as report runs on local meta data ga
 ./main report --provider=aws
 ```
 
+You should see an output like this:
+```
+us-east-1
+    kms                       
+        keys                   2                    
+    rds                       
+        instances              0                    
+    route53                   
+        domains                0                    
+    lambda                    
+        functions              4                    
+        layers                 0                    
+    s3                        
+        buckets                9                    
+    cloudfront                
+        websites               2                    
+    ec2                       
+        amis                   0                    
+        instances              0                    
+        snapshots              0                    
+    elasticache               
+        cache_clusters         0                    
+        snapshots              0                    
+    codebuild                 
+        builds                 0                    
+        enviroment_images      5                    
+        projects               0                    
+    dynamodb                  
+        tables                 2                    
+    ess                       
+        domains                0                    
+    ecr                       
+        repositories           0                    
+    iam                       
+        policies               29                   
+        roles                  37                   
+        unused_policies        3                    
+        users                  5                    
+    apigateway                
+        stacks                 1                    
+    cloudformation            
+        stacks                 0                    
+    cloudwatch                
+        metrics                272                  
+        dashboards             0                    
+        metric_streams         0                    
+us-east-2
+    cloudfront                
+        websites               2                    
+    dynamodb                  
+        tables                 3                    
+    ec2                       
+        amis                   0                    
+        instances              1                    
+        snapshots              0                    
+    iam                       
+        policies               29                   
+        roles                  38                   
+        unused_policies        3                    
+        users                  5                    
+    lambda                    
+        functions              5                    
+        layers                 1                    
+    rds                       
+        instances              1                    
+    s3                        
+        buckets                9
+```
+
+
+And you can also find your results at `output/aws_report.json`
+
 
 ## Contributing:
 We welcome contributions from the community! If you're interested in contributing to CloudState, please check out our contributing guidelines [here]. Whether it's adding new features, fixing bugs, or improving documentation, your help is greatly appreciated.

services/awshandler/generatereport.go

@@ -11,17 +11,11 @@ import (
 
 func GenerateAWSReport() {
 	// Get the most recent data stored for a provider
-	dir, err := utils.GetMostRecentDirectory("./output/aws/")
-	if err != nil {
-		fmt.Println("Failed to find the resource meta data locally. Make sure to run gather command before running repor!")
-		fmt.Println(err)
-		return
-	}
+	dir := "./output/aws/"
 
 	// Compiles and list all the stats in a single file.
-	allStats := make(map[string]interface{})
-	var serviceName string
-	err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+	regionStats := make(map[string]map[string]interface{})
+	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -31,20 +25,28 @@ func GenerateAWSReport() {
 			if err != nil {
 				return err
 			}
-			serviceName = strings.Split(path, "/")[3]
+			// Extract service name and region from path
+			pathParts := strings.Split(path, "/")
+			if len(pathParts) < 4 {
+				return fmt.Errorf("unexpected path format: %s", path)
+			}
+			serviceName := pathParts[3]
+			regionName := pathParts[2]
 
 			// Print the entire data for debugging
 			fmt.Printf("Service name %v, data is %v, \n", serviceName, data["stats"])
 
 			// Type assert 'stats' as map[string]int
 			stats, ok := data["stats"].(map[string]interface{})
 			if !ok {
-				// handle the error: data["stats"] is not of type map[string]int
-				fmt.Printf("Service name %v, data is %v, \n", serviceName, data["stats"])
-				fmt.Printf("Error in parsing stats data for service %v\n", serviceName)
-			} else {
-				allStats[serviceName] = stats
+				return fmt.Errorf("invalid stats format for service: %s, region: %s", serviceName, regionName)
+			}
+
+			// Group stats by region
+			if _, exists := regionStats[regionName]; !exists {
+				regionStats[regionName] = make(map[string]interface{})
 			}
+			regionStats[regionName][serviceName] = stats
 		}
 
 		return nil
@@ -54,11 +56,13 @@ func GenerateAWSReport() {
 		return
 	}
 
-	utils.PrintNested(allStats, "", 0)
+	// Print and write the report
+	utils.PrintNested(regionStats, "", 0)
 
-	err = utils.WriteJSONToFile("output/aws/report.json", allStats)
+	err = utils.WriteJSONToFile("output/aws_report.json", regionStats)
 	if err != nil {
 		fmt.Println("Failed to Write the report file to json")
+		fmt.Println(err)
 	}
 
 }

services/utils/statshandler.go

@@ -8,26 +8,34 @@ import (
 
 func PrintNested(data interface{}, prefix string, level int) {
 	indent := "    " // 4 spaces
-	if reflect.TypeOf(data).Kind() == reflect.Map {
+	if level == 0 {
+		// Assuming top-level is map[string]map[string]interface{}
+		for region, services := range data.(map[string]map[string]interface{}) {
+			fmt.Println(prefix + strings.Repeat(indent, level) + region)
+			PrintNested(services, prefix, level+1)
+		}
+	} else if reflect.TypeOf(data).Kind() == reflect.Map {
+		// Handle nested maps
 		for k, v := range data.(map[string]interface{}) {
 			valueType := reflect.TypeOf(v).Kind()
 			keyString := fmt.Sprintf("%-30s", prefix+strings.Repeat(indent, level)+k)
 			if valueType == reflect.Map || valueType == reflect.Slice {
-				fmt.Println(keyString, "(nested)")
+				fmt.Println(keyString)
 				PrintNested(v, prefix, level+1)
 			} else {
-				fmt.Println(keyString, fmt.Sprintf("%-20v", v))
+				fmt.Printf("%s %-20v \n", keyString, v)
 			}
 		}
 	} else if reflect.TypeOf(data).Kind() == reflect.Slice {
-		for i, v := range data.([]interface{}) {
+		// Handle slices
+		for _, v := range data.([]interface{}) {
 			valueType := reflect.TypeOf(v).Kind()
-			keyString := fmt.Sprintf("%-30s", prefix+strings.Repeat(indent, level)+fmt.Sprintf("[%d]", i))
+			keyString := fmt.Sprintf("%-30s", prefix+strings.Repeat(indent, level))
 			if valueType == reflect.Map || valueType == reflect.Slice {
-				fmt.Println(keyString, "(nested)")
+				fmt.Println(keyString)
 				PrintNested(v, prefix, level+1)
 			} else {
-				fmt.Println(keyString, fmt.Sprintf("%-20v", v))
+				fmt.Printf("%s %-20v \n", keyString, v)
 			}
 		}
 	}