Skip to content
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

resource/alicloud_vpc_bgp_peer: add new attribute bgp_peer_name. #7281

Merged
merged 1 commit into from
May 31, 2024
Merged

resource/alicloud_vpc_bgp_peer: add new attribute bgp_peer_name. #7281

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 alicloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_alidns_access_strategy": resourceAlicloudAlidnsAccessStrategy(),
"alicloud_alidns_monitor_config": resourceAlicloudAlidnsMonitorConfig(),
"alicloud_vpc_dhcp_options_set_attachment": resourceAlicloudVpcDhcpOptionsSetAttachement(),
"alicloud_vpc_bgp_peer": resourceAlicloudVpcBgpPeer(),
"alicloud_vpc_bgp_peer": resourceAliCloudExpressConnectBgpPeer(),
"alicloud_nas_fileset": resourceAlicloudNasFileset(),
"alicloud_nas_auto_snapshot_policy": resourceAliCloudNasAutoSnapshotPolicy(),
"alicloud_nas_lifecycle_policy": resourceAlicloudNasLifecyclePolicy(),
Expand Down
179 changes: 104 additions & 75 deletions alicloud/resource_alicloud_vpc_bgp_peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Package alicloud. This file is generated automatically. Please do not modify it manually, thank you!
package alicloud

import (
Expand All @@ -9,28 +10,27 @@ import (
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
)

func resourceAlicloudVpcBgpPeer() *schema.Resource {
func resourceAliCloudExpressConnectBgpPeer() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudVpcBgpPeerCreate,
Read: resourceAlicloudVpcBgpPeerRead,
Update: resourceAlicloudVpcBgpPeerUpdate,
Delete: resourceAlicloudVpcBgpPeerDelete,
Create: resourceAliCloudExpressConnectBgpPeerCreate,
Read: resourceAliCloudExpressConnectBgpPeerRead,
Update: resourceAliCloudExpressConnectBgpPeerUpdate,
Delete: resourceAliCloudExpressConnectBgpPeerDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
Update: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"bfd_multi_hop": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validation.IntBetween(1, 255),
ValidateFunc: IntBetween(1, 255),
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
if v, ok := d.GetOk("enable_bfd"); ok && fmt.Sprint(v) == "true" {
return false
Expand All @@ -43,6 +43,10 @@ func resourceAlicloudVpcBgpPeer() *schema.Resource {
ForceNew: true,
Required: true,
},
"bgp_peer_name": {
Type: schema.TypeString,
Computed: true,
},
"enable_bfd": {
Type: schema.TypeBool,
Optional: true,
Expand All @@ -65,173 +69,198 @@ func resourceAlicloudVpcBgpPeer() *schema.Resource {
}
}

func resourceAlicloudVpcBgpPeerCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudExpressConnectBgpPeerCreate(d *schema.ResourceData, meta interface{}) error {

client := meta.(*connectivity.AliyunClient)
var response map[string]interface{}

action := "CreateBgpPeer"
request := make(map[string]interface{})
conn, err := client.NewVpcClient()
var request map[string]interface{}
var response map[string]interface{}
query := make(map[string]interface{})
conn, err := client.NewExpressconnectClient()
if err != nil {
return WrapError(err)
}
if v, ok := d.GetOk("bfd_multi_hop"); ok {
request["BfdMultiHop"] = v
}
request = make(map[string]interface{})
request["RegionId"] = client.RegionId
request["ClientToken"] = buildClientToken(action)

request["BgpGroupId"] = d.Get("bgp_group_id")
if v, ok := d.GetOk("peer_ip_address"); ok {
request["PeerIpAddress"] = v
}
if v, ok := d.GetOkExists("enable_bfd"); ok {
request["EnableBfd"] = v
}
if v, ok := d.GetOk("ip_version"); ok {
request["IpVersion"] = v
}
if v, ok := d.GetOk("peer_ip_address"); ok {
request["PeerIpAddress"] = v
if v, ok := d.GetOk("bfd_multi_hop"); ok {
request["BfdMultiHop"] = v
}
request["RegionId"] = client.RegionId
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
request["ClientToken"] = buildClientToken("CreateBgpPeer")
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime)
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), query, request, &runtime)
if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, "alicloud_vpc_bgp_peer", action, AlibabaCloudSdkGoERROR)
}

