Merge pull request #1350 from fanhaf/panic_DBName_null

Provider/AWS: RDS - Avoid panics when DBName is not set
2015-04-01 09:02:52 -05:00 · 2015-04-01 09:02:52 -05:00 · 85c89c3ec6
parent b1c2ce415e dc67b043fa
commit 85c89c3ec6
1 changed files with 5 additions and 1 deletions
--- a/builtin/providers/aws/resource_aws_db_instance.go
+++ b/builtin/providers/aws/resource_aws_db_instance.go
@ -304,7 +304,11 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
 		return nil
 	}

-	d.Set("name", *v.DBName)
+	if v.DBName != nil {
+		d.Set("name", *v.DBName)
+	} else {
+		d.Set("name", "")
+	}
 	d.Set("username", *v.MasterUsername)
 	d.Set("engine", *v.Engine)
 	d.Set("engine_version", *v.EngineVersion)