merge master

Author: likexian

.githooks/pre-commit

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+make fmtcheck
+if [ $? -ne 0 ]; then
+    printf "COMMIT FAILED\n"
+    exit 1
+fi
+
+make lint
+if [ $? -ne 0 ]; then
+    printf "COMMIT FAILED\n"
+    exit 1
+fi
+
+printf "==> Generating docs for tencentcloud provider...\n"
+doc=`make doc 2>&1`
+if [ $? -ne 0 ]; then
+    echo "$doc"| tail -n 4|head -n 2
+    printf "COMMIT FAILED\n"
+    exit 1
+fi
+
+make website-lint
+if [ $? -ne 0 ]; then
+    printf "COMMIT FAILED\n"
+    exit 1
+fi
+
+diff=`git diff --name-only website/docs/`
+if [ "$diff" != "" ]; then
+    printf "There are docs updated when checking, 'git add' it first.\n"
+    printf "COMMIT FAILED\n"
+    exit 1
+fi
+
+printf "COMMIT READY\n"
+exit 0

.travis.yml

@@ -5,6 +5,8 @@ services:
 language: go
 go:
   - "1.11.x"
+  - "1.12.x"
+  - "1.13.x"
   - tip
 
 install:

CHANGELOG.md

@@ -1,4 +1,130 @@
-## 1.16.2 (Unreleased)
+## 1.20.1 (Unreleased)
+## 1.20.0 (September 24, 2019)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_eips`
+* **New Data Source**: `tencentcloud_instances`
+* **New Data Source**: `tencentcloud_key_pairs`
+* **New Data Source**: `tencentcloud_placement_groups`
+* **New Resource**: `tencentcloud_placement_group`
+
+ENHANCEMENTS:
+
+* Data Source: `tencentcloud_redis_instances` add optional argument `tags`.
+* Data Source: `tencentcloud_mongodb_instances` add optional argument `tags`.
+* Data Source: `tencentcloud_instance_types` add optional argument `availability_zone` and `gpu_core_count`.
+* Data Source: `tencentcloud_gaap_http_rules` add optional argument `forward_host` and attributes `forward_host` in `rules`.
+* Resource: `tencentcloud_redis_instance` add optional argument `tags`.
+* Resource: `tencentcloud_mongodb_instance` add optional argument `tags`.
+* Resource: `tencentcloud_mongodb_sharding_instance` add optional argument `tags`.
+* Resource: `tencentcloud_instance` add optional argument `placement_group_id`.
+* Resource: `tencentcloud_eip` refactor logic with api3.0 .
+* Resource: `tencentcloud_eip_association` refactor logic with api3.0 .
+* Resource: `tencentcloud_key_pair` refactor logic with api3.0 .
+* Resource: `tencentcloud_gaap_http_rule` add optional argument `forward_host`.
+
+BUG FIXES:
+* Resource: `tencentcloud_mysql_instance`: miss argument `availability_zone` causes the instance to be recreated.
+
+DEPRECATED:
+
+* Data Source: `tencentcloud_eip` replaced by `tencentcloud_eips`.
+
+## 1.19.0 (September 19, 2019)
+
+FEATURES:
+
+* **New Resource**: `tencentcloud_security_group_lite_rule`.
+
+ENHANCEMENTS:
+
+* Data Source: `tencentcloud_security_groups`: add optional argument `tags`.
+* Data Source: `tencentcloud_security_groups`: add optional argument `result_output_file` and new attributes `ingress`, `egress` for list `security_groups`.
+* Resource: `tencentcloud_security_group`: add optional argument `tags`.
+* Resource: `tencentcloud_as_scaling_config`: internet charge type support `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
+
+BUG FIXES:
+* Resource: `tencentcloud_clb_listener_rule`: fix unclear description and errors in example.
+* Resource: `tencentcloud_instance`: fix hostname is not work.
+
+## 1.18.1 (September 17, 2019)
+
+FEATURES:
+
+* **Update Data Source**: `tencentcloud_vpc_instances` add optional argument `tags`
+* **Update Data Source**: `tencentcloud_vpc_subnets` add optional argument `tags`
+* **Update Data Source**: `tencentcloud_route_tables` add optional argument `tags`
+* **Update Resource**: `tencentcloud_vpc` add optional argument `tags`
+* **Update Resource**: `tencentcloud_subnet` add optional argument `tags`
+* **Update Resource**: `tencentcloud_route_table` add optional argument `tags`
+
+ENHANCEMENTS:
+
+* Data Source:`tencentcloud_kubernetes_clusters`  support pull out authentication information for cluster access too.
+* Resource:`tencentcloud_kubernetes_cluster`  support pull out authentication information for cluster access.
+
+BUG FIXES:
+
+* Resource: `tencentcloud_mysql_instance`: when the mysql is abnormal state, read the basic information report error
+
+DEPRECATED:
+
+* Data Source: `tencentcloud_kubernetes_clusters`:`container_runtime` is no longer supported. 
+
+
+## 1.18.0 (September 10, 2019)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_ssl_certificates`
+* **New Data Source**: `tencentcloud_dnats`
+* **New Data Source**: `tencentcloud_nat_gateways`
+* **New Resource**: `tencentcloud_ssl_certificate`
+* **Update Resource**: `tencentcloud_clb_redirection` add optional argument `is_auto_rewrite`
+* **Update Resource**: `tencentcloud_nat_gateway` , add more configurable items.
+* **Update Resource**: `tencentcloud_nat` , add more configurable items.
+
+DEPRECATED:
+* Data Source: `tencentcloud_nats` replaced by `tencentcloud_nat_gateways`.
+
+## 1.17.0 (September 04, 2019)
+
+FEATURES:
+* **New Data Source**: `tencentcloud_gaap_proxies`
+* **New Data Source**: `tencentcloud_gaap_realservers`
+* **New Data Source**: `tencentcloud_gaap_layer4_listeners`
+* **New Data Source**: `tencentcloud_gaap_layer7_listeners`
+* **New Data Source**: `tencentcloud_gaap_http_domains`
+* **New Data Source**: `tencentcloud_gaap_http_rules`
+* **New Data Source**: `tencentcloud_gaap_security_policies`
+* **New Data Source**: `tencentcloud_gaap_security_rules`
+* **New Data Source**: `tencentcloud_gaap_certificates`
+* **New Resource**: `tencentcloud_gaap_proxy`
+* **New Resource**: `tencentcloud_gaap_realserver`
+* **New Resource**: `tencentcloud_gaap_layer4_listener`
+* **New Resource**: `tencentcloud_gaap_layer7_listener`
+* **New Resource**: `tencentcloud_gaap_http_domain`
+* **New Resource**: `tencentcloud_gaap_http_rule`
+* **New Resource**: `tencentcloud_gaap_certificate`
+* **New Resource**: `tencentcloud_gaap_security_policy`
+* **New Resource**: `tencentcloud_gaap_security_rule`
+
+## 1.16.3 (August 30, 2019)
+
+BUG FIXIES:
+
+* Resource: `tencentcloud_kubernetes_cluster`: cgi error retry.
+* Resource: `tencentcloud_kubernetes_scale_worker`: cgi error retry.
+
+## 1.16.2 (August 28, 2019)
+
+BUG FIXIES:
+
+* Resource: `tencentcloud_instance`: fixed cvm data disks missing computed.
+* Resource: `tencentcloud_mysql_backup_policy`: `backup_model` remove logical backup support. 
+* Resource: `tencentcloud_mysql_instance`: `tags` adapt to the new official api.
+
 ## 1.16.1 (August 27, 2019)
 
 ENHANCEMENTS:

