feat/cfw #2149

SevenEarth · 2023-09-25T11:14:20Z

feat/cfw

andrew-tx · 2023-09-28T12:13:39Z

go.mod

@@ -100,7 +100,10 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )

-require github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.754
+require (


这里为啥要单独一个 require 呢

这是go mod自动生成的非人为

andrew-tx · 2023-09-28T12:22:59Z

tencentcloud/data_source_tc_cfw_nat_fw_switches.go

+		natInsId = v.(string)
+	}
+
+	if v, _ := d.GetOkExists("status"); v != nil {


好上面使用的 GetOk，什么情况下使用 GetOkExists ，什么情况下使用 GetOk 呢

一般包含0 false 这种参数就需要用GetOkExists 正常字符串用GetOk

andrew-tx · 2023-09-28T12:25:54Z

tencentcloud/extension_cfw.go

+	"ap-taipei-6":        "中国台北六区",
+}
+
+var ZONE_MAP_CN2EN = map[string]string{


ZONE目前是写死的是吧，后面如果扩Zone后，这里要更新吗

这些是全部的zone映射，如果后续扩zone，这里需要更新

andrew-tx · 2023-09-28T12:31:05Z

tencentcloud/resource_tc_cfw_vpc_policy.go

+		return err
+	}
+
+	ruleUuid := *response.Response.RuleUuids[0]


response.Response.RuleUuids可能为空吗

只要err为nil RuleUuids就不为空

andrew-tx · 2023-09-28T12:31:48Z

tencentcloud/resource_tc_cfw_vpc_policy_test.go

