BASIS/terraform-provider-decort
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 62 Wiki Activity

Merge branch 'rc-1.25' into 1.26

Browse Source
This commit is contained in:
kjubybot
2022-02-07 12:14:31 +03:00
parent fef6040cc6 1bf17c23c8
commit 06c0578fa6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
decort/resource_pfw.go
View File

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

3
decort/utility_pfw.go
View File

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