docs: fix examples for cms, fc, threat_detection

aliyun · Nov 5, 2024 · 1072059 · 1072059
1 parent 5c83992
commit 1072059
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 73 deletions.
diff --git a/website/docs/r/cms_hybrid_monitor_fc_task.html.markdown b/website/docs/r/cms_hybrid_monitor_fc_task.html.markdown
@@ -40,23 +40,24 @@ resource "alicloud_cms_namespace" "default" {
 resource "alicloud_cms_hybrid_monitor_fc_task" "default" {
   namespace      = alicloud_cms_namespace.default.id
   yarm_config    = <<EOF
+---
 products:
-- namespace: acs_ecs_dashboard
+- namespace: "acs_ecs_dashboard"
   metric_info:
   - metric_list:
-    - cpu_total
-    - cpu_idle
-    - diskusage_utilization
-    - CPUUtilization
-    - DiskReadBPS
-    - InternetOut
-    - IntranetOut
-    - cpu_system
-- namespace: acs_rds_dashboard
+    - "CPUUtilization"
+    - "DiskReadBPS"
+    - "InternetOut"
+    - "IntranetOut"
+    - "cpu_idle"
+    - "cpu_system"
+    - "cpu_total"
+    - "diskusage_utilization"
+- namespace: "acs_rds_dashboard"
   metric_info:
   - metric_list:
-    - MySQL_QPS
-    - MySQL_TPS
+    - "MySQL_QPS"
+    - "MySQL_TPS"
 EOF
   target_user_id = data.alicloud_account.default.id
 }

diff --git a/website/docs/r/fc_trigger.html.markdown b/website/docs/r/fc_trigger.html.markdown
@@ -427,47 +427,68 @@ resource "alicloud_fc_trigger" "oss_trigger" {
   function = alicloud_fc_function.default.name
   name     = "terraform-example-oss"
   type     = "eventbridge"
-  config   = <<EOF
+  config = jsonencode(
     {
-        "triggerEnable": false,
-        "asyncInvocationType": false,
-        "eventRuleFilterPattern": {
-          "source":[
-            "acs.oss"
-            ],
-            "type":[
-              "oss:BucketCreated:PutBucket"
-            ]
-        },
-        "eventSourceConfig": {
-            "eventSourceType": "Default"
+      "triggerEnable" : false,
+      "asyncInvocationType" : false,
+      "eventSourceConfig" : {
+        "eventSourceType" : "Default"
+      },
+      "eventRuleFilterPattern" : "{\"source\":[\"acs.oss\"],\"type\":[\"oss:BucketCreated:PutBucket\"]}",
+      "eventSinkConfig" : {
+        "deliveryOption" : {
+          "mode" : "event-driven",
+          "eventSchema" : "CloudEvents"
         }
+      },
+      "runOptions" : {
+        "retryStrategy" : {
+          "PushRetryStrategy" : "BACKOFF_RETRY"
+        },
+        "errorsTolerance" : "ALL",
+        "mode" : "event-driven"
+      }
     }
-EOF
+  )
+
+
 }
 
 resource "alicloud_fc_trigger" "mns_trigger" {
   service  = alicloud_fc_service.default.name
   function = alicloud_fc_function.default.name
   name     = "terraform-example-mns"
   type     = "eventbridge"
-  config   = <<EOF
+  config = jsonencode(
     {
-        "triggerEnable": false,
-        "asyncInvocationType": false,
-        "eventRuleFilterPattern": "{}",
-        "eventSourceConfig": {
-            "eventSourceType": "MNS",
-            "eventSourceParameters": {
-                "sourceMNSParameters": {
-                    "RegionId": "cn-hangzhou",
-                    "QueueName": "mns-queue",
-                    "IsBase64Decode": true
-                }
-            }
+      "triggerEnable" : false,
+      "asyncInvocationType" : false,
+      "eventSourceConfig" : {
+        "eventSourceType" : "MNS",
+        "eventSourceParameters" : {
+          "sourceMNSParameters" : {
+            "RegionId" : "${data.alicloud_regions.default.regions.0.id}",
+            "QueueName" : "mns-queue",
+            "IsBase64Decode" : true
+          }
         }
+      },
+      "eventRuleFilterPattern" : "{}",
+      "eventSinkConfig" : {
+        "deliveryOption" : {
+          "mode" : "event-driven",
+          "eventSchema" : "CloudEvents"
+        }
+      },
+      "runOptions" : {
+        "retryStrategy" : {
+          "PushRetryStrategy" : "BACKOFF_RETRY"
+        },
+        "errorsTolerance" : "ALL",
+        "mode" : "event-driven"
+      }
     }
-EOF
+  )
 }
 
 resource "alicloud_ons_instance" "default" {
@@ -491,27 +512,40 @@ resource "alicloud_fc_trigger" "rocketmq_trigger" {
   function = alicloud_fc_function.default.name
   name     = "terraform-example-rocketmq"
   type     = "eventbridge"
-  config   = <<EOF
+  config = jsonencode(
     {
-        "triggerEnable": false,
-        "asyncInvocationType": false,
-        "eventRuleFilterPattern": "{}",
-        "eventSourceConfig": {
-            "eventSourceType": "RocketMQ",
-            "eventSourceParameters": {
-                "sourceRocketMQParameters": {
-                    "RegionId": "${data.alicloud_regions.default.regions.0.id}",
-                    "InstanceId": "${alicloud_ons_instance.default.id}",
-                    "GroupID": "${alicloud_ons_group.default.group_name}",
-                    "Topic": "${alicloud_ons_topic.default.topic_name}",
-                    "Timestamp": 1686296162,
-                    "Tag": "example-tag",
-                    "Offset": "CONSUME_FROM_LAST_OFFSET"
-                }
-            }
+      "triggerEnable" : false,
+      "asyncInvocationType" : false,
+      "eventRuleFilterPattern" : "{}",
+      "eventSinkConfig" : {
+        "deliveryOption" : {
+          "mode" : "event-driven",
+          "eventSchema" : "CloudEvents"
+        }
+      },
+      "eventSourceConfig" : {
+        "eventSourceType" : "RocketMQ",
+        "eventSourceParameters" : {
+          "sourceRocketMQParameters" : {
+            "RegionId" : "${data.alicloud_regions.default.regions.0.id}",
+            "InstanceId" : "${alicloud_ons_instance.default.id}",
+            "GroupID" : "${alicloud_ons_group.default.group_name}",
+            "Topic" : "${alicloud_ons_topic.default.topic_name}",
+            "Timestamp" : 1686296162,
+            "Tag" : "example-tag",
+            "Offset" : "CONSUME_FROM_LAST_OFFSET"
+          }
         }
+      },
+      "runOptions" : {
+        "retryStrategy" : {
+          "PushRetryStrategy" : "BACKOFF_RETRY"
+        },
+        "errorsTolerance" : "ALL",
+        "mode" : "event-driven"
+      }
     }
-EOF
+  )
 }
 
 resource "alicloud_amqp_instance" "default" {
@@ -541,24 +575,37 @@ resource "alicloud_fc_trigger" "rabbitmq_trigger" {
   function = alicloud_fc_function.default.name
   name     = "terraform-example-rabbitmq"
   type     = "eventbridge"
-  config   = <<EOF
+  config = jsonencode(
     {
-        "triggerEnable": false,
-        "asyncInvocationType": false,
-        "eventRuleFilterPattern": "{}",
-        "eventSourceConfig": {
-            "eventSourceType": "RabbitMQ",
-            "eventSourceParameters": {
-                "sourceRabbitMQParameters": {
-                    "RegionId": "${data.alicloud_regions.default.regions.0.id}",
-                    "InstanceId": "${alicloud_amqp_instance.default.id}",
-                    "VirtualHostName": "${alicloud_amqp_virtual_host.default.virtual_host_name}",
-                    "QueueName": "${alicloud_amqp_queue.default.queue_name}"
-                }
-            }
+      "triggerEnable" : false,
+      "asyncInvocationType" : false,
+      "eventRuleFilterPattern" : "{}",
+      "eventSourceConfig" : {
+        "eventSourceType" : "RabbitMQ",
+        "eventSourceParameters" : {
+          "sourceRabbitMQParameters" : {
+            "RegionId" : "${data.alicloud_regions.default.regions.0.id}",
+            "InstanceId" : "${alicloud_amqp_instance.default.id}",
+            "VirtualHostName" : "${alicloud_amqp_virtual_host.default.virtual_host_name}",
+            "QueueName" : "${alicloud_amqp_queue.default.queue_name}"
+          }
+        }
+      },
+      "eventSinkConfig" : {
+        "deliveryOption" : {
+          "mode" : "event-driven",
+          "eventSchema" : "CloudEvents"
         }
+      },
+      "runOptions" : {
+        "retryStrategy" : {
+          "PushRetryStrategy" : "BACKOFF_RETRY"
+        },
+        "errorsTolerance" : "ALL",
+        "mode" : "event-driven"
+      }
     }
-EOF
+  )
 }
 ```
 

diff --git a/website/docs/r/threat_detection_honeypot_preset.html.markdown b/website/docs/r/threat_detection_honeypot_preset.html.markdown
@@ -45,6 +45,7 @@ resource "alicloud_threat_detection_honeypot_preset" "default" {
   meta {
     portrait_option = true
     burp            = "open"
+    trojan_git      = "open"
   }
 }
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
       meta {
         portrait_option = true
         burp            = "open"
+        trojan_git      = "open"
       }
     }
     ```
@@ Expand Down @@