Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 66 additions & 0 deletions aws/cloudwatchlogs.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package aws

import (
"context"
"log"

awssdk "github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
"github.com/noclickops/common"
)

type CloudwatchLogsClient interface {
ListLogGroups(ctx context.Context, params *cloudwatchlogs.ListLogGroupsInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error)
}

type NoclickopsCloudwatchLogsClient struct {
Client CloudwatchLogsClient
ClientMeta
}

type NoclickopsCloudwatchLogsService struct {
Clients []NoclickopsCloudwatchLogsClient
common.ServiceMeta
}

func NewCloudwatchLogsServiceFromConfigs(cfg []awssdk.Config, meta common.ServiceMeta) NoclickopsCloudwatchLogsService {
service := NoclickopsCloudwatchLogsService{ServiceMeta: meta}
for _, c := range cfg {
service.Clients = append(service.Clients, NoclickopsCloudwatchLogsClient{
Client: cloudwatchlogs.NewFromConfig(c),
ClientMeta: ClientMeta{Region: c.Region},
})
}
return service
}

func (s *NoclickopsCloudwatchLogsService) GetAllResources() []common.Resource {
return s.GetLogGroups()
}

func (s *NoclickopsCloudwatchLogsService) GetLogGroups() []common.Resource {
var resources []common.Resource
for _, rc := range s.Clients {
var nextToken *string = nil
for {
res, err := rc.Client.ListLogGroups(context.TODO(), &cloudwatchlogs.ListLogGroupsInput{
NextToken: nextToken,
})
if err != nil {
log.Printf("warning: %v", err)
break
}

for _, loggroup := range res.LogGroups {
resources = append(resources, common.Resource{Arn: *loggroup.LogGroupArn, TerraformID: *loggroup.LogGroupName, ResourceType: common.Cloudwatchlogs_log_group, Region: rc.Region})
}


if res.NextToken == nil {
break
}
nextToken = res.NextToken
}
}
return resources
}
110 changes: 110 additions & 0 deletions aws/cloudwatchlogs_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
package aws_test

import (
"context"
"fmt"
"testing"

"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
"github.com/google/go-cmp/cmp"
"github.com/noclickops/aws"
"github.com/noclickops/common"
)

func getMockedCloudwatchLogsService(mock *mockCloudwatchLogsClient) aws.NoclickopsCloudwatchLogsService {
return aws.NoclickopsCloudwatchLogsService{
Clients: []aws.NoclickopsCloudwatchLogsClient{
{
Client: mock,
ClientMeta: aws.ClientMeta{Region: "eu-west-1"},
},
},
ServiceMeta: common.ServiceMeta{Global: false, ServiceName: "cloudwatchlogs"},
}
}

func TestGetLogGroups_BasicCase(t *testing.T) {
mock := &mockCloudwatchLogsClient{
listLogGroupsFn: func(_ context.Context, _ *cloudwatchlogs.ListLogGroupsInput, _ ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error) {
return &cloudwatchlogs.ListLogGroupsOutput{
LogGroups: []types.LogGroupSummary{
{LogGroupArn: ptr("arn:aws:logs:eu-west-1:123456789012:log-group:group-1:*"), LogGroupName: ptr("group-1")},
{LogGroupArn: ptr("arn:aws:logs:eu-west-1:123456789012:log-group:group-2:*"), LogGroupName: ptr("group-2")},
},
}, nil
},
}
svc := getMockedCloudwatchLogsService(mock)
got := svc.GetLogGroups()
expected := []common.Resource{
{Arn: "arn:aws:logs:eu-west-1:123456789012:log-group:group-1:*", TerraformID: "group-1", ResourceType: common.Cloudwatchlogs_log_group, Region: "eu-west-1"},
{Arn: "arn:aws:logs:eu-west-1:123456789012:log-group:group-2:*", TerraformID: "group-2", ResourceType: common.Cloudwatchlogs_log_group, Region: "eu-west-1"},
}
if diff := cmp.Diff(got, expected); diff != "" {
t.Errorf("mismatch (-got +want):\n%s", diff)
}
}

