Merge branch 'master' into cam-dev

Author: gailwang

.go-version

@@ -1 +1 @@
-1.11.5
+1.13.3

.travis.yml

@@ -1,7 +1,8 @@
-dist: trusty
+dist: xenial
 sudo: required
 services:
-- docker
+  - docker
+
 language: go
 go:
   - "1.11.x"
@@ -10,27 +11,22 @@ go:
   - tip
 
 install:
-# This script is used by the Travis build to install a cookie for
-# go.googlesource.com so rate limits are higher when using `go get` to fetch
-# packages that live there.
-# See: https://github.com/golang/go/issues/12933
-- bash scripts/gogetcookie.sh
-- make tools
+  - make tools
 
 script:
-- make lint
-- make test
-- make website-lint
-- make website-test
+  - make lint
+  - make test
+  - make website-lint
+  - make website-test
 
 branches:
   only:
-  - master
+    - master
 
 matrix:
   fast_finish: true
   allow_failures:
-  - go: tip
+    - go: tip
 
 env:
-  - GOFLAGS=-mod=vendor GO111MODULE=on
+  global: GOFLAGS=-mod=vendor

CHANGELOG.md

@@ -1,4 +1,43 @@
-## 1.21.0 (Unreleased)
+## 1.22.1 (Unreleased)
+BUG FIXES:
+* Fixed docs of CAM
+
+## 1.22.0 (November 05, 2019)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_cfs_file_systems`
+* **New Data Source**: `tencentcloud_cfs_access_groups`
+* **New Data Source**: `tencentcloud_cfs_access_rules`
+* **New Data Source**: `tencentcloud_scf_functions`
+* **New Data Source**: `tencentcloud_scf_namespaces`
+* **New Data Source**: `tencentcloud_scf_logs`
+* **New Resource**: `tencentcloud_cfs_file_system`
+* **New Resource**: `tencentcloud_cfs_access_group`
+* **New Resource**: `tencentcloud_cfs_access_rule`
+* **New Resource**: `tencentcloud_scf_function`
+* **New Resource**: `tencentcloud_scf_namespace`
+
+## 1.21.2 (October 29, 2019)
+
+BUG FIXES:
+
+* Resource: `tencentcloud_gaap_realserver` add ip/domain exists check
+* Resource: `tencentcloud_kubernetes_cluster` add error handling logic and optional argument `tags`.
+* Resource: `tencentcloud_kubernetes_scale_worker` add error handling logic.
+* Data Source: `tencentcloud_kubernetes_clusters` add optional argument `tags`.
+
+## 1.21.1 (October 23, 2019)
+
+ENHANCEMENTS:
+
+* Updated golang to version 1.13.x
+
+BUG FIXES:
+
+* Fixed docs of CAM
+
+## 1.21.0 (October 15, 2019)
 
 FEATURES:
 
@@ -10,7 +49,9 @@ FEATURES:
 * **New Data Source**: `tencentcloud_cam_group_policy_attachments`
 * **New Data Source**: `tencentcloud_cam_role_policy_attachments`
 * **New Data Source**: `tencentcloud_cam_group_memberships`
-* **New Data Source**: `tencentcloud_cam_SAML_providers`
+* **New Data Source**: `tencentcloud_cam_saml_providers`
+* **New Data Source**: `tencentcloud_reserved_instance_configs`
+* **New Data Source**: `tencentcloud_reserved_instances`
 * **New Resource**: `tencentcloud_cam_user`
 * **New Resource**: `tencentcloud_cam_group`
 * **New Resource**: `tencentcloud_cam_role`
@@ -19,9 +60,7 @@ FEATURES:
 * **New Resource**: `tencentcloud_cam_group_policy_attachment`
 * **New Resource**: `tencentcloud_cam_role_policy_attachment`
 * **New Resource**: `tencentcloud_cam_group_membership`
-* **New Resource**: `tencentcloud_cam_SAML_provider`
-* **New Data Source**: `tencentcloud_reserved_instance_configs`
-* **New Data Source**: `tencentcloud_reserved_instances`
+* **New Resource**: `tencentcloud_cam_saml_provider`
 * **New Resource**: `tencentcloud_reserved_instance`
 
 ENHANCEMENTS:
@@ -32,7 +71,7 @@ ENHANCEMENTS:
 BUG FIXES:
 
 * Resource: `tencentcloud_gaap_http_domain` fix sometimes can't enable realserver auth
