[targets.aws] Add aws support, by rebasing PR #640 against main using Claude Code #1153

conallob · 2025-10-03T23:12:11Z

Clone of #640 , and take 2 of #1075

Implements #7

To manage the rebase of a stale branch against cloudprober/cloudprober main, I turned to the git expert Claude Code, with the instructions:

Rebase this branch against
  https://github.com/rabunkosar-dd/cloudprober/tree/add_aws_support , then
  rebase the branch against upstream, before integrating the feedback provided
  in https://github.com/cloudprober/cloudprober/pull/640#pullrequestreview-18
  17277625

Subsequently, Claude Code also updated the docs and config examples, following the prompt

Update docs/ with details of the AWS discovery mechanism and create an
  example config under @examples/aws/

https://github.com/cloudprober/cloudprober/actions/runs/18236026696/job/51929810505?pr=1153 with the following prompt: ``` Fix up go build issues as identified by https://github.com/cloudprober/cloud prober/actions/runs/18236026696/job/51929810505?pr=1153 ```

Claude Code was given the prompt: ``` Update docs/ with details of the AWS discovery mechanism and create an example config under @examples/aws/ ```

conallob · 2025-10-10T17:56:41Z

Friendly ping?

It's also worth noting that AI did not generate any of this code, it's all by @rabunkosar-dd from #640

conallob · 2025-10-23T18:43:14Z

Second friendly ping?

manugarg

Sorry for taking this long. I had entered half the comment, but didn't get time to finish. They are the same comments as on the original PR.

cmd/cloudprober/main.go

internal/rds/client/client.go

targets/endpoint/endpoint.go

internal/rds/aws/proto/config_proto_gen.cue

internal/rds/aws/proto/config.proto

manugarg · 2025-10-28T05:48:34Z

internal/rds/aws/aws.go

