Skip to content
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

fix(vpc): [137216849] tencentcloud_vpc_flow_log support CCN type #3106

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+70 −27
Open

fix(vpc): [137216849] tencentcloud_vpc_flow_log support CCN type #3106

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
4e039b5
add
SevenEarth Jan 23, 2025
799da64
add
SevenEarth Jan 23, 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/3106.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_vpc_flow_log: support CCN type
```
61 changes: 34 additions & 27 deletions tencentcloud/services/fl/resource_tc_vpc_flow_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"
"log"
"regexp"
"strings"

tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
Expand Down Expand Up @@ -110,13 +109,14 @@ func resourceTencentCloudVpcFlowLogCreate(d *schema.ResourceData, meta interface
defer tccommon.LogElapsed("resource.tencentcloud_vpc_flow_log.create")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
request = vpc.NewCreateFlowLogRequest()
response = vpc.NewCreateFlowLogResponse()
flowLogId string
vpcId string
)

if v, ok := d.GetOk("flow_log_name"); ok {
request.FlowLogName = helper.String(v.(string))
}
Expand All @@ -135,6 +135,7 @@ func resourceTencentCloudVpcFlowLogCreate(d *schema.ResourceData, meta interface

if v, ok := d.GetOk("vpc_id"); ok {
request.VpcId = helper.String(v.(string))
vpcId = v.(string)
}

if v, ok := d.GetOk("flow_log_description"); ok {
Expand All @@ -154,9 +155,11 @@ func resourceTencentCloudVpcFlowLogCreate(d *schema.ResourceData, meta interface
if v, ok := dMap["storage_id"]; ok {
flowLogStorage.StorageId = helper.String(v.(string))
}

if v, ok := dMap["storage_topic"]; ok {
flowLogStorage.StorageTopic = helper.String(v.(string))
}

request.FlowLogStorage = &flowLogStorage
}

Expand All @@ -171,9 +174,15 @@ func resourceTencentCloudVpcFlowLogCreate(d *schema.ResourceData, meta interface
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}

if result == nil || result.Response == nil {
return resource.NonRetryableError(fmt.Errorf("Create vpc flowLog failed, Response is nil."))
}

response = result
return nil
})

if err != nil {
log.Printf("[CRITAL]%s create vpc flowLog failed, reason:%+v", logId, err)
return err
Expand All @@ -184,8 +193,7 @@ func resourceTencentCloudVpcFlowLogCreate(d *schema.ResourceData, meta interface
}

flowLogId = *response.Response.FlowLog[0].FlowLogId

resourceTencentCloudSetFlowLogId(d, flowLogId, d.Get("vpc_id").(string))
d.SetId(strings.Join([]string{flowLogId, vpcId}, tccommon.FILED_SP))

if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
client := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
Expand All @@ -205,19 +213,18 @@ func resourceTencentCloudVpcFlowLogRead(d *schema.ResourceData, meta interface{}
defer tccommon.LogElapsed("resource.tencentcloud_vpc_flow_log.read")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)

ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)

service := svcvpc.NewVpcService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
var (
logId = tccommon.GetLogId(tccommon.ContextNil)
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
service = svcvpc.NewVpcService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
)

flowLogId, vpcId, err := resourceTencentCloudGetFlowLogId(d)

if err != nil {
return err
}

flowLog, err := service.DescribeVpcFlowLogById(ctx, flowLogId, vpcId)
flowLog, err := service.DescribeVpcFlowLogsById(ctx, flowLogId, vpcId)
if err != nil {
return err
}
Expand Down Expand Up @@ -295,13 +302,13 @@ func resourceTencentCloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface
defer tccommon.LogElapsed("resource.tencentcloud_vpc_flow_log.update")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)

request := vpc.NewModifyFlowLogAttributeRequest()
var (
logId = tccommon.GetLogId(tccommon.ContextNil)
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
request = vpc.NewModifyFlowLogAttributeRequest()
)

flowLogId, vpcId, err := resourceTencentCloudGetFlowLogId(d)

if err != nil {
return err
}
Expand Down Expand Up @@ -335,14 +342,18 @@ func resourceTencentCloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface
}

request.FlowLogId = &flowLogId
request.VpcId = &vpcId
if vpcId != "" {
request.VpcId = &vpcId
}

err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyFlowLogAttribute(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}

return nil
})

Expand Down Expand Up @@ -372,12 +383,13 @@ func resourceTencentCloudVpcFlowLogDelete(d *schema.ResourceData, meta interface
defer tccommon.LogElapsed("resource.tencentcloud_vpc_flow_log.delete")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
var (
logId = tccommon.GetLogId(tccommon.ContextNil)
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
service = svcvpc.NewVpcService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
)

service := svcvpc.NewVpcService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
flowLogId, vpcId, err := resourceTencentCloudGetFlowLogId(d)

if err != nil {
return err
}
Expand All @@ -395,11 +407,6 @@ func resourceTencentCloudSetFlowLogId(d *schema.ResourceData, id, vpcId string)

func resourceTencentCloudGetFlowLogId(d *schema.ResourceData) (id, vpcId string, err error) {
rawId := d.Id()
rawIdRE := regexp.MustCompile(`^fl-[0-9a-z]{8}#vpc-[0-9a-z]{8}$`)
if !rawIdRE.MatchString(rawId) {
err = fmt.Errorf("invalid id format %s, expect `fl-xxxxxxxx#vpc-xxxxxxxx`", rawId)
return
}
ids := strings.Split(rawId, tccommon.FILED_SP)
id = ids[0]
vpcId = ids[1]
Expand Down
33 changes: 33 additions & 0 deletions tencentcloud/services/vpc/service_tencentcloud_vpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5750,6 +5750,39 @@ func (me *VpcService) DescribeVpcFlowLogById(ctx context.Context, flowLogId, vpc
return
}

func (me *VpcService) DescribeVpcFlowLogsById(ctx context.Context, flowLogId, vpcId string) (FlowLog *vpc.FlowLog, errRet error) {
logId := tccommon.GetLogId(ctx)

request := vpc.NewDescribeFlowLogsRequest()
request.FlowLogId = &flowLogId

if vpcId != "" {
request.VpcId = &vpcId
}

defer func() {
if errRet != nil {
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseVpcClient().DescribeFlowLogs(request)
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if len(response.Response.FlowLog) < 1 {
return
}

FlowLog = response.Response.FlowLog[0]
return
}

func (me *VpcService) DeleteVpcFlowLogById(ctx context.Context, flowLogId, vpcId string) (errRet error) {
logId := tccommon.GetLogId(ctx)

Expand Down
Loading