+		Steps: []resource.TestStep{
+			{
+				Config: testAccCfwVpcPolicy,
+				Check: resource.ComposeTestCheckFunc(


这里每个字段都check下？

andrew-tx · 2023-09-28T12:36:51Z

tencentcloud/resource_tc_cfw_nat_firewall_switch_test.go

+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_firewall_switch.example", "id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_firewall_switch.example", "nat_ins_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_firewall_switch.example", "subnet_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_firewall_switch.example", "enable"),


check下属性的值？

andrew-tx · 2023-09-28T12:42:27Z

tencentcloud/resource_tc_cfw_address_template_test.go

+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_address_template.example", "id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_address_template.example", "name"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_address_template.example", "detail"),


check下字段值

andrew-tx · 2023-09-28T12:47:09Z

tencentcloud/resource_tc_cfw_block_ignore.go

+		intrusionDefenseRule.EndTime = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("comment"); ok {


不需要判断下 hasChange吗

必填值不需要hasChange

andrew-tx · 2023-09-28T12:47:45Z

tencentcloud/resource_tc_cfw_block_ignore_test.go

+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_block_ignore_list.example", "direction"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_block_ignore_list.example", "comment"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_block_ignore_list.example", "start_time"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_block_ignore_list.example", "end_time"),


check下字段的值

andrew-tx · 2023-09-28T12:52:47Z

tencentcloud/resource_tc_cfw_address_template_test.go

+			{
+				Config: testAccCfwAddressTemplateUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_address_template.example", "id"),


Check下字段值

andrew-tx · 2023-09-28T12:55:48Z

tencentcloud/resource_tc_cfw_edge_firewall_switch_test.go

+				Config: testAccCfwEdgeFirewallSwitchUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_firewall_switch.example", "id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_firewall_switch.example", "public_ip"),


check下字段值

andrew-tx · 2023-09-28T12:57:07Z

tencentcloud/resource_tc_cfw_edge_policy.go

+		return err
+	}
+
+	ruleUuid := *response.Response.RuleUuid[0]


response.Response.RuleUuid可能为空吗

andrew-tx · 2023-09-28T12:57:37Z

tencentcloud/resource_tc_cfw_edge_policy.go

+	if v, ok := d.GetOk("description"); ok {
+		modifyRuleItem.Description = helper.String(v.(string))
+	}
+


这里应该有些字段需要加haschange判断吧

andrew-tx · 2023-09-28T12:58:00Z

tencentcloud/resource_tc_cfw_edge_policy_test.go

+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "source_type"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "target_content"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "target_type"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "protocol"),


字段值Check下

andrew-tx · 2023-09-28T12:59:50Z

tencentcloud/resource_tc_cfw_edge_firewall_switch.go

+
+	edgeIpSwitch.PublicIp = &publicIp
+
+	if v, ok := d.GetOk("subnet_id"); ok {


这里需要判断hansChange？

andrew-tx · 2023-09-28T13:00:40Z

tencentcloud/resource_tc_cfw_edge_policy_test.go

+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "protocol"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "rule_action"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "port"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_edge_policy.example", "direction"),


check字段值

andrew-tx

LGTM

andrew-tx · 2023-09-28T13:07:47Z

go.mod

 require github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.759
+>>>>>>> 980b4317f5abdb75718178af297400be12062e6e


这里有冲突了

andrew-tx · 2023-09-28T13:08:04Z

tencentcloud/provider.go

@@ -1685,8 +1685,31 @@ Waf
    tencentcloud_waf_saas_domain
    tencentcloud_waf_clb_instance
    tencentcloud_waf_saas_instance
+<<<<<<< HEAD


这里也有冲突

andrew-tx · 2023-09-28T13:39:36Z

tencentcloud/resource_tc_cfw_nat_instance_test.go

+			{
+				Config: testAccCfwNatInstance,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_instance.example", "id"),


后面补下其它字段的check逻辑

andrew-tx · 2023-09-28T13:40:44Z

tencentcloud/resource_tc_cfw_nat_policy_test.go

+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_policy.example", "target_content"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_policy.example", "target_type"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_policy.example", "protocol"),
+					resource.TestCheckResourceAttrSet("tencentcloud_cfw_nat_policy.example", "rule_action"),


后面完善用例时增加字段check逻辑

andrew-tx · 2023-09-28T13:41:39Z

tencentcloud/resource_tc_cfw_sync_asset.go

+Example Usage
+
+```hcl
+resource "tencentcloud_cfw_sync_asset" "example" {}


这个是一个Operation？

* feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw

feat/cfw

e760d81

SevenEarth requested a review from hellertang September 25, 2023 11:14

SevenEarth added 4 commits September 25, 2023 19:15

feat/cfw

2acd9a0

feat/cfw

1e7999b

feat/cfw

f200cbe

feat/cfw

0cda7bc

SevenEarth added the run check run check label Sep 27, 2023

SevenEarth added 2 commits September 28, 2023 18:07

feat/cfw

5feaa6d

feat/cfw

b020c4f

SevenEarth added run check run check and removed run check run check labels Sep 28, 2023

andrew-tx reviewed Sep 28, 2023

View reviewed changes

SevenEarth added 3 commits September 28, 2023 21:06

feat/cfw

628a320

feat/cfw

659c88b

feat/cfw

58c9a8e

andrew-tx approved these changes Sep 28, 2023

View reviewed changes

andrew-tx merged commit b186bef into master Sep 28, 2023

andrew-tx deleted the feat/cfw branch September 28, 2023 13:46

hellertang pushed a commit that referenced this pull request Oct 10, 2023

feat/cfw (#2149)

d33d025

* feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw * feat/cfw

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat/cfw #2149

feat/cfw #2149

SevenEarth commented Sep 25, 2023

andrew-tx Sep 28, 2023

SevenEarth Sep 28, 2023

andrew-tx Sep 28, 2023

SevenEarth Sep 28, 2023

andrew-tx Sep 28, 2023

SevenEarth Sep 28, 2023

andrew-tx Sep 28, 2023

SevenEarth Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

SevenEarth Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx left a comment

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023

andrew-tx Sep 28, 2023


		edgeIpSwitch.PublicIp = &publicIp

		if v, ok := d.GetOk("subnet_id"); ok {

		require github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.759
		>>>>>>> 980b4317f5abdb75718178af297400be12062e6e

feat/cfw #2149

feat/cfw #2149

Conversation

SevenEarth commented Sep 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrew-tx left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment