[Feature Request] New bcs instance resource supported #1064

Lance52259 · 2021-04-14T12:18:16Z

What this PR does / why we need it:
New BCS instance resource supported:

bcs instance create:
- two fabric version (1.4 and 2.0)
- three service edition (basic, professional and enterprise)
- four consensus algorithm (solo, kafka, SFLIC and etcdraft)
- two sign algorithm (ECDSA and SM2)
- two volume type (nfs and efs)
- two database type (goleveldb and couchdb)
bcs instance read (state):
- basic info
- channel info
- peer organization info
- couchdb info
- kafka info

TODO:

create and bind new channels and peer organizations
invitor infos
prepaid
evs supported (SATA, SAS, SSD)

Which issue this PR fixes:
(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)
fixes #1023

Special notes for your reviewer:

Release note:

1. new bcs instance resource and acc test.
2. new bcs instance document.

PR Checklist

Tests added/passed.
Documentation updated.
Schema updated.

Acceptance Steps Performed

BCS client test

make testacc TEST='./huaweicloud' TESTARGS='-run=TestAccServiceEndpoints_Application'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run=TestAccServiceEndpoints_Application -timeout 360m -parallel 4
=== RUN   TestAccServiceEndpoints_Application
--- PASS: TestAccServiceEndpoints_Application (1.56s)
PASS
ok      github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud       1.603s

Basic test

make testacc TEST='./huaweicloud' TESTARGS='-run=TestAccBCSV2Instance_basic'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run=TestAccBCSV2Instance_basic -timeout 360m -parallel 4
=== RUN   TestAccBCSV2Instance_basic
=== PAUSE TestAccBCSV2Instance_basic
=== CONT  TestAccBCSV2Instance_basic
--- PASS: TestAccBCSV2Instance_basic (1184.98s)
PASS
ok      github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud       1185.043s

Kafka consensus

make testacc TEST='./huaweicloud' TESTARGS='-run=TestAccBCSV2Instance_kafka'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run=TestAccBCSV2Instance_kafka -timeout 360m -parallel 4
=== RUN   TestAccBCSV2Instance_kafka
=== PAUSE TestAccBCSV2Instance_kafka
=== CONT  TestAccBCSV2Instance_kafka
--- PASS: TestAccBCSV2Instance_kafka (2539.99s)
PASS
ok      github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud       2540.048s

huaweicloud/config/endpoints.go

ShiChangkuo · 2021-04-17T09:49:51Z

docs/resources/bcs_instance.md

