Merge branch 'rc-1.25' into 1.26

decort/resource_pfw.go

@@ -25,6 +25,7 @@ Visit https://github.com/rudecs/terraform-provider-decort for full source code p
 package decort
 
 import (
+	"fmt"
 	"net/url"
 	"strconv"
 
@@ -52,7 +53,7 @@ func resourcePfwCreate(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
-	d.SetId(pfwId)
+	d.SetId(fmt.Sprintf("%d-%s", d.Get("compute_id").(int), pfwId))
 
 	pfw, err := utilityPfwCheckPresence(d, m)
 	if err != nil {

decort/utility_pfw.go

@@ -28,6 +28,7 @@ import (
 	"encoding/json"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
@@ -46,7 +47,7 @@ func utilityPfwCheckPresence(d *schema.ResourceData, m interface{}) (*PfwRecord,
 		return nil, nil
 	}
 
-	idS := d.Id()
+	idS := strings.Split(d.Id(), "-")[1]
 	id, err := strconv.Atoi(idS)
 	if err != nil {
 		return nil, err