func TestGetLogGroups_NoLogGroups(t *testing.T) {
mock := &mockCloudwatchLogsClient{
listLogGroupsFn: func(_ context.Context, _ *cloudwatchlogs.ListLogGroupsInput, _ ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error) {
return &cloudwatchlogs.ListLogGroupsOutput{}, nil
},
}
svc := getMockedCloudwatchLogsService(mock)
got := svc.GetLogGroups()
if len(got) != 0 {
t.Errorf("expected empty result, got %v", got)
}
}

func TestGetLogGroups_PaginationFollowed(t *testing.T) {
callCount := 0
mock := &mockCloudwatchLogsClient{
listLogGroupsFn: func(_ context.Context, params *cloudwatchlogs.ListLogGroupsInput, _ ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error) {
callCount++
if callCount == 1 {
return &cloudwatchlogs.ListLogGroupsOutput{
LogGroups: []types.LogGroupSummary{
{LogGroupArn: ptr("arn:aws:logs:eu-west-1:123456789012:log-group:group-1:*"), LogGroupName: ptr("group-1")},
},
NextToken: ptr("next-page-token"),
}, nil
}
if params.NextToken == nil || *params.NextToken != "next-page-token" {
return nil, fmt.Errorf("wrong NextToken: expected 'next-page-token', got %v", params.NextToken)
}
return &cloudwatchlogs.ListLogGroupsOutput{
LogGroups: []types.LogGroupSummary{
{LogGroupArn: ptr("arn:aws:logs:eu-west-1:123456789012:log-group:group-2:*"), LogGroupName: ptr("group-2")},
},
}, nil
},
}
svc := getMockedCloudwatchLogsService(mock)
got := svc.GetLogGroups()
expected := []common.Resource{
{Arn: "arn:aws:logs:eu-west-1:123456789012:log-group:group-1:*", TerraformID: "group-1", ResourceType: common.Cloudwatchlogs_log_group, Region: "eu-west-1"},
{Arn: "arn:aws:logs:eu-west-1:123456789012:log-group:group-2:*", TerraformID: "group-2", ResourceType: common.Cloudwatchlogs_log_group, Region: "eu-west-1"},
}
if diff := cmp.Diff(got, expected); diff != "" {
t.Errorf("mismatch (-got +want):\n%s", diff)
}
if callCount != 2 {
t.Errorf("expected 2 calls to ListLogGroups, got %d", callCount)
}
}

