Skip to content

fix: Add aws/account to the metadata #23

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

Merged
merged 3 commits into from
May 3, 2025
Merged

fix: Add aws/account to the metadata #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
326bd8b
fix: Add aws/account to the metadata
zacharyblasczyk May 3, 2025
19d99c1
use GetAccountID
zacharyblasczyk May 3, 2025
999fdc5
remove comment
zacharyblasczyk May 3, 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
29 changes: 17 additions & 12 deletions cmd/ctrlc/root/sync/aws/eks/eks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/MakeNowJust/heredoc/v2"
"github.com/Masterminds/semver"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/eks"
"github.com/aws/aws-sdk-go-v2/service/eks/types"
"github.com/charmbracelet/log"
Expand Down Expand Up @@ -72,7 +73,7 @@ func runSync(regions *[]string, name *string) func(cmd *cobra.Command, args []st
defer wg.Done()

// Initialize AWS client for this region
eksClient, err := initEKSClient(ctx, regionName)
eksClient, cfg, err := initEKSClient(ctx, regionName)
if err != nil {
log.Error("Failed to initialize EKS client", "region", regionName, "error", err)
mu.Lock()
Expand All @@ -82,7 +83,7 @@ func runSync(regions *[]string, name *string) func(cmd *cobra.Command, args []st
}

// List and process clusters for this region
resources, err := processClusters(ctx, eksClient, regionName)
resources, err := processClusters(ctx, eksClient, regionName, cfg)
if err != nil {
log.Error("Failed to process clusters", "region", regionName, "error", err)
mu.Lock()
Expand Down Expand Up @@ -141,20 +142,25 @@ func runSync(regions *[]string, name *string) func(cmd *cobra.Command, args []st
}
}

func initEKSClient(ctx context.Context, region string) (*eks.Client, error) {
func initEKSClient(ctx context.Context, region string) (*eks.Client, aws.Config, error) {
// Use common package to initialize AWS config
cfg, err := common.InitAWSConfig(ctx, region)
if err != nil {
return nil, err
return nil, aws.Config{}, err
}

return eks.NewFromConfig(cfg), nil
return eks.NewFromConfig(cfg), cfg, nil
}

func processClusters(ctx context.Context, eksClient *eks.Client, region string) ([]api.AgentResource, error) {
func processClusters(ctx context.Context, eksClient *eks.Client, region string, cfg aws.Config) ([]api.AgentResource, error) {
var resources []api.AgentResource
var nextToken *string

accountID, err := common.GetAccountID(ctx, cfg)
if err != nil {
return nil, fmt.Errorf("failed to get AWS account ID: %w", err)
}

for {
resp, err := eksClient.ListClusters(ctx, &eks.ListClustersInput{
NextToken: nextToken,
Expand All @@ -172,7 +178,7 @@ func processClusters(ctx context.Context, eksClient *eks.Client, region string)
continue
}

resource, err := processCluster(ctx, cluster.Cluster, region)
resource, err := processCluster(ctx, cluster.Cluster, region, accountID)
if err != nil {
log.Error("Failed to process EKS cluster", "name", clusterName, "error", err)
continue
Expand All @@ -190,16 +196,15 @@ func processClusters(ctx context.Context, eksClient *eks.Client, region string)
return resources, nil
}

func processCluster(_ context.Context, cluster *types.Cluster, region string) (api.AgentResource, error) {
func processCluster(_ context.Context, cluster *types.Cluster, region string, accountID string) (api.AgentResource, error) {
metadata := initClusterMetadata(cluster, region)

metadata["aws/account"] = accountID

consoleUrl := fmt.Sprintf("https://%s.console.aws.amazon.com/eks/home?region=%s#/clusters/%s",
region, region, *cluster.Name)
metadata["ctrlplane/links"] = fmt.Sprintf("{ \"AWS Console\": \"%s\" }", consoleUrl)

arnParts := strings.Split(*cluster.Arn, ":")
accountId := arnParts[4]

return api.AgentResource{
Version: "ctrlplane.dev/kubernetes/cluster/v1",
Kind: "AWSElasticKubernetesService",
Expand All @@ -215,7 +220,7 @@ func processCluster(_ context.Context, cluster *types.Cluster, region string) (a

// Provider-specific implementation details
"awsElasticKubernetesService": map[string]any{
"accountId": accountId,
"accountId": accountID,
"arn": *cluster.Arn,
"region": region,
"status": string(cluster.Status),
Expand Down