GNUmakefile

@@ -64,6 +64,13 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
+doc:
+	cd gendoc && go run main.go template.go && cd ..
+
+hooks: tools
+	find .git/hooks -type l -exec rm {} \;
+	find .githooks -type f -exec ln -sf ../../{} .git/hooks/ \;
+
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
@@ -82,4 +89,4 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(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 website website-lint website-test
+.PHONY: build sweep test testacc fmt fmtcheck lint tools test-compile doc hooks website website-lint website-test

examples/tencentcloud-gaap-certificate/main.tf

@@ -0,0 +1,37 @@
+resource tencentcloud_gaap_certificate "server" {
+  type    = "SERVER"
+  name    = "test"
+  content = "${var.server_cert}"
+  key     = "${var.server_key}"
+}
+
+resource tencentcloud_gaap_certificate "client" {
+  type    = "CLIENT"
+  content = "${var.client_ca}"
+  key     = "${var.client_ca_key}"
+}
+
+resource tencentcloud_gaap_certificate "realserver" {
+  type    = "REALSERVER"
+  content = "${var.client_ca}"
+  key     = "${var.client_ca_key}"
+}
+
+resource tencentcloud_gaap_certificate "basic" {
+  type    = "BASIC"
+  content = "test:tx2KGdo3zJg/."
+}
+
+resource tencentcloud_gaap_certificate "gaap" {
+  type    = "PROXY"
+  content = "${var.server_cert}"
+  key     = "${var.server_key}"
+}
+
+data "tencentcloud_gaap_certificates" "foo" {
+  id = "${tencentcloud_gaap_certificate.server.id}"
+}
+
+data "tencentcloud_gaap_certificates" "bar" {
+  name = "${tencentcloud_gaap_certificate.server.name}"
+}

examples/tencentcloud-gaap-certificate/variable.tf

@@ -0,0 +1,49 @@
+resource tencentcloud_gaap_proxy "foo" {
+  name              = "ci-test-gaap-proxy"
+  bandwidth         = 10
+  concurrent        = 2
+  access_region     = "SouthChina"
+  realserver_region = "NorthChina"
+}
+
+resource tencentcloud_gaap_realserver "foo" {
+  ip   = "1.1.1.1"
+  name = "ci-test-gaap-realserver"
+}
+
+resource tencentcloud_gaap_realserver "bar" {
+  ip   = "119.29.29.29"
+  name = "ci-test-gaap-realserver2"
+}
+
+resource tencentcloud_gaap_layer4_listener "foo" {
+  protocol        = "TCP"
+  name            = "ci-test-gaap-4-listener-new"
+  port            = 80
+  scheduler       = "wrr"
+  realserver_type = "IP"
+  proxy_id        = "${tencentcloud_gaap_proxy.foo.id}"
+  health_check    = true
+  interval      = 11
+  connect_timeout = 10
+
+  realserver_bind_set {
+    id     = "${tencentcloud_gaap_realserver.foo.id}"
+    ip     = "${tencentcloud_gaap_realserver.foo.ip}"
+    port   = 80
+    weight = 1
+  }
+
+  realserver_bind_set {
+    id     = "${tencentcloud_gaap_realserver.bar.id}"
+    ip     = "${tencentcloud_gaap_realserver.bar.ip}"
+    port   = 80
+    weight = 2
+  }
+}
+
+data tencentcloud_gaap_layer4_listeners "foo" {
+  protocol    = "TCP"
+  proxy_id    = "${tencentcloud_gaap_proxy.foo.id}"
+  listener_id = "${tencentcloud_gaap_layer4_listener.foo.id}"
+}