func TestGetLogGroups_ErrorIsSkipped(t *testing.T) {
mock := &mockCloudwatchLogsClient{
listLogGroupsFn: func(_ context.Context, _ *cloudwatchlogs.ListLogGroupsInput, _ ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error) {
return nil, fmt.Errorf("access denied")
},
}
svc := getMockedCloudwatchLogsService(mock)
got := svc.GetLogGroups()
if len(got) != 0 {
t.Errorf("expected empty result on error, got %v", got)
}
}
9 changes: 9 additions & 0 deletions aws/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/aws/aws-sdk-go-v2/service/autoscaling"
"github.com/aws/aws-sdk-go-v2/service/cloudfront"
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
"github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
Expand Down Expand Up @@ -196,3 +197,11 @@ type mockLambdaClient struct {
func (m *mockLambdaClient) ListFunctions(ctx context.Context, params *lambda.ListFunctionsInput, optFns ...func(*lambda.Options)) (*lambda.ListFunctionsOutput, error) {
return m.listFunctionsFn(ctx, params, optFns...)
}

type mockCloudwatchLogsClient struct {
listLogGroupsFn func(ctx context.Context, params *cloudwatchlogs.ListLogGroupsInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error)
}

func (m *mockCloudwatchLogsClient) ListLogGroups(ctx context.Context, params *cloudwatchlogs.ListLogGroupsInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListLogGroupsOutput, error) {
return m.listLogGroupsFn(ctx, params, optFns...)
}
28 changes: 16 additions & 12 deletions aws/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ var SERVICES = map[common.AWSServiceName]common.ServiceMeta{
common.Route53: {Global: true, ServiceName: "route53"},
common.CloudFront: {Global: true, ServiceName: "cloudfront"},

common.EKS: {Global: false, ServiceName: "eks"},
common.IdentityStore: {Global: false, ServiceName: "identitystore"},
common.SSM: {Global: false, ServiceName: "ssm"},
common.SSOAdmin: {Global: false, ServiceName: "ssoadmin"},
common.EC2: {Global: false, ServiceName: "ec2"},
common.RDS: {Global: false, ServiceName: "rds"},
common.SNS: {Global: false, ServiceName: "sns"},
common.S3: {Global: false, ServiceName: "s3"},
common.ELB: {Global: false, ServiceName: "elb"},
common.ELBV2: {Global: false, ServiceName: "elbv2"},
common.ASG: {Global: false, ServiceName: "autoscaling"},
common.Lambda: {Global: false, ServiceName: "lambda"},
common.EKS: {Global: false, ServiceName: "eks"},
common.IdentityStore: {Global: false, ServiceName: "identitystore"},
common.SSM: {Global: false, ServiceName: "ssm"},
common.SSOAdmin: {Global: false, ServiceName: "ssoadmin"},
common.EC2: {Global: false, ServiceName: "ec2"},
common.RDS: {Global: false, ServiceName: "rds"},
common.SNS: {Global: false, ServiceName: "sns"},
common.S3: {Global: false, ServiceName: "s3"},
common.ELB: {Global: false, ServiceName: "elb"},
common.ELBV2: {Global: false, ServiceName: "elbv2"},
common.ASG: {Global: false, ServiceName: "autoscaling"},
common.Lambda: {Global: false, ServiceName: "lambda"},
common.CloudwatchLogs: {Global: false, ServiceName: "cloudwatchlogs"},

// not included in the switch/case in `NewclickopsServiceFromConfigs`
// because it doesn't follow the same invocation pattern.
Expand Down Expand Up @@ -88,6 +89,9 @@ func NewNoclickopsServiceFromConfigs(service common.AWSServiceName, configs []aw
case common.ASG:
c := NewAutoscalingServiceFromConfigs(configs, meta)
return &c
case common.CloudwatchLogs:
c := NewCloudwatchLogsServiceFromConfigs(configs, meta)
return &c
case common.Lambda:
c := NewLambdaServiceFromConfigs(configs, meta)
return &c
Expand Down
5 changes: 3 additions & 2 deletions common/awsservicename_string.go

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

5 changes: 3 additions & 2 deletions common/resourcetype_string.go

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

2 changes: 2 additions & 0 deletions common/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const (
VPC_endpoint
Lambda_function
Autoscaling_group
Cloudwatchlogs_log_group
)

func (r ResourceType) MarshalJSON() ([]byte, error) {
Expand All @@ -62,6 +63,7 @@ const (
ASG
Lambda
ResourceGroupsTaggingAPI
CloudwatchLogs
)

type Resource struct {
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/account v1.30.6
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.66.1
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.61.1
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.74.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.299.0
github.com/aws/aws-sdk-go-v2/service/eks v1.82.1
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.24
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.66.1 h1:kGlbhb5GMfkP/bcqcbt3
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.66.1/go.mod h1:z45kurrOonQepd3SN5LIgropAn1NGHwBn1yOMF+QVFU=
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.61.1 h1:LSv6jOIn/yEsGLeL4TLggsLA+I+XbuZ8sKmUIEWKrzI=
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.61.1/go.mod h1:XUduecWr236DyG8nZwJMewFbS4QcL8NZHxohdYDoPhM=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.74.0 h1:6TqDeYdvJJEIJGg5ICy7nzC7/UuHk2Eg3wrpb5bWKPM=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.74.0/go.mod h1:MLJu3PUd8fp5Qvj4CiLvyY5H8y7kxHKlTp060Wsd+Vc=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.299.0 h1:qTozRFl2YFFU2HJGl7ZAywlRQvBnAN591gbAFT5bE0s=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.299.0/go.mod h1:E1pnYwWFZ8N3REmeN9Fe/Zipbpps4HJj8DQGNnLUMYc=
github.com/aws/aws-sdk-go-v2/service/eks v1.82.1 h1:xTzXiQ8Q6U4ACdMNSCm72zd4Ds7QxhgVLqt5x8GXLBM=
Expand Down