Skip to content

helper/schema: record schema version when destroy fails #2923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2015
Merged

helper/schema: record schema version when destroy fails #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helper/schema/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (r *Resource) Apply(
if s.ID != "" {
// Destroy the resource since it is created
if err := r.Delete(data, meta); err != nil {
return data.State(), err
return r.recordCurrentSchemaVersion(data.State()), err
}

// Make sure the ID is gone.
Expand Down
6 changes: 5 additions & 1 deletion helper/schema/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ func TestResourceApply_destroyPartial(t *testing.T) {
Optional: true,
},
},
SchemaVersion: 3,
}

r.Delete = func(d *ResourceData, m interface{}) error {
Expand Down Expand Up @@ -209,10 +210,13 @@ func TestResourceApply_destroyPartial(t *testing.T) {
"id": "bar",
"foo": "42",
},
Meta: map[string]string{
"schema_version": "3",
},
}

if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual)
t.Fatalf("expected:\n%#v\n\ngot:\n%#v", expected, actual)
}
}

Expand Down