merge master

Author: likexian

.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,63 @@
-## 1.20.1 (Unreleased)
+## 1.21.2 (Unreleased)
+## 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:
+
+* **New Data Source**: `tencentcloud_cam_users`
+* **New Data Source**: `tencentcloud_cam_groups`
+* **New Data Source**: `tencentcloud_cam_policies`
+* **New Data Source**: `tencentcloud_cam_roles`
+* **New Data Source**: `tencentcloud_cam_user_policy_attachments`
+* **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_reserved_instance_configs`
+* **New Data Source**: `tencentcloud_reserved_instances`
+* **New Resource**: `tencentcloud_cam_user`
+* **New Resource**: `tencentcloud_cam_group`
+* **New Resource**: `tencentcloud_cam_role`
+* **New Resource**: `tencentcloud_cam_policy`
+* **New Resource**: `tencentcloud_cam_user_policy_attachment`
+* **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 Resource**: `tencentcloud_reserved_instance`
+
+ENHANCEMENTS:
+
+* Resource: `tencentcloud_gaap_http_domain` support import
+* Resource: `tencentcloud_gaap_layer7_listener` support import
+
+BUG FIXES:
+
+* Resource: `tencentcloud_gaap_http_domain` fix sometimes can't enable realserver auth
+
+## 1.20.1 (October 08, 2019)
+
+ENHANCEMENTS:
+
+* Data Source: `tencentcloud_availability_zones` refactor logic with api3.0 .
+* Data Source: `tencentcloud_as_scaling_groups` add optional argument `tags` and attribute `tags` for `scaling_group_list`.
+* Resource: `tencentcloud_eip` add optional argument `type`, `anycast_zone`, `internet_service_provider`, etc.
+* Resource: `tencentcloud_as_scaling_group` add optional argument `tags`.
+
+BUG FIXES:
+
+* Data Source: `tencentcloud_gaap_http_domains` set response `certificate_id`, `client_certificate_id`, `realserver_auth`, `basic_auth` and `gaap_auth` default value when they are nil.
+* Resource: `tencentcloud_gaap_http_domain` set response `certificate_id`, `client_certificate_id`, `realserver_auth`, `basic_auth` and `gaap_auth` default value when they are nil.
+
 ## 1.20.0 (September 24, 2019)
 
 FEATURES:
@@ -72,7 +131,6 @@ DEPRECATED:
 
 * Data Source: `tencentcloud_kubernetes_clusters`:`container_runtime` is no longer supported. 
 
-
 ## 1.18.0 (September 10, 2019)
 
 FEATURES:
@@ -137,7 +195,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`.
@@ -357,7 +414,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-as/main.tf

