Merge branch 'master' into master

Author: gailwang

.goreleaser.yml

@@ -0,0 +1,50 @@
+# Visit https://goreleaser.com for documentation on how to customize this
+# behavior.
+before:
+  hooks:
+    - go mod tidy
+builds:
+- env:
+    - CGO_ENABLED=0
+  mod_timestamp: '{{ .CommitTimestamp }}'
+  flags:
+    - -trimpath
+  ldflags:
+    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
+  goos:
+    - freebsd
+    - windows
+    - linux
+    - darwin
+  goarch:
+    - amd64
+    - '386'
+    - arm
+    - arm64
+  ignore:
+    - goos: darwin
+      goarch: '386'
+  binary: '{{ .ProjectName }}_v{{ .Version }}'
+archives:
+- format: zip
+  name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+checksum:
+  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  algorithm: sha256
+signs:
+  - artifacts: checksum
+    args:
+      # if you are using this is a GitHub action or some other automated pipeline, you 
+      # need to pass the batch flag to indicate its not interactive.
+      - "--batch"
+      - "--local-user"
+      - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key
+      - "--output"
+      - "${signature}"
+      - "--detach-sign"
+      - "${artifact}"
+release:
+  # Visit your project's GitHub Releases page to publish this release.
+  draft: true
+changelog:
+  skip: true

.travis.yml

@@ -29,4 +29,6 @@ matrix:
     - go: tip
 
 env:
-  global: GOFLAGS=-mod=vendor
+  global:
+    - GOFLAGS=-mod=vendor
+    - GO111MODULE=on

CHANGELOG.md

@@ -131,6 +131,8 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), getting..."
 	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
 endif
+	ln -sf ../../../../ext/providers/tencentcloud/website/docs $(GOPATH)/src/github.com/hashicorp/terraform-website/content/source/docs/providers/tencentcloud
+	ln -sf ../../../ext/providers/tencentcloud/website/tencentcloud.erb $(GOPATH)/src/github.com/hashicorp/terraform-website/content/source/layouts/tencentcloud.erb
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
 website-lint:
@@ -155,6 +157,8 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), getting..."
 	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
 endif
+	ln -sf ../../../../ext/providers/tencentcloud/website/docs $(GOPATH)/src/github.com/hashicorp/terraform-website/content/source/docs/providers/tencentcloud
+	ln -sf ../../../ext/providers/tencentcloud/website/tencentcloud.erb $(GOPATH)/src/github.com/hashicorp/terraform-website/content/source/layouts/tencentcloud.erb
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
 .PHONY: build sweep test testacc fmt fmtcheck lint tools test-compile doc hooks website website-lint website-test

GNUmakefile

@@ -2,19 +2,19 @@
 
 ## Requirements
 
-* [Terraform](https://www.terraform.io/downloads.html) 0.12.x
+* [Terraform](https://www.terraform.io/downloads.html) 0.13.x
 * [Go](https://golang.org/doc/install) 1.13.x (to build the provider plugin)
 
 ## Usage
 
 ### Build from source code
 
-Clone repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-tencentcloud`
+Clone repository to: `$GOPATH/src/github.com/tencentcloudstack/terraform-provider-tencentcloud`
 
 ```sh
-$ mkdir -p $GOPATH/src/github.com/terraform-providers
-$ cd $GOPATH/src/github.com/terraform-providers
-$ git clone https://github.com/terraform-providers/terraform-provider-tencentcloud
+$ mkdir -p $GOPATH/src/github.com/tencentcloudstack
+$ cd $GOPATH/src/github.com/tencentcloudstack
+$ git clone https://github.com/tencentcloudstack/terraform-provider-tencentcloud.git
 $ cd terraform-provider-tencentcloud
 $ go build .
 ```

README.md

@@ -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"
+  }
+}

examples/tencentcloud-mongodb/main.tf

@@ -458,8 +458,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.221+incompatible h1:KfLv0pH+sYexx2FcvvPhek5kfiI14JB9JCTMkEWrNVE=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.221+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=

go.sum

@@ -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/connectivity/client.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.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"),
 				),
 			},
 		},