Skip to content

fix(cls): [137249923] fix cls_config while extract_rule is nil #3266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2025
Merged

fix(cls): [137249923] fix cls_config while extract_rule is nil #3266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a22959
fix cls config
hellertang Apr 3, 2025
30d006f
fix cls config
hellertang Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3266.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_cls_config: fix create error while `extract_rule` is nil
```
118 changes: 53 additions & 65 deletions tencentcloud/services/cls/resource_tc_cls_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cls

import (
"context"
"fmt"
"log"

tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
Expand Down Expand Up @@ -224,27 +223,23 @@ func resourceTencentCloudClsConfigCreate(d *schema.ResourceData, meta interface{
if v, ok := d.GetOk("log_type"); ok {
request.LogType = helper.String(v.(string))
}
if v, ok := d.GetOk("extract_rule"); ok {
extractRules := make([]*cls.ExtractRuleInfo, 0, 10)
if len(v.([]interface{})) != 1 {
return fmt.Errorf("need only one extract rule.")
}

if dMap, ok := helper.InterfacesHeadMap(d, "extract_rule"); ok {
extractRule := cls.ExtractRuleInfo{}
dMap := v.([]interface{})[0].(map[string]interface{})
if v, ok := dMap["time_key"]; ok {
extractRule.TimeKey = helper.String(v.(string))
if v, ok := dMap["time_key"].(string); ok && v != "" {
extractRule.TimeKey = helper.String(v)
}
if v, ok := dMap["time_format"]; ok {
extractRule.TimeFormat = helper.String(v.(string))
if v, ok := dMap["time_format"].(string); ok && v != "" {
extractRule.TimeFormat = helper.String(v)
}
if v, ok := dMap["delimiter"]; ok {
extractRule.Delimiter = helper.String(v.(string))
if v, ok := dMap["delimiter"].(string); ok && v != "" {
extractRule.Delimiter = helper.String(v)
}
if v, ok := dMap["log_regex"]; ok {
extractRule.LogRegex = helper.String(v.(string))
if v, ok := dMap["log_regex"].(string); ok && v != "" {
extractRule.LogRegex = helper.String(v)
}
if v, ok := dMap["begin_regex"]; ok {
extractRule.BeginRegex = helper.String(v.(string))
if v, ok := dMap["begin_regex"].(string); ok && v != "" {
extractRule.BeginRegex = helper.String(v)
}
if v, ok := dMap["keys"]; ok {
keys := v.(*schema.Set).List()
Expand All @@ -270,8 +265,8 @@ func resourceTencentCloudClsConfigCreate(d *schema.ResourceData, meta interface{
if v, ok := dMap["un_match_up_load_switch"]; ok {
extractRule.UnMatchUpLoadSwitch = helper.Bool(v.(bool))
}
if v, ok := dMap["un_match_log_key"]; ok {
extractRule.UnMatchLogKey = helper.String(v.(string))
if v, ok := dMap["un_match_log_key"].(string); ok && v != "" {
extractRule.UnMatchLogKey = helper.String(v)
}
if v, ok := dMap["backtracking"]; ok {
extractRule.Backtracking = helper.IntInt64(v.(int))
Expand All @@ -282,20 +277,20 @@ func resourceTencentCloudClsConfigCreate(d *schema.ResourceData, meta interface{
if v, ok := dMap["json_standard"]; ok {
extractRule.JsonStandard = helper.IntInt64(v.(int))
}
if v, ok := dMap["protocol"]; ok {
extractRule.Protocol = helper.String(v.(string))
if v, ok := dMap["protocol"].(string); ok && v != "" {
extractRule.Protocol = helper.String(v)
}
if v, ok := dMap["address"]; ok {
extractRule.Address = helper.String(v.(string))
if v, ok := dMap["address"].(string); ok && v != "" {
extractRule.Address = helper.String(v)
}
if v, ok := dMap["parse_protocol"]; ok {
extractRule.ParseProtocol = helper.String(v.(string))
if v, ok := dMap["parse_protocol"].(string); ok && v != "" {
extractRule.ParseProtocol = helper.String(v)
}
if v, ok := dMap["metadata_type"]; ok {
extractRule.MetadataType = helper.IntInt64(v.(int))
}
if v, ok := dMap["path_regex"]; ok {
extractRule.PathRegex = helper.String(v.(string))
if v, ok := dMap["path_regex"].(string); ok && v != "" {
extractRule.PathRegex = helper.String(v)
}
if v, ok := dMap["meta_tags"]; ok {
for _, item := range v.([]interface{}) {
Expand All @@ -310,19 +305,18 @@ func resourceTencentCloudClsConfigCreate(d *schema.ResourceData, meta interface{
extractRule.MetaTags = append(extractRule.MetaTags, &metaTagInfo)
}
}
extractRules = append(extractRules, &extractRule)
request.ExtractRule = extractRules[0]
request.ExtractRule = &extractRule
}
if v, ok := d.GetOk("exclude_paths"); ok {
excludePaths := make([]*cls.ExcludePathInfo, 0, 10)
for _, item := range v.([]interface{}) {
dMap := item.(map[string]interface{})
excludePath := cls.ExcludePathInfo{}
if v, ok := dMap["type"]; ok {
excludePath.Type = helper.String(v.(string))
if v, ok := dMap["type"].(string); ok && v != "" {
excludePath.Type = helper.String(v)
}
if v, ok := dMap["value"]; ok {
excludePath.Value = helper.String(v.(string))
if v, ok := dMap["value"].(string); ok && v != "" {
excludePath.Value = helper.String(v)
}
excludePaths = append(excludePaths, &excludePath)
}
Expand Down Expand Up @@ -553,27 +547,22 @@ func resourceTencentCloudClsConfigUpdate(d *schema.ResourceData, meta interface{
if v, ok := d.GetOk("log_type"); ok {
request.LogType = helper.String(v.(string))
}
if v, ok := d.GetOk("extract_rule"); ok {
extractRules := make([]*cls.ExtractRuleInfo, 0, 10)
if len(v.([]interface{})) != 1 {
return fmt.Errorf("need only one extract rule.")
}
if dMap, ok := helper.InterfacesHeadMap(d, "extract_rule"); ok {
extractRule := cls.ExtractRuleInfo{}
dMap := v.([]interface{})[0].(map[string]interface{})
if v, ok := dMap["time_key"]; ok {
extractRule.TimeKey = helper.String(v.(string))
if v, ok := dMap["time_key"].(string); ok && v != "" {
extractRule.TimeKey = helper.String(v)
}
if v, ok := dMap["time_format"]; ok {
extractRule.TimeFormat = helper.String(v.(string))
if v, ok := dMap["time_format"].(string); ok && v != "" {
extractRule.TimeFormat = helper.String(v)
}
if v, ok := dMap["delimiter"]; ok {
extractRule.Delimiter = helper.String(v.(string))
if v, ok := dMap["delimiter"].(string); ok && v != "" {
extractRule.Delimiter = helper.String(v)
}
if v, ok := dMap["log_regex"]; ok {
extractRule.LogRegex = helper.String(v.(string))
if v, ok := dMap["log_regex"].(string); ok && v != "" {
extractRule.LogRegex = helper.String(v)
}
if v, ok := dMap["begin_regex"]; ok {
extractRule.BeginRegex = helper.String(v.(string))
if v, ok := dMap["begin_regex"].(string); ok && v != "" {
extractRule.BeginRegex = helper.String(v)
}
if v, ok := dMap["keys"]; ok {
keys := v.(*schema.Set).List()
Expand All @@ -599,8 +588,8 @@ func resourceTencentCloudClsConfigUpdate(d *schema.ResourceData, meta interface{
if v, ok := dMap["un_match_up_load_switch"]; ok {
extractRule.UnMatchUpLoadSwitch = helper.Bool(v.(bool))
}
if v, ok := dMap["un_match_log_key"]; ok {
extractRule.UnMatchLogKey = helper.String(v.(string))
if v, ok := dMap["un_match_log_key"].(string); ok && v != "" {
extractRule.UnMatchLogKey = helper.String(v)
}
if v, ok := dMap["backtracking"]; ok {
extractRule.Backtracking = helper.IntInt64(v.(int))
Expand All @@ -611,20 +600,20 @@ func resourceTencentCloudClsConfigUpdate(d *schema.ResourceData, meta interface{
if v, ok := dMap["json_standard"]; ok {
extractRule.JsonStandard = helper.IntInt64(v.(int))
}
if v, ok := dMap["protocol"]; ok {
extractRule.Protocol = helper.String(v.(string))
if v, ok := dMap["protocol"].(string); ok && v != "" {
extractRule.Protocol = helper.String(v)
}
if v, ok := dMap["address"]; ok {
extractRule.Address = helper.String(v.(string))
if v, ok := dMap["address"].(string); ok && v != "" {
extractRule.Address = helper.String(v)
}
if v, ok := dMap["parse_protocol"]; ok {
extractRule.ParseProtocol = helper.String(v.(string))
if v, ok := dMap["parse_protocol"].(string); ok && v != "" {
extractRule.ParseProtocol = helper.String(v)
}
if v, ok := dMap["metadata_type"]; ok {
extractRule.MetadataType = helper.IntInt64(v.(int))
}
if v, ok := dMap["path_regex"]; ok {
extractRule.PathRegex = helper.String(v.(string))
if v, ok := dMap["path_regex"].(string); ok && v != "" {
extractRule.PathRegex = helper.String(v)
}
if v, ok := dMap["meta_tags"]; ok {
for _, item := range v.([]interface{}) {
Expand All @@ -639,8 +628,7 @@ func resourceTencentCloudClsConfigUpdate(d *schema.ResourceData, meta interface{
extractRule.MetaTags = append(extractRule.MetaTags, &metaTagInfo)
}
}
extractRules = append(extractRules, &extractRule)
request.ExtractRule = extractRules[0]
request.ExtractRule = &extractRule
}
}
if d.HasChange("exclude_paths") {
Expand All @@ -649,11 +637,11 @@ func resourceTencentCloudClsConfigUpdate(d *schema.ResourceData, meta interface{
for _, item := range v.([]interface{}) {
dMap := item.(map[string]interface{})
excludePath := cls.ExcludePathInfo{}
if v, ok := dMap["type"]; ok {
excludePath.Type = helper.String(v.(string))
if v, ok := dMap["type"].(string); ok && v != "" {
excludePath.Type = helper.String(v)
}
if v, ok := dMap["value"]; ok {
excludePath.Value = helper.String(v.(string))
if v, ok := dMap["value"].(string); ok && v != "" {
excludePath.Value = helper.String(v)
}
excludePaths = append(excludePaths, &excludePath)
}
Expand Down
Loading