Skip to content

Add tags wafv2 groups #90

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

Open
LeeBrotherston wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add tags wafv2 groups #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a38f6
Entag'ify wafv2 RuleGroups
LeeBrotherston Oct 7, 2025
042abec
Remove commented code
LeeBrotherston Oct 7, 2025
6c2c122
Update docs
LeeBrotherston Oct 7, 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
8 changes: 2 additions & 6 deletions codegen/recipes/wafv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/cloudquery/plugin-sdk/codegen"
"github.com/cloudquery/plugin-sdk/schema"

"github.com/OpsHelmInc/cloudquery/resources/services/wafv2"
"github.com/OpsHelmInc/ohaws"
)

Expand Down Expand Up @@ -106,7 +107,7 @@ func WAFv2Resources() []*Resource {
},
{
SubService: "rule_groups",
Struct: &types.RuleGroup{},
Struct: &wafv2.WAFv2RuleGroupWithTags{},
Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleGroup.html",
SkipFields: []string{"ARN"},
PreResourceResolver: "getRuleGroup",
Expand All @@ -121,11 +122,6 @@ func WAFv2Resources() []*Resource {
Type: schema.TypeString,
Resolver: "client.ResolveAWSRegion",
},
{
Name: "tags",
Type: schema.TypeJSON,
Resolver: "resolveRuleGroupTags",
},
{
Name: "arn",
Type: schema.TypeString,
Expand Down
13 changes: 2 additions & 11 deletions docs/tables/aws_wafv2_rule_groups.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,7 @@ The primary key for this table is **arn**.
|_cq_parent_id|UUID|
|account_id|String|
|region|String|
|tags|JSON|
|arn (PK)|String|
|policy|JSON|
|capacity|Int|
|id|String|
|name|String|
|visibility_config|JSON|
|available_labels|JSON|
|consumed_labels|JSON|
|custom_response_bodies|JSON|
|description|String|
|label_namespace|String|
|rules|JSON|
|rule_group|JSON|
|tags|JSON|
53 changes: 4 additions & 49 deletions resources/services/wafv2/rule_groups.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 18 additions & 20 deletions resources/services/wafv2/rule_groups_fetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ func fetchWafv2RuleGroups(ctx context.Context, meta schema.ClientMeta, parent *s
return nil
}

type WAFv2RuleGroupWithTags struct {
types.RuleGroup
Tags []types.Tag
}

func getRuleGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error {
c := meta.(*client.Client)
svc := c.Services().Wafv2
Expand All @@ -48,36 +53,29 @@ func getRuleGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.
return err
}

resource.Item = ruleGroup.RuleGroup
return nil
}

func resolveRuleGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {
ruleGroup := resource.Item.(*types.RuleGroup)

cl := meta.(*client.Client)
service := cl.Services().Wafv2
resourceWithTags := &WAFv2RuleGroupWithTags{
RuleGroup: *ruleGroup.RuleGroup,
}

// Resolve tags
outputTags := make(map[string]*string)
tagsConfig := wafv2.ListTagsForResourceInput{ResourceARN: ruleGroup.ARN}
tagParams := wafv2.ListTagsForResourceInput{ResourceARN: ruleGroup.RuleGroup.ARN}
for {
tags, err := service.ListTagsForResource(ctx, &tagsConfig)
result, err := svc.ListTagsForResource(ctx, &tagParams)
if err != nil {
return err
}
for _, t := range tags.TagInfoForResource.TagList {
outputTags[*t.Key] = t.Value
}
if aws.ToString(tags.NextMarker) == "" {
resourceWithTags.Tags = append(resourceWithTags.Tags, result.TagInfoForResource.TagList...)
if aws.ToString(result.NextMarker) == "" {
break
}
tagsConfig.NextMarker = tags.NextMarker
tagParams.NextMarker = result.NextMarker
}
return resource.Set(c.Name, outputTags)

resource.SetItem(resourceWithTags)
return nil
}

func resolveWafv2ruleGroupPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {
ruleGroup := resource.Item.(*types.RuleGroup)
ruleGroup := resource.Item.(*WAFv2RuleGroupWithTags)

cl := meta.(*client.Client)
service := cl.Services().Wafv2
Expand Down