logservice audit support resource directory #3983

lichengseu · 2021-09-08T07:35:20Z

log audit service of log_service support resource directory

CLAassistant · 2021-09-08T07:35:23Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

licheng seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

xinmu0426 · 2021-09-08T11:40:05Z

alicloud/resource_alicloud_log_audit.go

@@ -61,7 +66,22 @@ func resourceAlicloudLogAuditUpdate(d *schema.ResourceData, meta interface{}) er

 	var variableMap = map[string]interface{}{}
 	mutiAccount := expandStringList(d.Get("multi_account").(*schema.Set).List())
-	if len(mutiAccount) > 0 {
+	resourceDirectoryType := d.Get("resource_directory_type").(string)


这里用d.getOk 或者判断下 resourceDirectoryType是否为 nil

这个地方需要按照如上的意见修改

这里d.Get()方法的实现里已经包了getok，所以不用担心nil的情况。

这个不一样，如果得到是 nil，那么直接转 string 会报错，改为 d.GetOk

这里d.Get()其实就是d.GetOK，如果这个参数是nil，会返回""的

这个地方是没有判断是否有 key 这个值存在的，返回的v有可能就是空，这个必须改

xinmu0426 · 2021-09-08T11:41:48Z

alicloud/resource_alicloud_log_audit.go

@@ -131,13 +151,29 @@ func resourceAlicloudLogAuditRead(d *schema.ResourceData, meta interface{}) erro
 	}
 	d.Set("display_name", displayName)
 	d.Set("aliuid", initMap["aliuid"].(string))
+	d.Set("multi_account", make([]string, 0))


这块是不是有问题

这个有问题，不要设置空的值

已修改，去除该行

xinmu0426 · 2021-09-08T11:43:06Z

alicloud/resource_alicloud_log_audit.go

@@ -148,6 +184,7 @@ func resourceAlicloudLogAuditRead(d *schema.ResourceData, meta interface{}) erro
 	delete(initMap, "project")
 	delete(initMap, "logstore")
 	delete(initMap, "multi_account")
+	delete(initMap, "resource_directory")
 	d.Set("variable_map", initMap)
 	return nil
 }


在写一个针对这个字段的测试用例

测试用例已补充到alicloud/resource_alicloud_log_audit_test.go中

xiaozhu36 · 2021-09-09T08:54:18Z

alicloud/resource_alicloud_log_audit.go

+
+	if len(resourceDirectoryType) > 0 {
+		if strings.ToLower(resourceDirectoryType) != "custom" && strings.ToLower(resourceDirectoryType) != "all" {
+			return WrapError(errors.New("Invalid resource_directory_type, must be one of 'custom' or 'all'"))


这个地方不要这么写，直接在schema中定义validation 就行

xiaozhu36 · 2021-09-09T08:54:43Z

alicloud/resource_alicloud_log_audit.go

@@ -131,13 +151,29 @@ func resourceAlicloudLogAuditRead(d *schema.ResourceData, meta interface{}) erro
 	}
 	d.Set("display_name", displayName)
 	d.Set("aliuid", initMap["aliuid"].(string))
+	d.Set("multi_account", make([]string, 0))


这个有问题，不要设置空的值

xiaozhu36 · 2021-09-09T14:36:26Z

alicloud/resource_alicloud_log_audit.go

@@ -61,7 +66,22 @@ func resourceAlicloudLogAuditUpdate(d *schema.ResourceData, meta interface{}) er

 	var variableMap = map[string]interface{}{}
 	mutiAccount := expandStringList(d.Get("multi_account").(*schema.Set).List())
-	if len(mutiAccount) > 0 {
+	resourceDirectoryType := d.Get("resource_directory_type").(string)


这个地方需要按照如上的意见修改

xiaozhu36 · 2021-09-09T14:36:48Z

alicloud/resource_alicloud_log_audit_test.go

+						"resource_directory_type": "custom",
+					}),
+				),
+			},
 		},
 	})
 }


请在文档中补充新的属性

xiaozhu36 · 2021-09-10T07:11:11Z

alicloud/resource_alicloud_log_audit.go

@@ -61,7 +66,22 @@ func resourceAlicloudLogAuditUpdate(d *schema.ResourceData, meta interface{}) er

 	var variableMap = map[string]interface{}{}
 	mutiAccount := expandStringList(d.Get("multi_account").(*schema.Set).List())
-	if len(mutiAccount) > 0 {
+	resourceDirectoryType := d.Get("resource_directory_type").(string)


这个不一样，如果得到是 nil，那么直接转 string 会报错，改为 d.GetOk

xiaozhu36 · 2021-09-10T07:12:06Z

website/docs/r/log_audit.html.markdown

@@ -277,6 +305,7 @@ The following arguments are supported:

    - `k8s_ingress_ttl` - (Optional) K8s ingress log ttl. Default 180.
 * `multi_account` - (Optional) Multi-account configuration, please fill in multiple aliuid.
+* `resource_directory_type` - (Optional) Resource Directory type. Optional values are all or custom. If the value is custom, argument multi_account should be provided.


在括号中增加一个 Availeble的tag：(Optional, Available in 1.135.0+)

xiaozhu36 · 2021-09-11T00:37:39Z

alicloud/resource_alicloud_log_audit.go

@@ -61,7 +66,22 @@ func resourceAlicloudLogAuditUpdate(d *schema.ResourceData, meta interface{}) er

 	var variableMap = map[string]interface{}{}
 	mutiAccount := expandStringList(d.Get("multi_account").(*schema.Set).List())
-	if len(mutiAccount) > 0 {
+	resourceDirectoryType := d.Get("resource_directory_type").(string)


这个地方是没有判断是否有 key 这个值存在的，返回的v有可能就是空，这个必须改

set default value for muti_account and rd_enabled change keyword rd_enabled to rd_type handle invalid rd_type add exception handler for no type field add testcase for resource_directory_type param remove unnecessary set for multi_account mv rd_type validation to schema modify doc for new argument add available tag for log_audit doc use GetOK for arugument rd_type

xinmu0426 reviewed Sep 8, 2021

View reviewed changes

xiaozhu36 requested changes Sep 9, 2021

View reviewed changes

xiaozhu36 requested changes Sep 10, 2021

View reviewed changes

xiaozhu36 requested changes Sep 11, 2021

View reviewed changes

xiaozhu36 merged commit 8a6d422 into aliyun:master Sep 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

logservice audit support resource directory #3983

logservice audit support resource directory #3983

lichengseu commented Sep 8, 2021

CLAassistant commented Sep 8, 2021

xinmu0426 Sep 8, 2021

xiaozhu36 Sep 9, 2021

lichengseu Sep 9, 2021

xiaozhu36 Sep 10, 2021

lichengseu Sep 10, 2021

xiaozhu36 Sep 11, 2021

xinmu0426 Sep 8, 2021

xiaozhu36 Sep 9, 2021

lichengseu Sep 9, 2021

xinmu0426 Sep 8, 2021

lichengseu Sep 9, 2021

xiaozhu36 Sep 9, 2021

lichengseu Sep 10, 2021

xiaozhu36 Sep 9, 2021

xiaozhu36 Sep 9, 2021

xiaozhu36 Sep 9, 2021

lichengseu Sep 9, 2021

xiaozhu36 Sep 10, 2021

xiaozhu36 Sep 10, 2021

lichengseu Sep 10, 2021

xiaozhu36 Sep 11, 2021

logservice audit support resource directory #3983

logservice audit support resource directory #3983

Conversation

lichengseu commented Sep 8, 2021

CLAassistant commented Sep 8, 2021

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