Merge pull request #478 from brickzzhang/master

[new mongodb SDK and standby instance]

Author: Himer

CHANGELOG.md

@@ -1,9 +1,16 @@
-## 1.39.1 (Unreleased)
+## 1.40.0 (Unreleased)
+
+FEATURES:
+
+* **New Resource**: `tencentcloud_mongodb_standby_instance`
 
 ENHANCEMENTS:
 
 * Resource: `tencentcloud_gaap_http_rule` argument `realservers` now is optional.
 * Resource: `tencentcloud_kubernetes_cluster` supports multiple `availability_zone`.
+* Data Source: `tencentcloud_mongodb_instances` add new argument `charge_type` and `auto_renew_flag` to support prepaid type.
+* Resource: `tencentcloud_mongodb_instance` supports prepaid type, new mongodb SDK version `2019-07-25` and standby instance.
+* Resource: `tencentcloud_mongodb_sharding_instance` supports prepaid type, new mongodb SDK version `2019-07-25` and standby instance.
 
 
 ## 1.39.0 (July 18, 2020)

examples/tencentcloud-mongodb/main.tf

@@ -1,15 +1,24 @@
+provider "tencentcloud" {
+  region = "ap-guangzhou"
+}
+
+provider "tencentcloud" {
+  alias  = "shanghai"
+  region = "ap-shanghai"
+}
+
 resource "tencentcloud_mongodb_instance" "mongodb" {
   instance_name  = "tf-mongodb-test"
   memory         = 4
   volume         = 100
-  engine_version = "MONGO_36_WT"
-  machine_type   = "GIO"
+  engine_version = "MONGO_40_WT"
+  machine_type   = "HIO10G"
   available_zone = var.availability_zone
   project_id     = 0
   password       = "test1234"
 
   tags = {
-    "test" = "test"
+    test = "test"
   }
 }
 
@@ -26,14 +35,31 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb_sharding" {
   password        = "test1234"
 
   tags = {
-    "test" = "test"
+    test = "test"
   }
 }
 
 data "tencentcloud_mongodb_instances" "mongodb_instances" {
   instance_id = tencentcloud_mongodb_instance.mongodb.id
 
   tags = {
-    "test" = "test"
+    test = "test"
   }
 }
+
+resource "tencentcloud_mongodb_standby_instance" "mongodb" {
+  provider               = tencentcloud.shanghai
+  instance_name          = "tf-mongodb-standby-test"
+  memory                 = 4
+  volume                 = 100
+  available_zone         = "ap-shanghai-2"
+  project_id             = 0
+  father_instance_id     = tencentcloud_mongodb_instance.mongodb.id
+  father_instance_region = "ap-guangzhou"
+  charge_type            = "PREPAID"
+  prepaid_period         = 1
+
+  tags = {
+    test = "test"
+  }
+}

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible
+	github.com/tencentcloud/tencentcloud-sdk-go v3.0.217+incompatible
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -460,6 +460,10 @@ github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0K
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible h1:aKWXYPLQ9NARP0tBESEtTfRLes88LaI+4qm3TSRDCjk=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.215+incompatible h1:QsJWTxBNUjZjST5ehuyeaU/4YLQ3vwyTy6fI4LJ7pts=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.215+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.217+incompatible h1:c0N5XTxnRv3e6lgIEw3Ml0RdIV0fA8qDRuVEhQnDViE=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.217+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/connectivity/client.go

@@ -22,7 +22,7 @@ import (
 	dc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc/v20180410"
 	es "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416"
 	gaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529"
-	mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20180408"
+	mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20190725"
 	monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
 	postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"

tencentcloud/data_source_tc_mongodb_instances.go

@@ -152,6 +152,17 @@ func dataSourceTencentCloudMongodbInstances() *schema.Resource {
 							Computed:    true,
 							Description: "Tags of the Mongodb instance.",
 						},
+						// payment
+						"charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The charge type of instance.",
+						},
+						"auto_renew_flag": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Auto renew flag.",
+						},
 					},
 				},
 			},
@@ -241,11 +252,11 @@ instancesLoop:
 		}
 
 		switch *mongo.MachineType {
-		case "HIO10G":
-			*mongo.MachineType = MONGODB_MACHINE_TYPE_TGIO
+		case MONGODB_MACHINE_TYPE_TGIO:
+			*mongo.MachineType = MONGODB_MACHINE_TYPE_HIO10G
 
-		case "HIO":
-			*mongo.MachineType = MONGODB_MACHINE_TYPE_GIO
+		case MONGODB_MACHINE_TYPE_GIO:
+			*mongo.MachineType = MONGODB_MACHINE_TYPE_HIO
 		}
 
 		clusterType := MONGODB_CLUSTER_TYPE_REPLSET
