merge from master and resolve conflict

Author: lyu571

.changelog/1664.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_redis_replica_readonly
+```

.changelog/1690.txt

@@ -0,0 +1,15 @@
+```release-note:new-data-source
+tencentcloud_mariadb_database_objects
+```
+
+```release-note:new-data-source
+tencentcloud_mariadb_databases
+```
+
+```release-note:new-data-source
+tencentcloud_mariadb_database_table
+```
+
+```release-note:new-resource
+tencentcloud_mariadb_encrypt_attributes_operation
+```

.changelog/1694.txt

@@ -0,0 +1,27 @@
+```release-note:new-data-source
+tencentcloud_tsf_application
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_application_config
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_application_file_config
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_application_public_config
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_cluster
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_microservice
+```
+
+```release-note:new-data-source
+tencentcloud_tsf_unit_rules
+```

.changelog/1698.txt

@@ -0,0 +1,19 @@
+```release-note:new-resource
+tencentcloud_tsf_application
+```
+
+```release-note:new-resource
+tencentcloud_tsf_application_public_config_release
+```
+
+```release-note:new-resource
+tencentcloud_tsf_application_public_config
+```
+
+```release-note:new-resource
+tencentcloud_tsf_application_file_config_release
+```
+
+```release-note:new-resource
+tencentcloud_tsf_instances_attachment
+```

.changelog/1702.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_eip: support update `internet_charge_type`
+```
+
+```release-note:new-resource
+tencentcloud_ipv6_address_bandwidth
+```

.changelog/1703.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+tencentcloud_ccn_cross_border_region_bandwidth_limits
+```

.changelog/1704.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+tencentcloud_lighthouse_bundle
+```

.changelog/1705.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+tencentcloud_security_group_rule: fix the nil exception caused by the policy index changing
+```

.changelog/1706.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_scf_function_alias
+```

CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.80.6 (April 27 2023)
+
+FEATURES:
+
+* **New Data Source:** `tencentcloud_tat_invocation_task` ([#1692](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1692))
+* **New Data Source:** `tencentcloud_tcr_describe_webhook_trigger_logs` ([#1695](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1695))
+* **New Resource:** `tencentcloud_ipv6_address_bandwidth` ([#1702](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1702))
+* **New Resource:** `tencentcloud_kubernetes_backup_storage_location` ([#1691](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1691))
+* **New Resource:** `tencentcloud_lighthouse_apply_instance_snapshot` ([#1693](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1693))
+* **New Resource:** `tencentcloud_lighthouse_snapshot` ([#1693](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1693))
+* **New Resource:** `tencentcloud_monitor_tmp_grafana_config` ([#1699](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1699))
+* **New Resource:** `tencentcloud_tcr_manage_replication_operation` ([#1700](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1700))
+* **New Resource:** `tencentcloud_tcr_webhook_trigger` ([#1695](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1695))
+
+ENHANCEMENTS:
+
+* resource/tencentcloud_eip: support update `internet_charge_type` ([#1702](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1702))
+* resource/tencentcloud_elasticsearch_instance: affect `es_acl` when first apply ([#1697](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1697))
+* resource/tencentcloud_monitor_grafana_instance: Query results support `internet_url`, `internal_url` ([#1699](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1699))
+
 ## 1.80.5 (April 21 2023)
 
 FEATURES: