Skip to content

Commit ce3afb0

Browse files
committed
Set "manage_default_resource_id" during import of default resources
This fixes an issue where importing a default resource will leave the manage_default_resource_id empty in the state file. Any change in the TF config would force an unwanted delete/recreate. Fix this by setting the manage_default_resource_id on import.
1 parent f6496f1 commit ce3afb0

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

crud/helpers.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,3 +338,8 @@ func FilterMissingResourceError(sync ResourceVoider, err *error) {
338338
func EqualIgnoreCaseSuppressDiff(key string, old string, new string, d *schema.ResourceData) bool {
339339
return strings.EqualFold(old, new)
340340
}
341+
342+
func ImportDefaultResource(d *schema.ResourceData, value interface{}) ([]*schema.ResourceData, error) {
343+
err := d.Set("manage_default_resource_id", d.Id())
344+
return []*schema.ResourceData{d}, err
345+
}

provider/core_dhcp_options_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func DefaultDHCPOptionsResource() *schema.Resource {
1313
return &schema.Resource{
1414
Importer: &schema.ResourceImporter{
15-
State: schema.ImportStatePassthrough,
15+
State: crud.ImportDefaultResource,
1616
},
1717
Timeouts: crud.DefaultTimeout,
1818
Create: createDHCPOptions,

provider/core_route_table_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
func DefaultRouteTableResource() *schema.Resource {
1616
return &schema.Resource{
1717
Importer: &schema.ResourceImporter{
18-
State: schema.ImportStatePassthrough,
18+
State: crud.ImportDefaultResource,
1919
},
2020
Timeouts: crud.DefaultTimeout,
2121
Create: createRouteTable,

provider/core_security_list_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var icmpSchema = &schema.Schema{
6666
func DefaultSecurityListResource() *schema.Resource {
6767
return &schema.Resource{
6868
Importer: &schema.ResourceImporter{
69-
State: schema.ImportStatePassthrough,
69+
State: crud.ImportDefaultResource,
7070
},
7171
Timeouts: crud.DefaultTimeout,
7272
Create: createSecurityList,

0 commit comments

Comments
 (0)