@@ -272,6 +283,10 @@ instancesLoop:
 			"machine_type":   mongo.MachineType,
 			"shard_quantity": mongo.ReplicationSetNum,
 			"tags":           respTags,
+			"charge_type":    MONGODB_CHARGE_TYPE[*mongo.PayMode],
+		}
+		if MONGODB_CHARGE_TYPE[*mongo.PayMode] == MONGODB_CHARGE_TYPE_PREPAID {
+			_ = d.Set("auto_renew_flag", *mongo.AutoRenewFlag)
 		}
 		instanceList = append(instanceList, instance)
 		ids = append(ids, *mongo.InstanceId)

tencentcloud/data_source_tc_mongodb_instances_test.go

@@ -32,9 +32,10 @@ func TestAccTencentCloudMongodbInstancesDataSource(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.cpu"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.memory", "4"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.volume", "100"),
-					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.machine_type", "TGIO"),
+					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.machine_type", MONGODB_MACHINE_TYPE_HIO10G),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.shard_quantity"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.tags.test", "test"),
+					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.charge_type", "POSTPAID"),
 				),
 			},
 		},

tencentcloud/extension_mongodb.go

@@ -1,13 +1,20 @@
 package tencentcloud
 
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
 const (
 	MONGODB_INSTANCE_STATUS_INITIAL    = 0
 	MONGODB_INSTANCE_STATUS_PROCESSING = 1
 	MONGODB_INSTANCE_STATUS_RUNNING    = 2
+	MONGODB_INSTANCE_STATUS_EXPIRED    = -2
 
 	MONGODB_ENGINE_VERSION_3_WT    = "MONGO_3_WT"
 	MONGODB_ENGINE_VERSION_36_WT   = "MONGO_36_WT"
 	MONGODB_ENGINE_VERSION_3_ROCKS = "MONGO_3_ROCKS"
+	MONGODB_ENGINE_VERSION_4_WT    = "MONGO_40_WT"
 
 	MONGODB_MACHINE_TYPE_GIO    = "GIO"
 	MONGODB_MACHINE_TYPE_TGIO   = "TGIO"
@@ -16,20 +23,179 @@ const (
 
 	MONGODB_CLUSTER_TYPE_REPLSET = "REPLSET"
 	MONGODB_CLUSTER_TYPE_SHARD   = "SHARD"
+
+	MONGO_INSTANCE_TYPE_FORMAL   = 1
+	MONGO_INSTANCE_TYPE_READONLY = 3
+	MONGO_INSTANCE_TYPE_STANDBY  = 4
 )
 
-var MONGODB_ENGINE_VERSION = []string{
-	MONGODB_ENGINE_VERSION_3_WT,
-	MONGODB_ENGINE_VERSION_36_WT,
-	MONGODB_ENGINE_VERSION_3_ROCKS,
+var MONGODB_CLUSTER_TYPE = []string{
+	MONGODB_CLUSTER_TYPE_REPLSET,
+	MONGODB_CLUSTER_TYPE_SHARD,
 }
 
-var MONGODB_MACHINE_TYPE = []string{
-	MONGODB_MACHINE_TYPE_GIO,
-	MONGODB_MACHINE_TYPE_TGIO,
+const (
+	MONGODB_DEFAULT_LIMIT  = 20
+	MONGODB_MAX_LIMIT      = 100
+	MONGODB_DEFAULT_OFFSET = 0
+)
+
+const (
+	MONGODB_CHARGE_TYPE_POSTPAID = COMMON_PAYTYPE_POSTPAID
+	MONGODB_CHARGE_TYPE_PREPAID  = COMMON_PAYTYPE_PREPAID
+)
+
+var MONGODB_CHARGE_TYPE = map[uint64]string{
+	0: MONGODB_CHARGE_TYPE_POSTPAID,
+	1: MONGODB_CHARGE_TYPE_PREPAID,
 }
 
-var MONGODB_CLUSTER_TYPE = []string{
-	MONGODB_CLUSTER_TYPE_REPLSET,
-	MONGODB_CLUSTER_TYPE_SHARD,
+var MONGODB_AUTO_RENEW_FLAG = map[int]string{
+	0: "NOTIFY_AND_MANUAL_RENEW",
+	1: "NOTIFY_AND_AUTO_RENEW",
+	2: "DISABLE_NOTIFY_AND_MANUAL_RENEW",
+}
+
+var MONGODB_PREPAID_PERIOD = []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36}
+
+const (
+	MONGODB_TASK_FAILED  = "failed"
+	MONGODB_TASK_PAUSED  = "paused"
+	MONGODB_TASK_RUNNING = "running"
+	MONGODB_TASK_SUCCESS = "success"
+)
+
+func TencentMongodbBasicInfo() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"instance_name": {
+			Type:         schema.TypeString,
+			Required:     true,
+			ValidateFunc: validateStringLengthInRange(2, 35),
+			Description:  "Name of the Mongodb instance.",
+		},
+		"memory": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ValidateFunc: validateIntegerMin(2),
+			Description:  "Memory size. The minimum value is 2, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.",
+		},
+		"volume": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ValidateFunc: validateIntegerMin(25),
+			Description:  "Disk size. The minimum value is 25, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.",
+		},
+		"engine_version": {
+			Type:        schema.TypeString,
+			Required:    true,
+			ForceNew:    true,
+			Description: "Version of the Mongodb, and available values include `MONGO_3_WT`, `MONGO_3_ROCKS`, `MONGO_36_WT` and `MONGO_40_WT`.",
+		},
+		"machine_type": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+			DiffSuppressFunc: func(k, olds, news string, d *schema.ResourceData) bool {
+				if (olds == MONGODB_MACHINE_TYPE_GIO && news == MONGODB_MACHINE_TYPE_HIO) ||
+					(olds == MONGODB_MACHINE_TYPE_HIO && news == MONGODB_MACHINE_TYPE_GIO) {
+					return true
+				} else if (olds == MONGODB_MACHINE_TYPE_TGIO && news == MONGODB_MACHINE_TYPE_HIO10G) ||
+					(olds == MONGODB_MACHINE_TYPE_HIO10G && news == MONGODB_MACHINE_TYPE_TGIO) {
+					return true
+				}
+				return olds == news
+			},
+			Description: "Type of Mongodb instance, and available values include `HIO`(or `GIO` which will be deprecated) and `HIO10G`(or `TGIO` which will be deprecated).",
+		},
+		"available_zone": {
+			Type:        schema.TypeString,
+			Required:    true,
+			ForceNew:    true,
+			Description: "The available zone of the Mongodb.",
+		},
+		"vpc_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			ForceNew:    true,
+			Default:     "",
+			Description: "ID of the VPC.",
+		},
+		"subnet_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			ForceNew:    true,
+			Description: "ID of the subnet within this VPC. The value is required if `vpc_id` is set.",
+		},
+		"project_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Default:     0,
+			Description: "ID of the project which the instance belongs.",
+		},
+		"security_groups": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			ForceNew: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Set: func(v interface{}) int {
+				return hashcode.String(v.(string))
+			},
+			Description: "ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.",
+		},
+		"password": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Sensitive:   true,
+			Description: "Password of this Mongodb account.",
+		},
+		"tags": {
+			Type:        schema.TypeMap,
+			Optional:    true,
+			Description: "The tags of the Mongodb.",
+		},
+		// payment
+		"charge_type": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			ForceNew:     true,
+			Default:      MONGODB_CHARGE_TYPE_POSTPAID,
+			ValidateFunc: validateAllowedStringValue([]string{MONGODB_CHARGE_TYPE_POSTPAID, MONGODB_CHARGE_TYPE_PREPAID}),
+			Description:  "The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.",
+		},
+		"prepaid_period": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			ValidateFunc: validateAllowedIntValue(MONGODB_PREPAID_PERIOD),
+			Description:  "The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.",
+		},
+		"auto_renew_flag": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Default:     0,
+			Description: "Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.",
+		},
+		// Computed
+		"status": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Status of the Mongodb instance, and available values include pending initialization(expressed with 0),  processing(expressed with 1), running(expressed with 2) and expired(expressed with -2).",
+		},
+		"vip": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "IP of the Mongodb instance.",
+		},
+		"vport": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "IP port of the Mongodb instance.",
+		},
+		"create_time": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Creation time of the Mongodb instance.",
+		},
+	}
 }

tencentcloud/provider.go

@@ -257,6 +257,7 @@ MongoDB
   Resource
     tencentcloud_mongodb_instance
     tencentcloud_mongodb_sharding_instance
+    tencentcloud_mongodb_standby_instance
 
 MySQL
   Data Source
@@ -712,6 +713,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_monitor_binding_receiver":       resourceTencentMonitorBindingAlarmReceiver(),
 			"tencentcloud_elasticsearch_instance":         resourceTencentCloudElasticsearchInstance(),
 			"tencentcloud_postgresql_instance":            resourceTencentCloudPostgresqlInstance(),
+			"tencentcloud_mongodb_standby_instance":       resourceTencentCloudMongodbStandbyInstance(),
 		},
 
 		ConfigureFunc: providerConfigure,