@@ -48,6 +48,10 @@ resource "tencentcloud_as_scaling_group" "scaling_group" {
   desired_capacity     = "${var.desired_capacity}"
   termination_policies = ["NEWEST_INSTANCE"]
   retry_policy         = "INCREMENTAL_INTERVALS"
+
+  tags = {
+    "test" = "test"
+  }
 }
 
 resource "tencentcloud_as_scaling_policy" "scaling_policy" {
@@ -91,3 +95,7 @@ resource "tencentcloud_as_notification" "notification" {
   notification_types          = ["SCALE_OUT_FAILED"]
   notification_user_group_ids = ["76955"]
 }
+
+data "tencentcloud_as_scaling_groups" "scaling_groups_tags" {
+  tags = "${tencentcloud_as_scaling_group.scaling_group.tags}"
+}

examples/tencentcloud-cam/main.tf

@@ -0,0 +1,90 @@
+resource "tencentcloud_cam_group" "example" {
+  name   = "example"
+  remark = "example"
+}
+
+resource "tencentcloud_cam_user" "example" {
+  name                = "example"
+  remark              = "example"
+  console_login       = true
+  use_api             = true
+  need_reset_password = true
+  password            = "${var.password}"
+  phone_num           = "${var.phone_num}"
+  country_code        = "${var.country_code}"
+  email               = "${var.email}"
+}
+
+resource "tencentcloud_cam_policy" "example" {
+  name     = "example"
+  document = "${var.policy_document}"
+}
+
+resource "tencentcloud_cam_role" "example" {
+  name          = "example"
+  document      = "${var.role_document}"
+  description   = "test"
+  console_login = true
+}
+
+resource "tencentcloud_cam_group_membership" "example" {
+  group_id = "${tencentcloud_cam_group.example.id}"
+  user_ids = ["${tencentcloud_cam_user.example.id}"]
+}
+
+resource "tencentcloud_cam_role_policy_attachment" "example" {
+  role_id   = "${tencentcloud_cam_role.example.id}"
+  policy_id = "${tencentcloud_cam_policy.example.id}"
+}
+
+resource "tencentcloud_cam_user_policy_attachment" "example" {
+  user_id   = "${tencentcloud_cam_user.example.id}"
+  policy_id = "${tencentcloud_cam_policy.example.id}"
+}
+
+resource "tencentcloud_cam_group_policy_attachment" "example" {
+  group_id  = "${tencentcloud_cam_group.example.id}"
+  policy_id = "${tencentcloud_cam_policy.example.id}"
+}
+
+resource "tencentcloud_cam_saml_provider" "example" {
+  name        = "example"
+  meta_data   = "${var.meta_data}"
+  description = "test"
+}
+
+data "tencentcloud_cam_users" "users" {
+  name = "${tencentcloud_cam_user.example.id}"
+}
+
+data "tencentcloud_cam_roles" "roles" {
+  role_id = "${tencentcloud_cam_role.example.id}"
+}
+
+data "tencentcloud_cam_policies" "policies" {
+  policy_id = "${tencentcloud_cam_policy.example.id}"
+}
+
+data "tencentcloud_cam_groups" "groups" {
+  group_id = "${tencentcloud_cam_group.example.id}"
+}
+
+data "tencentcloud_cam_group_memberships" "memberships" {
+  group_id = "${tencentcloud_cam_group_membership.example.id}"
+}
+
+data "tencentcloud_cam_user_policy_attachments" "user_policy_attachments" {
+  user_id = "${tencentcloud_cam_user_policy_attachment.example.user_id}"
+}
+
+data "tencentcloud_cam_role_policy_attachments" "role_policy_attachments" {
+  role_id = "${tencentcloud_cam_role_policy_attachment.example.role_id}"
+}
+
+data "tencentcloud_cam_group_policy_attachments" "group_policy_attachments" {
+  group_id = "${tencentcloud_cam_group_policy_attachment.example.group_id}"
+}
+
+data "tencentcloud_cam_saml_providers" "saml_providers" {
+  name = "${tencentcloud_cam_saml_provider.example.id}"
+}

examples/tencentcloud-cam/variables.tf

@@ -0,0 +1,28 @@
+variable "password" {
+  default = "Gail@1234"
+}
+
+variable "phone_num" {
+  default = "13631555963"
+}
+
+variable "country_code" {
+  default = "86"
+}
+
+variable "email" {
+  default = "[email protected]"
+}
+
+variable "policy_document" {
+  default = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"resource\":[\"*\"]},{\"action\":[\"name/cos:PutObject\"],\"effect\":\"allow\",\"resource\":[\"*\"]}]}"
+}
+
+variable "role_document" {
+  default = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
+}
+
+variable "meta_data" {
+  default = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48bWQ6RW50aXR5RGVzY3JpcHRvciBlbnRpdHlJRD0iaHR0cDovL3d3dy5va3RhLmNvbS9leGsxa3F4bWNqUW1HQURNeTM1NyIgeG1sbnM6bWQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDptZXRhZGF0YSI+PG1kOklEUFNTT0Rlc2NyaXB0b3IgV2FudEF1dGhuUmVxdWVzdHNTaWduZWQ9ImZhbHNlIiBwcm90b2NvbFN1cHBvcnRFbnVtZXJhdGlvbj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnByb3RvY29sIj48bWQ6S2V5RGVzY3JpcHRvciB1c2U9InNpZ25pbmciPjxkczpLZXlJbmZvIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlEb0RDQ0FvaWdBd0lCQWdJR0FXM0lTcExvTUEwR0NTcUdTSWIzRFFFQkN3VUFNSUdRTVFzd0NRWURWUVFHRXdKVlV6RVRNQkVHDQpBMVVFQ0F3S1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ3d05VMkZ1SUVaeVlXNWphWE5qYnpFTk1Bc0dBMVVFQ2d3RVQydDBZVEVVDQpNQklHQTFVRUN3d0xVMU5QVUhKdmRtbGtaWEl4RVRBUEJnTlZCQU1NQ0dsa2VIVmxkblJoTVJ3d0dnWUpLb1pJaHZjTkFRa0JGZzFwDQpibVp2UUc5cmRHRXVZMjl0TUI0WERURTVNVEF4TkRBek1qSXhNMW9YRFRJNU1UQXhOREF6TWpNeE0xb3dnWkF4Q3pBSkJnTlZCQVlUDQpBbFZUTVJNd0VRWURWUVFJREFwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSERBMVRZVzRnUm5KaGJtTnBjMk52TVEwd0N3WURWUVFLDQpEQVJQYTNSaE1SUXdFZ1lEVlFRTERBdFRVMDlRY205MmFXUmxjakVSTUE4R0ExVUVBd3dJYVdSNGRXVjJkR0V4SERBYUJna3Foa2lHDQo5dzBCQ1FFV0RXbHVabTlBYjJ0MFlTNWpiMjB3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ2g4b3dqDQpZK2dQSUM3blQvNTduLzdmeXJzcDlHMXdxa2UxdXhjMHVrTndnQXozOVNpelY3QVhLMWRReTFLaThXWjJJMzFEczJkT0FNQ1FKR2pWDQpUWWNNbnA3KzhqUzNLdmxNUkRJamk5cmxuUi9vcnBvMll1RHVWby9jVzdidlRIS2h2REo1QWZRaWxzYlNPTXdUOWM2TVlYZGhBNVBwDQpzelFsK1UrdHJmcXUrdUorSER4SVQxdlhWaVI5YlY2SUFRSzZpbWZoc2wxWmVSUytjbVFVNEpjQWlYT0xtTnFVVWM2UkpxUzhrMW1mDQpBLzhmb2VyMGc3SG4xZDVXclpCc2gyUlR2Vzh1ZVdadHQ3dmh4QTlGdE5kSVlEcXJ0eElmMlZXcXhrSHM3WFZDSm5wTnJITVovT1BRDQpGY21YSGVxNlJJMlB3Q1RlOW8zZHZpM0hqeXBaOEl4dkFnTUJBQUV3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUFHaHk1bG9nbGtTDQoyVHg2YS90MnF5VEx0YVV5cEwrNGhySGJoMVAweVVMc0NrSnFsM2wrWG9VZDZCY2FJaFNSVGFPQk95ODViL0UzelJ4K3JzQXJwTjVVDQp5ZThuUEM4a05PYW5vTk9wWnZvYmhpTzFlMFIvYmxEcnRBL0o5UlBwMWtmdlhmS2NSTTU3TlRCWXppTURlbnFQUTRFOWN1U2lGdFFxDQpJYmpIbThaM1B1YXgwRitldkZ3U1pJMDNCWXNISGw1d1EraEJBS3hTdTJINEZRdU93Zmpnb2EveEN6Z1NKYjJ2UXdEc1MxMk9mSkNiDQpSRm1ZL1VYZXQramFhdEVORktLZStZSUJpU0J2WG1adTN0MHN5NDZTNzlPVzBacXJ0NUh2bElsT2lpTFpaN1FZamxjM1kxeG1LZ1luDQpXM2M2WGZkdmhGWHo0ZDdkbWYvTUdpNGY0enM9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9tZDpLZXlEZXNjcmlwdG9yPjxtZDpOYW1lSURGb3JtYXQ+dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6MS4xOm5hbWVpZC1mb3JtYXQ6dW5zcGVjaWZpZWQ8L21kOk5hbWVJREZvcm1hdD48bWQ6TmFtZUlERm9ybWF0PnVybjpvYXNpczpuYW1lczp0YzpTQU1MOjEuMTpuYW1laWQtZm9ybWF0OmVtYWlsQWRkcmVzczwvbWQ6TmFtZUlERm9ybWF0PjxtZDpTaW5nbGVTaWduT25TZXJ2aWNlIEJpbmRpbmc9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpiaW5kaW5nczpIVFRQLVBPU1QiIExvY2F0aW9uPSJodHRwczovL2lkeHVldnRhLm9rdGEuY29tL2FwcC9pZHh1ZW9yZzYzNzM1OF90ZXN0XzEvZXhrMWtxeG1jalFtR0FETXkzNTcvc3NvL3NhbWwiLz48bWQ6U2luZ2xlU2lnbk9uU2VydmljZSBCaW5kaW5nPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YmluZGluZ3M6SFRUUC1SZWRpcmVjdCIgTG9jYXRpb249Imh0dHBzOi8vaWR4dWV2dGEub2t0YS5jb20vYXBwL2lkeHVlb3JnNjM3MzU4X3Rlc3RfMS9leGsxa3F4bWNqUW1HQURNeTM1Ny9zc28vc2FtbCIvPjwvbWQ6SURQU1NPRGVzY3JpcHRvcj48L21kOkVudGl0eURlc2NyaXB0b3I+"
+}
+

examples/tencentcloud-eni/main.tf

@@ -0,0 +1,89 @@
+resource "tencentcloud_vpc" "foo" {
+  name       = "ci-test-eni-vpc"
+  cidr_block = "10.0.0.0/16"
+}
+
+resource "tencentcloud_subnet" "foo" {
+  availability_zone = "${var.availability_zone}"
+  name              = "ci-test-eni-subnet"
+  vpc_id            = "${tencentcloud_vpc.foo.id}"
+  cidr_block        = "10.0.0.0/16"
+  is_multicast      = false
+}
+
+resource "tencentcloud_security_group" "foo" {
+  name = "test-ci-eni-sg1"
+}
+
+resource "tencentcloud_security_group" "bar" {
+  name = "test-ci-eni-sg2"
+}
+
+resource "tencentcloud_eni" "foo" {
+  name            = "ci-test-eni"
+  vpc_id          = "${tencentcloud_vpc.foo.id}"
+  subnet_id       = "${tencentcloud_subnet.foo.id}"
+  description     = "eni desc"
+  security_groups = ["${tencentcloud_security_group.foo.id}", "${tencentcloud_security_group.bar.id}"]
+
+  ipv4s {
+    ip          = "10.0.0.10"
+    primary     = true
+    description = "new desc"
+  }
+
+  ipv4s {
+    ip      = "10.0.0.11"
+    primary = false
+  }
+
+  ipv4s {
+    ip      = "10.0.0.12"
+    primary = false
+  }
+
+  tags = {
+    "test" = "test"
+  }
+}
+
+data "tencentcloud_image" "my_favorite_image" {
+  os_name = "centos"
+
+  filter {
+    name   = "image-type"
+    values = ["PUBLIC_IMAGE"]
+  }
+}
+
+data "tencentcloud_instance_types" "my_favorite_instance_types" {
+  filter {
+    name   = "instance-family"
+    values = ["S3"]
+  }
+
+  cpu_core_count = 4
+  memory_size    = 8
+}
+
+resource "tencentcloud_instance" "foo" {
+  instance_name            = "ci-test-eni-attach"
+  availability_zone        = "ap-guangzhou-3"
+  image_id                 = "${data.tencentcloud_image.my_favorite_image.image_id}"
+  instance_type            = "${data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type}"
+  system_disk_type         = "CLOUD_PREMIUM"
+  disable_security_service = true
+  disable_monitor_service  = true
+  vpc_id                   = "${tencentcloud_vpc.foo.id}"
+  subnet_id                = "${tencentcloud_subnet.foo.id}"
+}
+
+resource "tencentcloud_eni_attachment" "foo" {
+  eni_id      = "${tencentcloud_eni.foo.id}"
+  instance_id = "${tencentcloud_instance.foo.id}"
+}
+
+data "tencentcloud_enis" "subnet" {
+  subnet_id      = "${tencentcloud_eni.foo.subnet_id}"
+  security_group = "${tencentcloud_security_group.foo.id}"
+}

examples/tencentcloud-eni/variable.tf

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