Fix bug for trusted advisor where metadata doesn't come in expected o…

…rder (#11)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.2
+
+Fix bug for trusted advisor where metadata doesn't come in expected order
+
 ## v0.1.1
 
 Fix bux for multi-role trusted advisor

VERSION

@@ -1 +1 @@
-v0.1.1
+v0.1.2

pkg/aws/utils.go

@@ -1,5 +1,9 @@
 package aws
 
+import (
+	"github.com/aws/aws-sdk-go/aws"
+)
+
 // Contains tells whether slice of strings 'ss' contains string 's'.
 func Contains(ss []string, s string) bool {
 	for _, n := range ss {
@@ -10,3 +14,12 @@ func Contains(ss []string, s string) bool {
 	return false
 }
 
+// SdkStringContains tells whether slice of pointers of strings 'ss' contains pointer string 's'.
+func SdkStringContains(ss []*string, s *string) bool {
+	for _, n := range ss {
+		if aws.StringValue(s) == aws.StringValue(n) {
+			return true
+		}
+	}
+	return false
+}

pkg/aws/utils_test.go

@@ -2,6 +2,8 @@ package aws
 
 import (
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
 )
 
 func TestContains(t *testing.T) {
@@ -38,3 +40,38 @@ func TestContains(t *testing.T) {
 		})
 	}
 }
+
+func TestAwsStringContains(t *testing.T) {
+	type args struct {
+		a []*string
+		x *string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "#1",
+			args: args{a: []*string{aws.String("a"), aws.String("b"), aws.String("c")}, x: aws.String("c")},
+			want: true,
+		},
+		{
+			name: "#2",
+			args: args{a: []*string{aws.String("a"), aws.String("b"), aws.String("c")}, x: aws.String("d")},
+			want: false,
+		},
+		{
+			name: "#3",
+			args: args{a: []*string{}, x: aws.String("d")},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := SdkStringContains(tt.args.a, tt.args.x); got != tt.want {
+				t.Errorf("SdkStringContains() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/cloudig/trustedadvisor.go

@@ -64,7 +64,7 @@ func processTrustedAdvisorResults(results map[*support.TrustedAdvisorCheckDescri
 		finding.Comments = getComments(comments, finding.AccountID, findingTypeTrustedAdvisor, finding.Category+"-"+strings.Replace(finding.Name, " ", "_", -1))
 		for _, resource := range result.FlaggedResources {
 			if resource.Metadata != nil {
-				if aws.StringValue(resource.Metadata[0]) != "Green" {
+				if !awslocal.SdkStringContains(resource.Metadata, aws.String("Green")) && aws.BoolValue(resource.IsSuppressed) == false {
 					flaggedResource := aws.StringValue(resource.Metadata[1])
 					if aws.StringValue(resource.Metadata[2]) != "" && aws.StringValue(check.Metadata[1]) == "Region" {
 						flaggedResourceMeta := aws.StringValue(resource.Metadata[2])