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

4.4.0-static-route-updated

Browse Source
This commit is contained in:
Nikita Sorokin
2023-10-09 13:15:11 +03:00
parent b705ce4aab
commit 6fed92396d
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/service/cloudapi/vins/resource_static_route.go
View File

@@ -34,6 +34,7 @@ package vins
import ( import (
"context" "context"
"fmt"
"strconv" "strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
@@ -43,7 +44,6 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
log "github.com/sirupsen/logrus"
) )
func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -90,8 +90,7 @@ func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m in
return diag.FromErr(err) return diag.FromErr(err)
} }
d.SetId(strconv.FormatUint(staticRouteData.ID, 10)) d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
log.Debugf("TRY TO SET STATE ID %v", staticRouteData.ID)
return resourceStaticRouteRead(ctx, d, m) return resourceStaticRouteRead(ctx, d, m)
} }
@@ -179,8 +178,8 @@ func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m in
} }
} }
} }
defer resourceVinsRead(ctx, d, m)
return warnings.Get() return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
} }
func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

17
internal/service/cloudapi/vins/utility_static_route.go
View File

@@ -36,6 +36,7 @@ import (
"context" "context"
"fmt" "fmt"
"strconv" "strconv"
"strings"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
@@ -47,8 +48,20 @@ import (
func utilityDataStaticRouteCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*vins.ItemRoutes, error) { func utilityDataStaticRouteCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*vins.ItemRoutes, error) {
c := m.(*controller.ControllerCfg) c := m.(*controller.ControllerCfg)
req := vins.StaticRouteListRequest{} req := vins.StaticRouteListRequest{}
var routeId uint64
req.VINSID = uint64(d.Get("vins_id").(int)) if d.Id() != "" {
arr := strings.Split(d.Id(), "#")
if len(arr) != 2 {
return nil, fmt.Errorf("broken state id")
}
req.VINSID, _ = strconv.ParseUint(arr[0], 10, 64)
routeId, _ = strconv.ParseUint(arr[1], 10, 64)
} else {
req.VINSID = uint64(d.Get("vins_id").(int))
routeId = uint64(d.Get("route_id").(int))
}
log.Debugf("utilityStaticRouteCheckPresence, vins_id: %v", req.VINSID) log.Debugf("utilityStaticRouteCheckPresence, vins_id: %v", req.VINSID)
staticRouteList, err := c.CloudAPI().VINS().StaticRouteList(ctx, req) staticRouteList, err := c.CloudAPI().VINS().StaticRouteList(ctx, req)
@@ -56,8 +69,6 @@ func utilityDataStaticRouteCheckPresence(ctx context.Context, d *schema.Resource
return nil, err return nil, err
} }
routeId, _ := strconv.ParseUint(d.Id(), 10, 64)
log.Debugf("utilityStaticRouteCheckPresence: ROUTE ID %v", routeId) log.Debugf("utilityStaticRouteCheckPresence: ROUTE ID %v", routeId)
staticRoute := &vins.ItemRoutes{} staticRoute := &vins.ItemRoutes{}