+	for k := range resTypes {
+		switch k {
+		case ResourceTypes.EC2Instances:
+			c.Ec2Instances = &configpb.EC2Instances{
+				ReEvalSec: proto.Int32(int32(reEvalSec)),
+			}
+
+		case ResourceTypes.ElastiCacheClusters:


It's too early to define this function, e.g. I am not even sure if we'll need to add ReEvalSec to all different resource types. It'll be better to try to implement one of the resource type (perhaps in a different PR) and see what all do we need. Then we can add more resource types in a single PR.

Refactored this function to use a map instead of a switch statement

internal/rds/aws/aws_test.go

docs/content/docs/how-to/rds/index.md

…e file, they're not used anymore

Co-authored-by: Claude Code v2.0.27 + Claude Sonnet 4.5, with the prompt: ``` Refactor code under @internal/rds/aws to reduce the functionity down to only discover EC2, RDS and Endpoint targets ```

…to improve test coverage Co-authored-by: Claude Code v2.0.28 + Claude Sonnet 4.5, with the prompt: ``` Refactor `DefaultProviderConfig()` in @internal/rds/aws to not just be a wrapper around a switch statement. Refactor @internal/rds/aws/aws_test.go to improve test coverage ```

conallob

PTAL

internal/rds/aws/proto/config_proto_gen.cue

cmd/cloudprober/main.go

targets/endpoint/endpoint.go

internal/rds/aws/proto/config.proto

internal/rds/aws/aws_test.go

conallob · 2025-10-29T00:23:06Z

internal/rds/aws/aws.go

+	for k := range resTypes {
+		switch k {
+		case ResourceTypes.EC2Instances:
+			c.Ec2Instances = &configpb.EC2Instances{
+				ReEvalSec: proto.Int32(int32(reEvalSec)),
+			}
+
+		case ResourceTypes.ElastiCacheClusters:


Refactored this function to use a map instead of a switch statement

docs/content/docs/how-to/rds/index.md

internal/rds/client/client.go

targets/endpoint/endpoint.go

internal/rds/aws/proto/config.proto

manugarg · 2025-11-04T03:39:04Z

internal/rds/aws/aws.go

+// ResourceTypes declares resource types supported by the AWS provider.
+var ResourceTypes = struct {
+	EC2Instances, RDSClusters, RDSInstances string
+}{
+	"ec2_instances",
+	"rds_clusters",
+	"rds_instances",
+}
+
+type lister interface {
+	listResources(req *pb.ListResourcesRequest) ([]*pb.Resource, error)
+}
+
+// Provider implements a AWS provider for a ResourceDiscovery server.
+type Provider struct {
+	listers map[string]lister
+}
+
+// ListResources returns the list of resources based on the given request.
+func (p *Provider) ListResources(req *pb.ListResourcesRequest) (*pb.ListResourcesResponse, error) {
+	lr := p.listers[req.GetResourcePath()]
+	if lr == nil {
+		return nil, fmt.Errorf("unknown resource type: %s", req.GetResourcePath())
+	}
+
+	resources, err := lr.listResources(req)
+	return &pb.ListResourcesResponse{Resources: resources}, err
+}
+
+func initAWSProject(c *configpb.ProviderConfig, l *logger.Logger) (map[string]lister, error) {
+	resourceLister := make(map[string]lister)
+
+	// TODO when resources are added
+
+	return resourceLister, nil
+}
+
+// New creates a AWS provider for RDS server, based on the provided config.
+func New(c *configpb.ProviderConfig, l *logger.Logger) (*Provider, error) {
+	resourceLister, err := initAWSProject(c, l)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Provider{
+		listers: resourceLister,
+	}, nil
+}
+
+// configSetter is a function type that sets a specific resource configuration
+// in the ProviderConfig.
+type configSetter func(*configpb.ProviderConfig, int32)
+
+// resourceConfigSetters maps resource types to their corresponding config setter functions.
+var resourceConfigSetters = map[string]configSetter{
+	ResourceTypes.EC2Instances: func(c *configpb.ProviderConfig, reEvalSec int32) {
+		c.Ec2Instances = &configpb.EC2Instances{
+			ReEvalSec: proto.Int32(reEvalSec),
+		}
+	},
+	ResourceTypes.RDSInstances: func(c *configpb.ProviderConfig, reEvalSec int32) {
+		c.RdsInstances = &configpb.RDSInstances{
+			ReEvalSec: proto.Int32(reEvalSec),
+		}
+	},
+	ResourceTypes.RDSClusters: func(c *configpb.ProviderConfig, reEvalSec int32) {
+		c.RdsClusters = &configpb.RDSClusters{
+			ReEvalSec: proto.Int32(reEvalSec),
+		}
+	},
+}
+


Can we please do all this later, after implementing resource types, if needed.

manugarg · 2025-11-04T03:40:24Z

examples/targets/aws/rds_all_resources.cfg

Let's wait for example, until after resource types are implemented. Same for all other examples.

docs/content/docs/how-to/rds/index.md

rabunkosar-dd added 10 commits October 4, 2025 00:17

add AWS support for some services

8d2ae68

init maps

ffc7d19

unit tests for ec2

1d29a45

add elasticache test and bug fix

2f5f365

split rds and ec API calls

c59ee2b

remove test files

ca5e4b9

update comments

91e27f4

remove AWS resource discovery for a separate PR

6448786

address comments

a1f92af

update the comment

843e40b

conallob force-pushed the add_aws_support branch from c834d54 to 843e40b Compare October 3, 2025 23:20

conallob added 3 commits October 4, 2025 00:44

Create docs and example configs for how to use AWS service discovery.

7af459a

Claude Code was given the prompt: ``` Update docs/ with details of the AWS discovery mechanism and create an example config under @examples/aws/ ```

Fix naming of index.md

06ad153

conallob changed the title ~~Add aws support~~ Add aws support, by rebasing PR #640 against main using Claude Code Oct 4, 2025

conallob marked this pull request as ready for review October 4, 2025 00:08

Fix naming of index.md

1ffd626

conallob changed the title ~~Add aws support, by rebasing PR #640 against main using Claude Code~~ [targets.aws] Add aws support, by rebasing PR #640 against main using Claude Code Oct 5, 2025

manugarg reviewed Oct 28, 2025

View reviewed changes

conallob added 6 commits October 28, 2025 23:59

Move aws config examples under examples/targets , delete generated cu…

8dd5f67

…e file, they're not used anymore

Reinstate original main.go

35e0150

Pair down aws discovery to just EC2, RDS and Endpoint types

1991911

Co-authored-by: Claude Code v2.0.27 + Claude Sonnet 4.5, with the prompt: ``` Refactor code under @internal/rds/aws to reduce the functionity down to only discover EC2, RDS and Endpoint targets ```

Clarify ambiguous language

c3d0d90

Revert unrelated changes to internal/rds/client/client.go

4d1640e

conallob force-pushed the add_aws_support branch from 8a37932 to 4d1640e Compare October 29, 2025 00:43

Merge branch 'cloudprober:main' into add_aws_support

5ca2031

conallob commented Oct 29, 2025

View reviewed changes

manugarg reviewed Nov 4, 2025

View reviewed changes

[targets.aws] Add aws support, by rebasing PR #640 against main using Claude Code #1153

Are you sure you want to change the base?

[targets.aws] Add aws support, by rebasing PR #640 against main using Claude Code #1153

Uh oh!

Conversation

conallob commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

conallob commented Oct 10, 2025

Uh oh!

conallob commented Oct 23, 2025

Uh oh!

manugarg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manugarg Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

conallob Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

conallob left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

conallob Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manugarg Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

manugarg Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

conallob commented Oct 3, 2025 •

edited

Loading