+```hcl
+data "huaweicloud_availability_zones" "test" {}
+
+resource "huaweicloud_cce_cluster" "test" {


suggest to use data source

This example now uses data source to support the cluster info.

ShiChangkuo · 2021-04-17T09:51:01Z

docs/resources/bcs_instance.md

+resource "huaweicloud_bcs_instance" "test" {
+  depends_on = [huaweicloud_cce_node.test]
+
+  name                  = {Resource_Name}


suggest to use var.instance_name

Has been updated as a variable

ShiChangkuo · 2021-04-17T09:57:39Z

docs/resources/bcs_instance.md

+* `cluster_type` - (Required, String, ForceNew) Specifies the type of the cluster.
+  Valid value is `cce`. Changing this will create a new instance.


if this parameter only supports cce, we can omit it or set it defaults to cce.

cluster_type has been removed and always set with cce.

ShiChangkuo · 2021-04-17T09:59:33Z

docs/resources/bcs_instance.md

+  Changing this will create a new instance.
+
+* `orderer_node_num` - (Required, Int, ForceNew) Specifies the number of peers in the orderer organizaion.
+  Refer to Table 1 for the configuration of the `orderer_node_num`.


where can I get the link if Table 1?

The description has been updated and use link to point the table.

ShiChangkuo · 2021-04-17T10:20:24Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+		Target:       []string{"Normal"},
+		Refresh:      blockchainStateRefreshFunc(client, instanceID),
+		Timeout:      d.Timeout(schema.TimeoutCreate),
+		Delay:        15 * time.Second,


shall we wait for more time?

According to the creation time of the basic version (The simplest configuration of instance creation time: 2m50s±20s), it is now set to 150s.

ShiChangkuo · 2021-04-17T10:22:27Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+						"name": {
+							Type:     schema.TypeString,
+							Required: true,
+							ForceNew: true,
+						},


can we get the cce cluster name by id?

the cluster_info struct is updated to cluster_id parameter.

ShiChangkuo · 2021-04-17T10:24:04Z

huaweicloud/resource_huaweicloud_bcs_instance.go

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


the function can be deleted

Related notes added.

ShiChangkuo · 2021-04-17T10:29:41Z

huaweicloud/resource_huaweicloud_bcs_instance_test.go

+)
+
+//Huawei@123
+const salt_password string = "JDYkcGxkUm9uUE55UTEweGRCUyRxbWFDRFluTFhPVjNCakVraGc5YUdhUTBxeWFocmNDbzZ4YS9rVWkyYVB2S" +


hard coding is not recommended, can we use key_pair?

It's updated

ShiChangkuo · 2021-04-17T10:31:32Z

huaweicloud/resource_huaweicloud_bcs_instance_test.go

+  fabric_version        = "1.4"
+  blockchain_type       = "private"
+  enterprise_project_id = "%s"
+  password              = "Huawei@123"


can we using random_password?

I see that the acc test does not support random providers, the message is:

- Could not satisfy plugin requirements: Plugin reinitialization required. Please run "terraform init". Plugins are external binaries that Terraform uses to access and manipulate resources. The configuration provided requires plugins which can't be located, don't satisfy the version constraints, or are otherwise incompatible. Terraform automatically discovers provider requirements from your configuration, including providers used in child modules. To see the requirements and constraints from each module, run "terraform providers". - provider "random" is not available

The configuration of random password is :

resource "random_password" "instance_password" { length = 12 special = true min_lower = 1 min_upper = 1 override_special = "!@$%%^-_=+[{}]:,./?" }

Jason-Zhang9309 · 2021-04-19T02:08:48Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+	return &schema.Resource{
+		Create: resourceBCSInstanceV2Create,
+		Read:   resourceBCSInstanceV2Read,
+		Update: resourceBCSInstanceV2Update,


Since there is nothing to do in update func, this line is unnecessary

This function is used to update delete_obs and delete_storage, and the related notes added.

Jason-Zhang9309 · 2021-04-19T02:17:22Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:     schema.TypeString,
+							Required: true,


The type of 'channels' is list, so change the param 'name' won't cause forcenew. Is this your intention

thanks, forceNew is added

ShiChangkuo · 2021-04-21T09:08:36Z

docs/resources/bcs_instance.md

+
+* `edition` - (Required, Int, ForceNew) Specifies Service edition of the BCS instance.
+  Valid values are `1`, `2` and `4`.
+  For the specifications corresponding to these three versions, please refer to the [specification table](#jump).


does this can jump to the specification table?

sure, it can jump to the specification table (I mark it with jump) at the end of Argument Reference.

ShiChangkuo · 2021-04-21T09:10:49Z

docs/resources/bcs_instance.md

+  Changing this will create a new instance.
+
+* `orderer_node_num` - (Required, Int, ForceNew) Specifies the number of peers in the orderer organizaion.
+  For the number of orderer nodes, please refer to the [specification table](#jump).


Is the specification table shown the max number of orderer nodes?

ShiChangkuo · 2021-04-21T09:11:32Z

docs/resources/bcs_instance.md

+  For the number of orderer nodes, please refer to the [specification table](#jump).
+  Changing this will create a new instance.
+
+* `cluster_id` - (Required, String, ForceNew) Specifies the ID of the CCE cluster to attach to the BCS instance.


suggest to named as cce_cluster_id

ShiChangkuo · 2021-04-21T09:21:50Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+				Computed: true,
+				ForceNew: true,
+			},
+			"eip_enable": {


in schema the default value of eip_enable is false, but it is defaults to true in docs.

ShiChangkuo · 2021-04-21T09:30:56Z

docs/resources/bcs_instance.md

+* `type` - (Optional, String, ForceNew) Specifies the type of SFS turbo.
+  Changing this creates a new instance.
+
+The `block_info` block supports:


should add the description of block_info

ShiChangkuo · 2021-04-21T09:36:07Z

huaweicloud/resource_huaweicloud_bcs_instance.go

+}
+
+func resourceBCSInstanceV2Create(d *schema.ResourceData, meta interface{}) error {
+	var FALSE bool = false


s/FALSE/newCluster/g

Lance52259 requested a review from Jason-Zhang9309 April 17, 2021 06:33

ShiChangkuo suggested changes Apr 17, 2021

View reviewed changes

Jason-Zhang9309 reviewed Apr 19, 2021

View reviewed changes

feat: new bcs instance resource supported

b418c50

ShiChangkuo reviewed Apr 21, 2021

View reviewed changes

bcs instance resource modification

934416d

ShiChangkuo approved these changes Apr 22, 2021

View reviewed changes

ShiChangkuo merged commit 7280621 into huaweicloud:master Apr 22, 2021

Lance52259 deleted the br_bcs_instance_active branch May 11, 2021 07:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature Request] New bcs instance resource supported #1064

[Feature Request] New bcs instance resource supported #1064

Lance52259 commented Apr 14, 2021 •

edited

Loading

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021 •

edited

Loading

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021 •

edited

Loading

ShiChangkuo Apr 17, 2021

Lance52259 Apr 21, 2021

Lance52259 Apr 21, 2021

Jason-Zhang9309 Apr 19, 2021

Lance52259 Apr 21, 2021

Jason-Zhang9309 Apr 19, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 21, 2021

Lance52259 Apr 21, 2021

ShiChangkuo Apr 21, 2021

ShiChangkuo Apr 21, 2021

ShiChangkuo Apr 21, 2021

ShiChangkuo Apr 21, 2021

ShiChangkuo Apr 21, 2021

		* `cluster_type` - (Required, String, ForceNew) Specifies the type of the cluster.
		Valid value is `cce`. Changing this will create a new instance.

[Feature Request] New bcs instance resource supported #1064

[Feature Request] New bcs instance resource supported #1064

Conversation

Lance52259 commented Apr 14, 2021 • edited Loading

PR Checklist

Acceptance Steps Performed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lance52259 Apr 21, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lance52259 Apr 21, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lance52259 commented Apr 14, 2021 •

edited

Loading

Lance52259 Apr 21, 2021 •

edited

Loading

Lance52259 Apr 21, 2021 •

edited

Loading