Merge pull request #545 from cloudskiff/issue_542_aws_db_instance

Fix aws_db_instance false-positives

pkg/resource/aws/aws_db_instance_ext.go

@@ -14,9 +14,15 @@ func (r *AwsDbInstance) NormalizeForState() (resource.Resource, error) {
 	if r.ApplyImmediately != nil && !*r.ApplyImmediately {
 		r.ApplyImmediately = nil
 	}
+	if r.CharacterSetName != nil && *r.CharacterSetName == "" {
+		r.CharacterSetName = nil
+	}
 	return r, nil
 }
 
 func (r *AwsDbInstance) NormalizeForProvider() (resource.Resource, error) {
+	if r.CharacterSetName != nil && *r.CharacterSetName == "" {
+		r.CharacterSetName = nil
+	}
 	return r, nil
 }

pkg/resource/aws/aws_db_instance_test.go

@@ -0,0 +1,29 @@
+package aws_test
+
+import (
+	"testing"
+
+	"github.com/cloudskiff/driftctl/test"
+	"github.com/cloudskiff/driftctl/test/acceptance"
+)
+
+func TestAcc_AwsDbInstance(t *testing.T) {
+	acceptance.Run(t, acceptance.AccTestCase{
+		Paths: []string{"./testdata/acc/aws_db_instance"},
+		Args:  []string{"scan", "--filter", "Type=='aws_db_instance'"},
+		Checks: []acceptance.AccCheck{
+			{
+				Env: map[string]string{
+					"AWS_REGION": "us-east-1",
+				},
+				Check: func(result *test.ScanResult, stdout string, err error) {
+					if err != nil {
+						t.Fatal(err)
+					}
+					result.AssertInfrastructureIsInSync()
+					result.AssertManagedCount(1)
+				},
+			},
+		},
+	})
+}

pkg/resource/aws/testdata/acc/aws_db_instance/db_instance.tf

@@ -0,0 +1,21 @@
+provider "aws" {
+    region = "us-east-1"
+}
+
+terraform {
+    required_providers {
+        aws = "3.19.0"
+    }
+}
+
+resource "aws_db_instance" "default" {
+  allocated_storage    = 10
+  engine               = "mysql"
+  engine_version       = "5.7"
+  instance_class       = "db.t3.micro"
+  name                 = "mydb"
+  username             = "foo"
+  password             = "foobarbaz"
+  parameter_group_name = "default.mysql5.7"
+  skip_final_snapshot  = true
+}