Merge pull request #7667 from hashicorp/phinze/skip-final-snapshot-import

provider/aws: Fixup skip_final_snapshot import
This commit is contained in:
Paul Hinze 2016-07-15 13:34:37 -06:00 committed by GitHub
commit 71932138b9
3 changed files with 24 additions and 9 deletions

View File

@ -23,7 +23,10 @@ func TestAccAWSDBInstance_importBasic(t *testing.T) {
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{
"password", "skip_final_snapshot"},
"password",
"skip_final_snapshot",
"final_snapshot_identifier",
},
},
},
})

View File

@ -23,7 +23,7 @@ func resourceAwsDbInstance() *schema.Resource {
Update: resourceAwsDbInstanceUpdate,
Delete: resourceAwsDbInstanceDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
State: resourceAwsDbInstanceImport,
},
Schema: map[string]*schema.Schema{
@ -757,11 +757,8 @@ func resourceAwsDbInstanceDelete(d *schema.ResourceData, meta interface{}) error
opts := rds.DeleteDBInstanceInput{DBInstanceIdentifier: aws.String(d.Id())}
skipFinalSnapshot, exists := d.GetOk("skip_final_snapshot")
if !exists {
skipFinalSnapshot = true
}
opts.SkipFinalSnapshot = aws.Bool(skipFinalSnapshot.(bool))
skipFinalSnapshot := d.Get("skip_final_snapshot").(bool)
opts.SkipFinalSnapshot = aws.Bool(skipFinalSnapshot)
if skipFinalSnapshot == false {
if name, present := d.GetOk("final_snapshot_identifier"); present {
@ -1023,6 +1020,15 @@ func resourceAwsDbInstanceRetrieve(
return resp.DBInstances[0], nil
}
func resourceAwsDbInstanceImport(
d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
// Neither skip_final_snapshot nor final_snapshot_identifier can be fetched
// from any API call, so we need to default skip_final_snapshot to true so
// that final_snapshot_identifier is not required
d.Set("skip_final_snapshot", true)
return []*schema.ResourceData{d}, nil
}
func resourceAwsDbInstanceStateRefreshFunc(
d *schema.ResourceData, meta interface{}) resource.StateRefreshFunc {
return func() (interface{}, string, error) {

View File

@ -90,8 +90,14 @@ func testStepImportState(
}
// Compare their attributes
actual := r.Primary.Attributes
expected := oldR.Primary.Attributes
actual := make(map[string]string)
for k, v := range r.Primary.Attributes {
actual[k] = v
}
expected := make(map[string]string)
for k, v := range oldR.Primary.Attributes {
expected[k] = v
}
// Remove fields we're ignoring
for _, v := range step.ImportStateVerifyIgnore {