From b288a0b96bf291dc7ac0e02b350ce2cbfac0a548 Mon Sep 17 00:00:00 2001 From: BenBeng Date: Fri, 4 Aug 2023 12:01:05 +0800 Subject: [PATCH] resource/baiducloud_peer_conn_acceptor: Fix error when creating cross-account or cross-region resources. --- CHANGELOG.md | 8 ++++++-- baiducloud/connectivity/client.go | 2 +- baiducloud/resource_baiducloud_peer_conn_acceptor.go | 2 +- .../resource_baiducloud_peer_conn_acceptor_test.go | 9 +++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c6dba94..96d4773a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ - ## 1.19.10 (Unreleased) + ## 1.19.11 (Unreleased) + +## 1.19.10 (August 4, 2023) +BUG FIXES: +- resource/baiducloud_peer_conn_acceptor: Fix error when creating cross-account or cross-region resources. ## 1.19.9 (July 12, 2023) ENHANCEMENTS: @@ -14,7 +18,7 @@ ENHANCEMENTS: - resource/baiducloud_instance: Add parameter `hostname`, support modification. - datasource/baiducloud_instance: Add parameters `keypair_id`, `auto_renew`, `instance_ids`, `instance_names`, `cds_ids`, `deploy_set_ids`, `security_group_ids`, `payment_timing`, `status`, `tags`, `vpc_id`, `private_ips`. - +p ## 1.19.6 (April 04, 2023) NOTES: - Add parameter disk_io_type for rds instance diff --git a/baiducloud/connectivity/client.go b/baiducloud/connectivity/client.go index 39fd583a..6a0bc3bd 100644 --- a/baiducloud/connectivity/client.go +++ b/baiducloud/connectivity/client.go @@ -71,7 +71,7 @@ type ApiVersion string var goSdkMutex = sync.RWMutex{} // The Go SDK is not thread-safe -var providerVersion = "1.19.9" +var providerVersion = "1.19.10" // Client for BaiduCloudClient func (c *Config) Client() (*BaiduClient, error) { diff --git a/baiducloud/resource_baiducloud_peer_conn_acceptor.go b/baiducloud/resource_baiducloud_peer_conn_acceptor.go index 48f5e769..9f90c837 100644 --- a/baiducloud/resource_baiducloud_peer_conn_acceptor.go +++ b/baiducloud/resource_baiducloud_peer_conn_acceptor.go @@ -266,7 +266,7 @@ func resourceBaiduCloudPeerConnAcceptorUpdate(d *schema.ResourceData, meta inter d.Partial(false) - return resourceBaiduCloudPeerConnRead(d, meta) + return resourceBaiduCloudPeerConnAcceptorRead(d, meta) } func resourceBaiduCloudPeerConnAcceptorDelete(d *schema.ResourceData, meta interface{}) error { diff --git a/baiducloud/resource_baiducloud_peer_conn_acceptor_test.go b/baiducloud/resource_baiducloud_peer_conn_acceptor_test.go index 21eb5701..b8cf4546 100644 --- a/baiducloud/resource_baiducloud_peer_conn_acceptor_test.go +++ b/baiducloud/resource_baiducloud_peer_conn_acceptor_test.go @@ -26,8 +26,8 @@ func TestAccBaiduCloudPeerConnAcceptor(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBaiduCloudDataSourceId(testAccPeerConnAcceptorResourceName), resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "bandwidth_in_mbps", "20"), - resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "description", "created by terraform"), - resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "local_if_name", "local-interface"), + resource.TestCheckResourceAttr(testAccPeerConnResourceName, "description", "created by terraform"), + resource.TestCheckResourceAttr(testAccPeerConnResourceName, "local_if_name", "local-interface"), resource.TestCheckResourceAttrSet(testAccPeerConnResourceName, "local_if_id"), resource.TestCheckResourceAttrSet(testAccPeerConnAcceptorResourceName, "local_vpc_id"), resource.TestCheckResourceAttrSet(testAccPeerConnAcceptorResourceName, "peer_vpc_id"), @@ -48,8 +48,8 @@ func TestAccBaiduCloudPeerConnAcceptor(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBaiduCloudDataSourceId(testAccPeerConnAcceptorResourceName), resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "bandwidth_in_mbps", "20"), - resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "description", "created by terraform"), - resource.TestCheckResourceAttr(testAccPeerConnAcceptorResourceName, "local_if_name", "local-interface"), + resource.TestCheckResourceAttr(testAccPeerConnResourceName, "description", "created by terraform"), + resource.TestCheckResourceAttr(testAccPeerConnResourceName, "local_if_name", "local-interface"), resource.TestCheckResourceAttrSet(testAccPeerConnResourceName, "local_if_id"), resource.TestCheckResourceAttrSet(testAccPeerConnAcceptorResourceName, "local_vpc_id"), resource.TestCheckResourceAttrSet(testAccPeerConnAcceptorResourceName, "peer_vpc_id"), @@ -116,6 +116,7 @@ resource "baiducloud_peer_conn" "default" { peer_region = "bj" description = "created by terraform" local_if_name = "local-interface" + dns_sync = true billing = { payment_timing = "Postpaid" }