s3_bucket_notification: Fix not create bucket field when import (#978)

* s3_bucket_notification: Fix not create `bucket` field when import * s3_bucket_notification: Fix import acceptance test
hashicorp · Jul 3, 2017 · a39f0bb · a39f0bb
1 parent 41b6656
commit a39f0bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/aws/import_aws_s3_bucket_notification_test.go b/aws/import_aws_s3_bucket_notification_test.go
@@ -20,10 +20,9 @@ func TestAccAWSS3BucketNotification_importBasic(t *testing.T) {
 			},
 
 			resource.TestStep{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"bucket"},
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -38,10 +37,9 @@ func TestAccAWSS3BucketNotification_importBasic(t *testing.T) {
 			},
 
 			resource.TestStep{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"bucket"},
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -56,10 +54,9 @@ func TestAccAWSS3BucketNotification_importBasic(t *testing.T) {
 			},
 
 			resource.TestStep{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"bucket"},
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})

diff --git a/aws/resource_aws_s3_bucket_notification.go b/aws/resource_aws_s3_bucket_notification.go
@@ -378,6 +378,9 @@ func resourceAwsS3BucketNotificationRead(d *schema.ResourceData, meta interface{
 		return err
 	}
 	log.Printf("[DEBUG] S3 Bucket: %s, get notification: %v", d.Id(), notificationConfigs)
+
+	d.Set("bucket", d.Id())
+
 	// Topic Notification
 	if err := d.Set("topic", flattenTopicConfigurations(notificationConfigs.TopicConfigurations)); err != nil {
 		return fmt.Errorf("error reading S3 bucket \"%s\" topic notification: %s", d.Id(), err)