Skip to content

Ref kafka #21

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 huaweicloud/resource_huaweicloud_bcs_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ func resourceBCSInstanceV2Delete(d *schema.ResourceData, meta interface{}) error
stateConf := &resource.StateChangeConf{
Pending: []string{"DELETING", "RUNNING"},
Target: []string{"DELETED"},
Refresh: dms.DmsKafkaInstanceStateRefreshFunc(dmsClient, kafkaID),
Refresh: dms.KafkaInstanceStateRefreshFunc(dmsClient, kafkaID),
Timeout: d.Timeout(schema.TimeoutDelete),
Delay: 10 * time.Second,
MinTimeout: 3 * time.Second,
Expand Down
1 change: 1 addition & 0 deletions huaweicloud/resource_huaweicloud_bcs_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/chnsz/golangsdk"
"github.com/chnsz/golangsdk/openstack/bcs/v2/blockchains"

"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/config"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestAccKafkaInstancesDataSource_basic(t *testing.T) {
dc3 := acceptance.InitDataSourceCheck("data.huaweicloud_dms_kafka_instances.query_3")
dc4 := acceptance.InitDataSourceCheck("data.huaweicloud_dms_kafka_instances.query_4")

resource.Test(t, resource.TestCase{
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.TestAccPreCheck(t) },
ProviderFactories: acceptance.TestAccProviderFactories,
Steps: []resource.TestStep{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ func TestAccKafkaInstance_newFormat(t *testing.T) {
),
},
{
// todo: flavor_id argument does not support changes(#2675)
Config: testAccKafkaInstance_newFormatUpdate(rName),
Check: resource.ComposeTestCheckFunc(
rc.CheckResourceExists(),
Expand All @@ -177,7 +178,7 @@ func TestAccKafkaInstance_newFormat(t *testing.T) {
resource.TestCheckResourceAttrPair(resourceName, "flavor_id",
"data.huaweicloud_dms_kafka_flavors.test", "flavors.0.id"),
resource.TestCheckResourceAttrPair(resourceName, "storage_spec_code",
"data.huaweicloud_dms_kafka_flavors.test", "flavors.0.ios.1.storage_spec_code"),
"data.huaweicloud_dms_kafka_flavors.test", "flavors.0.ios.0.storage_spec_code"),
resource.TestCheckResourceAttr(resourceName, "cross_vpc_accesses.0.advertised_ip", "172.16.35.62"),
resource.TestCheckResourceAttr(resourceName, "cross_vpc_accesses.1.advertised_ip", "www.terraform-test-1.com"),
resource.TestCheckResourceAttr(resourceName, "cross_vpc_accesses.2.advertised_ip", "192.168.0.53"),
Expand Down Expand Up @@ -431,10 +432,10 @@ resource "huaweicloud_dms_kafka_instance" "test" {
security_group_id = huaweicloud_networking_secgroup.test.id

flavor_id = local.query_results.flavors[0].id
storage_spec_code = local.query_results.flavors[0].ios[1].storage_spec_code
storage_spec_code = local.query_results.flavors[0].ios[0].storage_spec_code
availability_zones = local.query_results.flavors[0].ios[0].availability_zones
engine_version = element(local.query_results.versions, length(local.query_results.versions)-1)
storage_space = local.query_results.flavors[0].properties[0].min_broker * local.query_results.flavors[0].properties[0].max_storage_per_node
storage_space = local.query_results.flavors[0].properties[0].min_broker * local.query_results.flavors[0].properties[0].min_storage_per_node
broker_num = local.query_results.flavors[0].properties[0].min_broker

access_user = "user"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func flattenKafkaInstanceList(client *golangsdk.ServiceClient, conf *config.Conf
instance["public_conn_addresses"] = strings.TrimSpace(val.PublicConnectionAddress)
}

crossVpcAccess, err := flattenConnectPorts(val.CrossVpcInfo)
crossVpcAccess, err := flattenCrossVpcInfo(val.CrossVpcInfo)
if err != nil {
return nil, nil, fmt.Errorf("error retrieving details of the cross-VPC information: %v", err)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

"github.com/chnsz/golangsdk"

"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/common"
"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/config"
"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/utils"
Expand Down Expand Up @@ -340,7 +341,7 @@ func flattenGetRocketmqInstancesResponseBodyInstanceRef(resp interface{}, config
crossVpcInfo := utils.PathSearch("cross_vpc_info", v, nil)
var crossVpcAccess []map[string]interface{}
if crossVpcInfo != nil {
crossVpcAccess, err = flattenConnectPorts(crossVpcInfo.(string))
crossVpcAccess, err = flattenCrossVpcInfo(crossVpcInfo.(string))
if err != nil {
return nil, err
}
Expand Down
Loading