awsfetcher: update ec2, elb, rds fetchers

Author: kubasobon

internal/inventory/awsfetcher/fetcher_ec2_instance.go

@@ -213,6 +213,9 @@ func (e *ec2InstanceFetcher) buildDetails(i *ec2.Ec2Instance, tags map[string]st
 	if v := awslib.LookupTag(tags, "costcenter", "cost-center", "cost_center"); v != "" {
 		details["CostCenter"] = v
 	}
+	if v := awslib.LookupTag(tags, "role"); v != "" {
+		details["Role"] = v
+	}
 	return details
 }
 

internal/inventory/awsfetcher/fetcher_ec2_instance_test.go

@@ -52,6 +52,7 @@ func makeTestInstance(launchTime *time.Time) *ec2beat.Ec2Instance {
 				{Key: pointers.Ref("key"), Value: pointers.Ref("value")},
 				{Key: pointers.Ref("Owner"), Value: pointers.Ref("team-infra")},
 				{Key: pointers.Ref("CostCenter"), Value: pointers.Ref("cc-1234")},
+				{Key: pointers.Ref("Role"), Value: pointers.Ref("sre")},
 			},
 			InstanceId:       pointers.Ref("234567890"),
 			Architecture:     ec2types.ArchitectureValuesX8664,
@@ -104,7 +105,7 @@ func TestEC2InstanceFetcher_Fetch(t *testing.T) {
 			"private-dns",
 			inventory.WithRelatedAssetIds([]string{"234567890"}),
 			inventory.WithRawAsset(instance1),
-			inventory.WithLabels(map[string]string{"Name": "test-server", "key": "value", "Owner": "team-infra", "CostCenter": "cc-1234"}),
+			inventory.WithLabels(map[string]string{"Name": "test-server", "key": "value", "Owner": "team-infra", "CostCenter": "cc-1234", "Role": "sre"}),
 			inventory.WithCloud(inventory.Cloud{
 				Provider:         inventory.AwsCloudProvider,
 				Region:           "us-east",
@@ -134,6 +135,7 @@ func TestEC2InstanceFetcher_Fetch(t *testing.T) {
 				"RoleArn":            testRoleArn,
 				"Owner":              "team-infra",
 				"CostCenter":         "cc-1234",
+				"Role":               "sre",
 			}),
 			inventory.WithCreatedAt(&launchTime),
 			inventory.WithUser(inventory.User{
@@ -193,7 +195,7 @@ func TestEC2InstanceFetcher_Fetch_ResolverError(t *testing.T) {
 			"private-dns",
 			inventory.WithRelatedAssetIds([]string{"234567890"}),
 			inventory.WithRawAsset(instance),
-			inventory.WithLabels(map[string]string{"Name": "test-server", "key": "value", "Owner": "team-infra", "CostCenter": "cc-1234"}),
+			inventory.WithLabels(map[string]string{"Name": "test-server", "key": "value", "Owner": "team-infra", "CostCenter": "cc-1234", "Role": "sre"}),
 			inventory.WithCloud(inventory.Cloud{
 				Provider:         inventory.AwsCloudProvider,
 				Region:           "us-east",
@@ -223,6 +225,7 @@ func TestEC2InstanceFetcher_Fetch_ResolverError(t *testing.T) {
 				// RoleArn is absent because the resolver failed.
 				"Owner":      "team-infra",
 				"CostCenter": "cc-1234",
+				"Role":       "sre",
 			}),
 			inventory.WithCreatedAt(&launchTime),
 			// WithUser falls back to the profile ARN when role resolution fails.

internal/inventory/awsfetcher/fetcher_elb_test.go

@@ -84,6 +84,7 @@ func TestELBv1Fetcher_Fetch(t *testing.T) {
 				"PubliclyAccessible": false, // scheme is "internal"
 				"AccountID":          "123",
 				"LoadBalancerType":   "classic",
+				"State":              "active",
 			}),
 			inventory.WithCreatedAt(asset.GetCreatedAt()),
 		),

internal/inventory/awsfetcher/fetcher_rds.go

@@ -79,6 +79,9 @@ func (s *rdsFetcher) Fetch(ctx context.Context, assetChannel chan<- inventory.As
 		if item.EngineVersion != "" {
 			details["EngineVersion"] = item.EngineVersion
 		}
+		if item.Status != "" {
+			details["DBInstanceStatus"] = item.Status
+		}
 
 		assetChannel <- inventory.NewAssetEvent(
 			inventory.AssetClassificationAwsRds,

internal/inventory/awsfetcher/fetcher_rds_test.go

@@ -44,6 +44,7 @@ func TestRDSInstanceFetcher_Fetch(t *testing.T) {
 		PubliclyAccessible:      false,
 		Engine:                  "postgres",
 		EngineVersion:           "15.4",
+		Status:                  "available",
 		CreatedAt:               &createdAt,
 		Subnets: []rds.Subnet{
 			{
@@ -68,6 +69,7 @@ func TestRDSInstanceFetcher_Fetch(t *testing.T) {
 		PubliclyAccessible:      true,
 		Engine:                  "mysql",
 		EngineVersion:           "8.0.35",
+		Status:                  "available",
 		Subnets: []rds.Subnet{
 			{
 				ID: "subnet-aabbccdd",
@@ -107,6 +109,7 @@ func TestRDSInstanceFetcher_Fetch(t *testing.T) {
 				"PubliclyAccessible": false,
 				"Engine":             "postgres",
 				"EngineVersion":      "15.4",
+				"DBInstanceStatus":   "available",
 			}),
 			inventory.WithCreatedAt(&createdAt),
 		),
@@ -126,6 +129,7 @@ func TestRDSInstanceFetcher_Fetch(t *testing.T) {
 				"PubliclyAccessible": true,
 				"Engine":             "mysql",
 				"EngineVersion":      "8.0.35",
+				"DBInstanceStatus":   "available",
 			}),
 		),
 	}

internal/resources/providers/awslib/elb/elb.go

@@ -19,6 +19,7 @@ package elb
 
 import (
 	"context"
+	"net"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
@@ -28,6 +29,12 @@ import (
 	"github.com/elastic/cloudbeat/internal/resources/providers/awslib"
 )
 
+// hostResolver abstracts DNS resolution so that tests can inject a fake without hitting the
+// real network. *net.Resolver satisfies this interface.
+type hostResolver interface {
+	LookupHost(ctx context.Context, host string) ([]string, error)
+}
+
 type Client interface {
 	elb.DescribeLoadBalancersAPIClient
 	DescribeTags(ctx context.Context, params *elb.DescribeTagsInput, optFns ...func(*elb.Options)) (*elb.DescribeTagsOutput, error)
@@ -43,6 +50,7 @@ type Provider struct {
 	client       Client
 	clients      map[string]Client
 	awsAccountID string
+	resolver     hostResolver
 }
 
 func NewElbProvider(ctx context.Context, log *clog.Logger, awsAccountID string, cfg aws.Config, factory awslib.CrossRegionFactory[Client]) *Provider {
@@ -55,5 +63,6 @@ func NewElbProvider(ctx context.Context, log *clog.Logger, awsAccountID string,
 		client:       elb.NewFromConfig(cfg),
 		clients:      m.GetMultiRegionsClientMap(),
 		awsAccountID: awsAccountID,
+		resolver:     net.DefaultResolver,
 	}
 }

internal/resources/providers/awslib/elb/load_balancer.go

@@ -33,6 +33,7 @@ type ElasticLoadBalancerInfo struct {
 	awsAccount   string
 	region       string
 	tags         map[string]string
+	ipAddresses  []string
 }
 
 func (v ElasticLoadBalancerInfo) GetResourceArn() string {
@@ -73,14 +74,17 @@ func (v ElasticLoadBalancerInfo) GetLoadBalancerType() string {
 	return "classic"
 }
 
-// GetState is not exposed for classic load balancers by the AWS SDK.
+// GetState returns "active" for classic load balancers. The classic ELB API does not expose
+// a state field, but any LB returned by DescribeLoadBalancers is live.
 func (v ElasticLoadBalancerInfo) GetState() string {
-	return ""
+	return "active"
 }
 
-// GetIPAddresses is not exposed for classic load balancers (they are DNS-only).
+// GetIPAddresses returns the IP addresses resolved from the load balancer's DNS name.
+// Classic ELBs do not expose IPs directly via the AWS API; the addresses are resolved at
+// fetch time (see Provider.DescribeAllLoadBalancers) and stored here.
 func (v ElasticLoadBalancerInfo) GetIPAddresses() []string {
-	return nil
+	return v.ipAddresses
 }
 
 // GetOwnerTag returns the value of the "Owner" tag (case-insensitive), if present.

internal/resources/providers/awslib/elb/provider.go

@@ -20,6 +20,7 @@ package elb
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
 	"github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types"
@@ -78,12 +79,21 @@ func (p *Provider) DescribeAllLoadBalancers(ctx context.Context) ([]awslib.AwsRe
 
 		var result []awslib.AwsResource
 		for _, item := range all {
-			result = append(result, &ElasticLoadBalancerInfo{
+			info := &ElasticLoadBalancerInfo{
 				LoadBalancer: item,
 				awsAccount:   p.awsAccountID,
 				region:       region,
 				tags:         tagsByName[pointers.Deref(item.LoadBalancerName)],
-			})
+			}
+			if dnsName := pointers.Deref(item.DNSName); dnsName != "" {
+				if ips, err := p.resolver.LookupHost(ctx, dnsName); err != nil {
+					p.log.Debugf("Could not resolve IPs for classic ELB %q: %v", dnsName, err)
+				} else {
+					sort.Strings(ips)
+					info.ipAddresses = ips
+				}
+			}
+			result = append(result, info)
 		}
 		return result, nil
 	})