-* Resource: `tencentcloud_cam_role_policy_attachment` fix error in exmaple of the website 
+
 
 ## 1.20.1 (October 08, 2019)
 
@@ -121,7 +160,6 @@ DEPRECATED:
 
 * Data Source: `tencentcloud_kubernetes_clusters`:`container_runtime` is no longer supported. 
 
-
 ## 1.18.0 (September 10, 2019)
 
 FEATURES:
@@ -186,7 +224,6 @@ FEATURES:
 * **New Resource**: `tencentcloud_kubernetes_scale_worker`
 * **New Resource**: `tencentcloud_kubernetes_cluster`
 
-
 DEPRECATED:
 * Data Source: `tencentcloud_container_clusters` replaced by `tencentcloud_kubernetes_clusters`.
 * Data Source: `tencentcloud_container_cluster_instances` replaced by `tencentcloud_kubernetes_clusters`.
@@ -406,7 +443,6 @@ ENHANCEMENTS:
 
 * resource/tencentcloud_instance: Add `user_data_raw` argument ([#4](https://github.com/terraform-providers/terraform-provider-scaffolding/issues/4))
 
-
 ## 1.2.2 (September 28, 2018)
 
 BUG FIXES:

GNUmakefile

@@ -28,7 +28,7 @@ fmtcheck:
 
 lint:
 	@echo "==> Checking source code against linters..."
-	@GOGC=30 golangci-lint run ./$(PKG_NAME)
+	@GOGC=30 GOPACKAGESPRINTGOLISTERRORS=1 golangci-lint run --timeout=30m ./$(PKG_NAME)
 	@tfproviderlint \
 		-c 1 \
 		-AT001 \

README.md

@@ -3,7 +3,7 @@
 ## Requirements
 
 * [Terraform](https://www.terraform.io/downloads.html) 0.12.x
-* [Go](https://golang.org/doc/install) 1.11 (to build the provider plugin)
+* [Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
 
 ## Usage
 

examples/tencentcloud-cfs/main.tf

@@ -0,0 +1,47 @@
+resource "tencentcloud_vpc" "vpc" {
+  name       = "test-cfs-vpc"
+  cidr_block = "10.2.0.0/16"
+}
+
+resource "tencentcloud_subnet" "subnet" {
+  vpc_id            = "${tencentcloud_vpc.vpc.id}"
+  name              = "test-cfs-subnet"
+  cidr_block        = "10.2.11.0/24"
+  availability_zone = "${var.availability_zone}"
+}
+
+resource "tencentcloud_cfs_access_group" "foo" {
+  name = "test_cfs_access_rule"
+}
+
+resource "tencentcloud_cfs_access_rule" "foo" {
+  access_group_id = "${tencentcloud_cfs_access_group.foo.id}"
+  auth_client_ip  = "10.10.1.0/24"
+  rw_permission   = "RW"
+  user_permission = "root_squash"
+  priority        = 1
+}
+
+resource "tencentcloud_cfs_file_system" "foo" {
+  name              = "test_cfs_file_system"
+  availability_zone = "${var.availability_zone}"
+  access_group_id   = "${tencentcloud_cfs_access_group.foo.id}"
+  protocol          = "${var.protocol}"
+  vpc_id            = "${tencentcloud_vpc.vpc.id}"
+  subnet_id         = "${tencentcloud_subnet.subnet.id}"
+}
+
+data "tencentcloud_cfs_file_systems" "file_systems" {
+  file_system_id = "${tencentcloud_cfs_file_system.foo.id}"
+  name           = "${tencentcloud_cfs_file_system.foo.name}"
+}
+
+data "tencentcloud_cfs_access_rules" "access_rules" {
+  access_group_id = "${tencentcloud_cfs_access_group.foo.id}"
+  access_rule_id  = "${tencentcloud_cfs_access_rule.foo.id}"
+}
+
+data "tencentcloud_cfs_access_groups" "access_groups" {
+  access_group_id = "${tencentcloud_cfs_access_group.foo.id}"
+  name            = "${tencentcloud_cfs_access_group.foo.name}"
+}

examples/tencentcloud-cfs/variables.tf

@@ -0,0 +1,7 @@
+variable "availability_zone" {
+  default = "ap-guangzhou-3"
+}
+
+variable "protocol" {
+  default = "NFS"
+}

examples/tencentcloud-scf/main.tf

@@ -0,0 +1,95 @@
+resource "tencentcloud_cos_bucket" "foo" {
+  bucket = "scf-cos1-1258798060"
+  acl    = "public-read"
+}
+
+resource "tencentcloud_cos_bucket" "bar" {
+  bucket = "scf-cos2-1258798060"
+  acl    = "public-read"
+}
+
+resource "tencentcloud_cos_bucket_object" "myobject" {
+  bucket = "${tencentcloud_cos_bucket.foo.bucket}"
+  key    = "/new_object_key.zip"
+  source = "code.zip"
+  acl    = "public-read"
+}
+
+resource "tencentcloud_cam_role" "foo" {
+  name          = "ci-scf-role"
+  document      = "${var.role_document}"
+  description   = "ci-scf-role"
+  console_login = true
+}
+
+resource "tencentcloud_scf_namespace" "foo" {
+  namespace   = "ci-test-scf"
+  description = "test1"
+}
+
+resource "tencentcloud_vpc" "test_vpc" {
+  name       = "Used for testing subnets"
+  cidr_block = "10.1.0.0/16"
+}
+
+resource "tencentcloud_subnet" "test_subnet" {
+  vpc_id            = "${tencentcloud_vpc.test_vpc.id}"
+  name              = "terraform test subnet"
+  cidr_block        = "10.1.1.0/24"
+  availability_zone = "${var.availability_zone}"
+}
+
+resource "tencentcloud_scf_function" "foo" {
+  name        = "ci-test-function"
+  description = "test"
+  handler     = "main.do_it"
+  runtime     = "Python3.6"
+  namespace   = "${tencentcloud_scf_namespace.foo.id}"
+  role        = "${tencentcloud_cam_role.foo.id}"
+  vpc_id      = "${tencentcloud_vpc.test_vpc.id}"
+  subnet_id   = "${tencentcloud_subnet.test_subnet.id}"
+
+  cos_bucket_name   = "${tencentcloud_cos_bucket.foo.id}"
+  cos_object_name   = "${tencentcloud_cos_bucket_object.myobject.key}"
+  cos_bucket_region = "ap-guangzhou"
+
+  triggers {
+    name         = "ci-test-fn-api-gw"
+    type         = "timer"
+    trigger_desc = "*/5 * * * * * *"
+  }
+
+  triggers {
+    name         = "${tencentcloud_cos_bucket.bar.id}"
+    type         = "cos"
+    trigger_desc = "${var.trigger_desc}"
+  }
+
+  tags = {
+    "test" = "test"
+  }
+}
+
+data "tencentcloud_scf_functions" "foo" {
+  name        = "${tencentcloud_scf_function.foo.name}"
+  description = "${tencentcloud_scf_function.foo.description}"
+  namespace   = "${tencentcloud_scf_function.foo.namespace}"
+  tags        = "${tencentcloud_scf_function.foo.tags}"
+}
+
+data "tencentcloud_scf_namespaces" "foo" {
+  namespace   = "${tencentcloud_scf_namespace.foo.id}"
+  description = "${tencentcloud_scf_namespace.foo.description}"
+}
+
+data "tencentcloud_scf_logs" "foo" {
+  function_name = "${tencentcloud_scf_function.foo.name}"
+  namespace     = "${tencentcloud_scf_function.foo.namespace}"
+  offset        = 0
+  limit         = 100
+  order         = "desc"
+  order_by      = "duration"
+  ret_code      = "UserCodeException"
+  start_time    = "2017-05-16 20:00:00"
+  end_time      = "2017-05-17 20:00:00"
+}

examples/tencentcloud-scf/variable.tf

@@ -0,0 +1,11 @@
+variable "role_document" {
+  default = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
+}
+
+variable "trigger_desc" {
+  default = "{\"event\":\"cos:ObjectCreated:Put\",\"filter\":{\"Prefix\":\"\",\"Suffix\":\"\"}}"
+}
+
+variable "availability_zone" {
+  default = "ap-guangzhou-3"
+}

examples/tencentcloud-tke/main.tf

@@ -30,6 +30,10 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
   }
 
   cluster_deploy_type = "MANAGED_CLUSTER"
+
+  tags = {
+    "test" = "test"
+  }
 }
 
 #examples for INDEPENDENT_CLUSTER  cluster