refactor(config): linked accounts configuration

Author: paguos

pkg/config/config.go

@@ -27,13 +27,23 @@ import (
 )
 
 type ScrapeConf struct {
-	APIVersion        string             `yaml:"apiVersion"`
-	StsRegion         string             `yaml:"sts-region"`
-	OAMSinkIdentifier string             `yaml:"oamSinkIdentifier"`
-	OAMRegion         string             `yaml:"oamRegion"`
-	Discovery         Discovery          `yaml:"discovery"`
-	Static            []*Static          `yaml:"static"`
-	CustomNamespace   []*CustomNamespace `yaml:"customNamespace"`
+	APIVersion        string               `yaml:"apiVersion"`
+	StsRegion         string               `yaml:"sts-region"`
+	LinkedAccounts    LinkedAccountsConfig `yaml:"linkedAccounts"`
+	OAMSinkIdentifier string               `yaml:"oamSinkIdentifier"` // deprecated: use linkedAccounts.oam.sinkIdentifier
+	OAMRegion         string               `yaml:"oamRegion"`         // deprecated: use linkedAccounts.oam.region
+	Discovery         Discovery            `yaml:"discovery"`
+	Static            []*Static            `yaml:"static"`
+	CustomNamespace   []*CustomNamespace   `yaml:"customNamespace"`
+}
+
+type LinkedAccountsOAM struct {
+	SinkIdentifier string `yaml:"sinkIdentifier"`
+	Region         string `yaml:"region"`
+}
+
+type LinkedAccountsConfig struct {
+	OAM LinkedAccountsOAM `yaml:"oam"`
 }
 
 type Discovery struct {
@@ -445,8 +455,13 @@ func (m *Metric) validateMetric(logger *slog.Logger, metricIdx int, parent strin
 func (c *ScrapeConf) toModelConfig() model.JobsConfig {
 	jobsCfg := model.JobsConfig{}
 	jobsCfg.StsRegion = c.StsRegion
-	jobsCfg.OAMSinkIdentifier = c.OAMSinkIdentifier
-	jobsCfg.OAMRegion = c.OAMRegion
+	if c.LinkedAccounts.OAM.SinkIdentifier != "" {
+		jobsCfg.OAMSinkIdentifier = c.LinkedAccounts.OAM.SinkIdentifier
+		jobsCfg.OAMRegion = c.LinkedAccounts.OAM.Region
+	} else {
+		jobsCfg.OAMSinkIdentifier = c.OAMSinkIdentifier
+		jobsCfg.OAMRegion = c.OAMRegion
+	}
 
 	for _, discoveryJob := range c.Discovery.Jobs {
 		svc := SupportedServices.GetService(discoveryJob.Type)

pkg/config/config_test.go

@@ -175,3 +175,11 @@ func TestValidateConfigFailuresWhenUsingAsLibrary(t *testing.T) {
 		})
 	}
 }
+
+func TestLinkedAccountsConfigMappedToModel(t *testing.T) {
+	var c ScrapeConf
+	jobsCfg, err := c.Load("testdata/include_linked_accounts.ok.yml", promslog.NewNopLogger())
+	require.NoError(t, err)
+	require.Equal(t, "arn:aws:oam:eu-west-1:123456789012:sink/test", jobsCfg.OAMSinkIdentifier)
+	require.Equal(t, "eu-west-1", jobsCfg.OAMRegion)
+}

pkg/config/testdata/include_linked_accounts.ok.yml

@@ -1,5 +1,9 @@
 apiVersion: v1alpha1
 sts-region: eu-west-1
+linkedAccounts:
+  oam:
+    sinkIdentifier: "arn:aws:oam:eu-west-1:123456789012:sink/test"
+    region: "eu-west-1"
 discovery:
   jobs:
     - type: AWS/EC2

pkg/job/scrape.go

@@ -90,6 +90,7 @@ func ScrapeAwsData(
 							oamRegion = region
 						}
 						linkedAliasResolver = newLinkedAccountAliasResolver(jobLogger, factory.GetOAMClient(oamRegion, role), jobsCfg.OAMSinkIdentifier)
+						jobLogger.Info("OAM linked account alias resolver created", "sink_identifier", jobsCfg.OAMSinkIdentifier, "oam_region", oamRegion)
 					}
 
 					resources, metrics := runDiscoveryJob(
@@ -202,6 +203,7 @@ func ScrapeAwsData(
 							oamRegion = region
 						}
 						linkedAliasResolver = newLinkedAccountAliasResolver(jobLogger, factory.GetOAMClient(oamRegion, role), jobsCfg.OAMSinkIdentifier)
+						jobLogger.Info("OAM linked account alias resolver created", "sink_identifier", jobsCfg.OAMSinkIdentifier, "oam_region", oamRegion)
 					}
 					metrics := runCustomNamespaceJob(ctx, jobLogger, customNamespaceJob, cloudwatchClient, gmdProcessor, linkedAliasResolver)
 					metricResult := model.CloudwatchMetricResult{