d.SetId(fmt.Sprint(response["BgpPeerId"]))
vpcService := VpcService{client}
stateConf := BuildStateConf([]string{}, []string{"Available"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, vpcService.VpcBgpPeerStateRefreshFunc(d.Id(), []string{}))

expressConnectServiceV2 := ExpressConnectServiceV2{client}
stateConf := BuildStateConf([]string{}, []string{"Available"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, expressConnectServiceV2.ExpressConnectBgpPeerStateRefreshFunc(d.Id(), "Status", []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}

return resourceAlicloudVpcBgpPeerRead(d, meta)
return resourceAliCloudExpressConnectBgpPeerRead(d, meta)
}
func resourceAlicloudVpcBgpPeerRead(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudExpressConnectBgpPeerRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
vpcService := VpcService{client}
object, err := vpcService.DescribeVpcBgpPeer(d.Id())
expressConnectServiceV2 := ExpressConnectServiceV2{client}

objectRaw, err := expressConnectServiceV2.DescribeExpressConnectBgpPeer(d.Id())
if err != nil {
if NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_vpc_bgp_peer vpcService.DescribeVpcBgpPeer Failed!!! %s", err)
if !d.IsNewResource() && NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_vpc_bgp_peer DescribeExpressConnectBgpPeer Failed!!! %s", err)
d.SetId("")
return nil
}
return WrapError(err)
}
if v, ok := object["BfdMultiHop"]; ok && fmt.Sprint(v) != "0" {

if v, ok := objectRaw["BfdMultiHop"]; ok && fmt.Sprint(v) != "0" {
d.Set("bfd_multi_hop", formatInt(v))
}
d.Set("bgp_group_id", object["BgpGroupId"])
d.Set("enable_bfd", object["EnableBfd"])
d.Set("ip_version", object["IpVersion"])
d.Set("peer_ip_address", object["PeerIpAddress"])
d.Set("status", object["Status"])
d.Set("bgp_group_id", objectRaw["BgpGroupId"])
d.Set("bgp_peer_name", objectRaw["Name"])
d.Set("enable_bfd", objectRaw["EnableBfd"])
d.Set("ip_version", objectRaw["IpVersion"])
d.Set("peer_ip_address", objectRaw["PeerIpAddress"])
d.Set("status", objectRaw["Status"])

return nil
}
func resourceAlicloudVpcBgpPeerUpdate(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudExpressConnectBgpPeerUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
vpcService := VpcService{client}
var request map[string]interface{}
var response map[string]interface{}
var query map[string]interface{}
update := false
request := map[string]interface{}{
"BgpPeerId": d.Id(),
action := "ModifyBgpPeerAttribute"
conn, err := client.NewExpressconnectClient()
if err != nil {
return WrapError(err)
}
request = make(map[string]interface{})
query = make(map[string]interface{})
query["BgpPeerId"] = d.Id()
request["RegionId"] = client.RegionId
if d.HasChange("bfd_multi_hop") {
request["ClientToken"] = buildClientToken(action)
if d.HasChange("bgp_group_id") {
update = true
if v, ok := d.GetOk("bfd_multi_hop"); ok {
request["BfdMultiHop"] = v
}
}
request["BgpGroupId"] = d.Get("bgp_group_id")
if d.HasChange("peer_ip_address") {
update = true
request["PeerIpAddress"] = d.Get("peer_ip_address")
}

if d.HasChange("enable_bfd") {
update = true
if v, ok := d.GetOkExists("enable_bfd"); ok {
request["EnableBfd"] = v
}
request["EnableBfd"] = d.Get("enable_bfd")
}
if d.HasChange("peer_ip_address") {

if d.HasChange("bfd_multi_hop") {
update = true
if v, ok := d.GetOk("peer_ip_address"); ok {
request["PeerIpAddress"] = v
}
request["BfdMultiHop"] = d.Get("bfd_multi_hop")
}

if update {
action := "ModifyBgpPeerAttribute"
conn, err := client.NewVpcClient()
if err != nil {
return WrapError(err)
}
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
request["ClientToken"] = buildClientToken("ModifyBgpPeerAttribute")
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime)
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), query, request, &runtime)
if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)
if err != nil {
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}
stateConf := BuildStateConf([]string{}, []string{"Available"}, d.Timeout(schema.TimeoutUpdate), 5*time.Second, vpcService.VpcBgpPeerStateRefreshFunc(d.Id(), []string{}))
expressConnectServiceV2 := ExpressConnectServiceV2{client}
stateConf := BuildStateConf([]string{}, []string{"Available"}, d.Timeout(schema.TimeoutUpdate), 5*time.Second, expressConnectServiceV2.ExpressConnectBgpPeerStateRefreshFunc(d.Id(), "Status", []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}
}
return resourceAlicloudVpcBgpPeerRead(d, meta)

return resourceAliCloudExpressConnectBgpPeerRead(d, meta)
}
func resourceAlicloudVpcBgpPeerDelete(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudExpressConnectBgpPeerDelete(d *schema.ResourceData, meta interface{}) error {

client := meta.(*connectivity.AliyunClient)
vpcService := VpcService{client}
action := "DeleteBgpPeer"
var request map[string]interface{}
var response map[string]interface{}
conn, err := client.NewVpcClient()
query := make(map[string]interface{})
conn, err := client.NewExpressconnectClient()
if err != nil {
return WrapError(err)
}
request := map[string]interface{}{
"BgpPeerId": d.Id(),
}

request = make(map[string]interface{})
query["BgpPeerId"] = d.Id()
request["RegionId"] = client.RegionId

request["ClientToken"] = buildClientToken(action)

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
request["ClientToken"] = buildClientToken("DeleteBgpPeer")
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime)
if err != nil {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), query, request, &runtime)
request["ClientToken"] = buildClientToken(action)

if err != nil || IsExpectedErrors(err, []string{"DependencyViolation.BgpPeer"}) {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}
stateConf := BuildStateConf([]string{}, []string{}, d.Timeout(schema.TimeoutDelete), 5*time.Second, vpcService.VpcBgpPeerStateRefreshFunc(d.Id(), []string{}))

expressConnectServiceV2 := ExpressConnectServiceV2{client}
stateConf := BuildStateConf([]string{}, []string{}, d.Timeout(schema.TimeoutDelete), 5*time.Second, expressConnectServiceV2.ExpressConnectBgpPeerStateRefreshFunc(d.Id(), "Status", []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}
Expand Down
13 changes: 11 additions & 2 deletions alicloud/resource_alicloud_vpc_bgp_peer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)

func TestAccAlicloudVPCBgpPeer_basic0(t *testing.T) {
func TestAccAliCloudVPCBgpPeer_basic0(t *testing.T) {
checkoutSupportedRegions(t, true, connectivity.VbrSupportRegions)
var v map[string]interface{}
resourceId := "alicloud_vpc_bgp_peer.default"
Expand Down Expand Up @@ -73,7 +73,7 @@ func TestAccAlicloudVPCBgpPeer_basic0(t *testing.T) {
},
})
}
func TestAccAlicloudVPCBgpPeer_basic1(t *testing.T) {
func TestAccAliCloudVPCBgpPeer_basic1(t *testing.T) {
checkoutSupportedRegions(t, true, connectivity.VbrSupportRegions)
var v map[string]interface{}
resourceId := "alicloud_vpc_bgp_peer.default"
Expand Down Expand Up @@ -156,5 +156,14 @@ resource "alicloud_vpc_bgp_group" "default" {
peer_asn = 1111
router_id = alicloud_express_connect_virtual_border_router.default.id
}

resource "alicloud_vpc_bgp_group" "default1" {
auth_key = "YourPassword+12345678"
bgp_group_name = var.name
description = var.name
local_asn = 64513
peer_asn = 1112
router_id = alicloud_express_connect_virtual_border_router.default.id
}
`, name, acctest.RandIntRange(1, 2999))
}
Loading
Loading