#SOS-15

/collector/structs.go
+ AccountSpecifiedFiels struct to save AccountId and AccountName

/collector/aws/common/structs.go
+ add Method getAccountName()

/collector/aws/detector.go
+ save in DetectorManager the accountName from config file

/collector/resources/*
+ save AccountSpecifiedFields with values in detectedStructs

collector/aws/common/structs.go

@@ -26,6 +26,7 @@ type AWSManager interface {
 	GetCloudWatchClient() *cloudwatch.CloudwatchManager
 	GetPricingClient() *pricing.PricingManager
 	GetRegion() string
+	GetAccountName() string
 	GetSession() (*session.Session, *aws.Config)
 	GetAccountIdentity() *sts.GetCallerIdentityOutput
 	SetGlobal(resourceName collector.ResourceIdentifier)

collector/aws/detector.go

@@ -21,6 +21,7 @@ type DetectorDescriptor interface {
 	GetCloudWatchClient() *cloudwatch.CloudwatchManager
 	GetPricingClient() *pricing.PricingManager
 	GetRegion() string
+	GetAccountName() string
 	GetSession() (*session.Session, *awsClient.Config)
 	GetAccountIdentity() *sts.GetCallerIdentityOutput
 }
@@ -38,12 +39,20 @@ type DetectorManager struct {
 	session          *session.Session
 	awsConfig        *awsClient.Config
 	accountIdentity  *sts.GetCallerIdentityOutput
+	accountName      string
 	region           string
 	global           map[string]struct{}
 }
 
 // NewDetectorManager create new instance of detector manager
-func NewDetectorManager(awsAuth AuthDescriptor, collector collector.CollectorDescriber, account config.AWSAccount, stsManager *STSManager, global map[string]struct{}, region string) *DetectorManager {
+func NewDetectorManager(
+	awsAuth AuthDescriptor,
+	collector collector.CollectorDescriber,
+	account config.AWSAccount,
+	stsManager *STSManager,
+	global map[string]struct{},
+	region string,
+) *DetectorManager {
 
 	priceSession, _ := awsAuth.Login(defaultRegionPrice)
 	pricingManager := pricing.NewPricingManager(awsPricing.New(priceSession), defaultRegionPrice)
@@ -60,6 +69,7 @@ func NewDetectorManager(awsAuth AuthDescriptor, collector collector.CollectorDes
 		session:          regionSession,
 		awsConfig:        regionConfig,
 		accountIdentity:  callerIdentityOutput,
+		accountName:      account.Name,
 		global:           global,
 	}
 }
@@ -89,6 +99,11 @@ func (dm *DetectorManager) GetRegion() string {
 	return dm.region
 }
 
+// GetAccountName returns the account name
+func (dm *DetectorManager) GetAccountName() string {
+	return dm.accountName
+}
+
 // GetSession return the aws session
 func (dm *DetectorManager) GetSession() (*session.Session, *awsClient.Config) {
 	return dm.session, dm.awsConfig

collector/aws/resources/apigateway.go

@@ -36,6 +36,7 @@ type DetectedAPIGateway struct {
 	Name       string
 	LaunchTime time.Time
 	Tag        map[string]string
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -147,6 +148,10 @@ func (ag *APIGatewayManager) Detect(metrics []config.MetricConfig) (interface{},
 					Name:       *api.Name,
 					LaunchTime: *api.CreatedDate,
 					Tag:        tagsData,
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *ag.awsManager.GetAccountIdentity().Account,
+						AccountName: ag.awsManager.GetAccountName(),
+					},
 				}
 
 				ag.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/docdb.go

@@ -39,6 +39,7 @@ type DetectedDocumentDB struct {
 	MultiAZ      bool
 	Engine       string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -162,6 +163,10 @@ func (dd *DocumentDBManager) Detect(metrics []config.MetricConfig) (interface{},
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *dd.awsManager.GetAccountIdentity().Account,
+						AccountName: dd.awsManager.GetAccountName(),
+					},
 				}
 
 				dd.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/dynamodb.go

@@ -42,6 +42,7 @@ type DetectedAWSDynamoDB struct {
 	Metric string
 	Name   string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -199,6 +200,10 @@ func (dd *DynamoDBManager) Detect(metrics []config.MetricConfig) (interface{}, e
 						PricePerMonth: pricePerMonth,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *dd.awsManager.GetAccountIdentity().Account,
+						AccountName: dd.awsManager.GetAccountName(),
+					},
 				}
 
 				dd.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/ec2.go

@@ -38,6 +38,7 @@ type DetectedEC2 struct {
 	Name         string
 	InstanceType string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -164,6 +165,10 @@ func (ec *EC2Manager) Detect(metrics []config.MetricConfig) (interface{}, error)
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *ec.awsManager.GetAccountIdentity().Account,
+						AccountName: ec.awsManager.GetAccountName(),
+					},
 				}
 
 				ec.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/ec2volumes.go

@@ -36,6 +36,7 @@ type DetectedAWSEC2Volume struct {
 	Size          int64
 	PricePerMonth float64
 	Tag           map[string]string
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -124,6 +125,10 @@ func (ev *EC2VolumeManager) Detect(metrics []config.MetricConfig) (interface{},
 			Size:          volumeSize,
 			PricePerMonth: ev.getCalculatedPrice(vol, price),
 			Tag:           tagsData,
+			AccountSpecifiedFields: collector.AccountSpecifiedFields{
+				AccountID:   *ev.awsManager.GetAccountIdentity().Account,
+				AccountName: ev.awsManager.GetAccountName(),
+			},
 		}
 
 		ev.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/elasticache.go

@@ -39,6 +39,7 @@ type DetectedElasticache struct {
 	CacheNodeType string
 	CacheNodes    int
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -163,6 +164,10 @@ func (ec *ElasticacheManager) Detect(metrics []config.MetricConfig) (interface{}
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *ec.awsManager.GetAccountIdentity().Account,
+						AccountName: ec.awsManager.GetAccountName(),
+					},
 				}
 
 				ec.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/elasticips.go

@@ -35,6 +35,7 @@ type DetectedElasticIP struct {
 	PricePerHour  float64
 	PricePerMonth float64
 	Tag           map[string]string
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -115,6 +116,10 @@ func (ei *ElasticIPManager) Detect(metrics []config.MetricConfig) (interface{},
 				PricePerHour:  price,
 				PricePerMonth: price * collector.TotalMonthHours,
 				Tag:           tagsData,
+				AccountSpecifiedFields: collector.AccountSpecifiedFields{
+					AccountID:   *ei.awsManager.GetAccountIdentity().Account,
+					AccountName: ei.awsManager.GetAccountName(),
+				},
 			}
 
 			ei.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/elasticsearch.go

@@ -46,6 +46,7 @@ type DetectedElasticSearch struct {
 	InstanceType  string
 	InstanceCount int64
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 // elasticSearchVolumeType will hold the available volume types for ESCluster EBS
@@ -220,6 +221,10 @@ func (esm *ElasticSearchManager) Detect(metrics []config.MetricConfig) (interfac
 						PricePerMonth: hourlyClusterPrice * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *esm.awsManager.GetAccountIdentity().Account,
+						AccountName: esm.awsManager.GetAccountName(),
+					},
 				}
 
 				esm.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/elb.go

@@ -37,6 +37,7 @@ type DetectedELB struct {
 	Metric string
 	Region string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -176,6 +177,10 @@ func (el *ELBManager) Detect(metrics []config.MetricConfig) (interface{}, error)
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *el.awsManager.GetAccountIdentity().Account,
+						AccountName: el.awsManager.GetAccountName(),
+					},
 				}
 
 				el.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/elbv2.go

@@ -38,6 +38,7 @@ type DetectedELBV2 struct {
 	Region string
 	Type   string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 // loadBalancerConfig defines loadbalancer's configuration of metrics and pricing
@@ -219,6 +220,10 @@ func (el *ELBV2Manager) Detect(metrics []config.MetricConfig) (interface{}, erro
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *el.awsManager.GetAccountIdentity().Account,
+						AccountName: el.awsManager.GetAccountName(),
+					},
 				}
 
 				el.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/iam.go

@@ -34,6 +34,7 @@ type DetectedAWSLastActivity struct {
 	AccessKey    string
 	LastUsedDate time.Time
 	LastActivity string
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -133,6 +134,10 @@ func (im *IAMManager) Detect(metrics []config.MetricConfig) (interface{}, error)
 					AccessKey:    *accessKeyData.AccessKeyId,
 					LastUsedDate: lastUsedDate,
 					LastActivity: lastActivity,
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *im.awsManager.GetAccountIdentity().Account,
+						AccountName: im.awsManager.GetAccountName(),
+					},
 				}
 
 				im.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/kinesis.go

@@ -38,6 +38,7 @@ type DetectedKinesis struct {
 	Metric string
 	Region string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -193,6 +194,10 @@ func (km *KinesisManager) Detect(metrics []config.MetricConfig) (interface{}, er
 						PricePerMonth: totalShardsPerHourPrice * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *km.awsManager.GetAccountIdentity().Account,
+						AccountName: km.awsManager.GetAccountName(),
+					},
 				}
 
 				km.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/lambda.go

@@ -36,6 +36,7 @@ type DetectedAWSLambda struct {
 	ResourceID string
 	Name       string
 	Tag        map[string]string
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -149,6 +150,10 @@ func (lm *LambdaManager) Detect(metrics []config.MetricConfig) (interface{}, err
 					ResourceID: *fun.FunctionArn,
 					Name:       *fun.FunctionName,
 					Tag:        tagsData,
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *lm.awsManager.GetAccountIdentity().Account,
+						AccountName: lm.awsManager.GetAccountName(),
+					},
 				}
 
 				lm.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/natgateway.go

@@ -39,6 +39,7 @@ type DetectedNATGateway struct {
 	SubnetID string
 	VPCID    string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -178,6 +179,10 @@ func (ngw *NatGatewayManager) Detect(metrics []config.MetricConfig) (interface{}
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *ngw.awsManager.GetAccountIdentity().Account,
+						AccountName: ngw.awsManager.GetAccountName(),
+					},
 				}
 
 				ngw.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/neptune.go

@@ -39,6 +39,7 @@ type DetectedAWSNeptune struct {
 	MultiAZ      bool
 	Engine       string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -163,6 +164,10 @@ func (np *NeptuneManager) Detect(metrics []config.MetricConfig) (interface{}, er
 						PricePerMonth: price * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *np.awsManager.GetAccountIdentity().Account,
+						AccountName: np.awsManager.GetAccountName(),
+					},
 				}
 
 				np.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/rds.go

@@ -43,6 +43,7 @@ type DetectedAWSRDS struct {
 	MultiAZ      bool
 	Engine       string
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 // RDSVolumeType will hold the available volume types for RDS types
@@ -206,6 +207,10 @@ func (r *RDSManager) Detect(metrics []config.MetricConfig) (interface{}, error)
 						PricePerMonth: totalHourlyPrice * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *r.awsManager.GetAccountIdentity().Account,
+						AccountName: r.awsManager.GetAccountName(),
+					},
 				}
 
 				r.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/aws/resources/redshift.go

@@ -38,6 +38,7 @@ type DetectedRedShift struct {
 	NodeType      string
 	NumberOfNodes int64
 	collector.PriceDetectedFields
+	collector.AccountSpecifiedFields
 }
 
 func init() {
@@ -159,6 +160,10 @@ func (rdm *RedShiftManager) Detect(metrics []config.MetricConfig) (interface{},
 						PricePerMonth: clusterPrice * collector.TotalMonthHours,
 						Tag:           tagsData,
 					},
+					AccountSpecifiedFields: collector.AccountSpecifiedFields{
+						AccountID:   *rdm.awsManager.GetAccountIdentity().Account,
+						AccountName: rdm.awsManager.GetAccountName(),
+					},
 				}
 
 				rdm.awsManager.GetCollector().AddResource(collector.EventCollector{

collector/structs.go

@@ -36,6 +36,12 @@ type PriceDetectedFields struct {
 	Tag           map[string]string
 }
 
+// AccountSpecifiedFields describe account data of an resource
+type AccountSpecifiedFields struct {
+	AccountID   string
+	AccountName string
+}
+
 // EventCollector collector event data structure
 type EventCollector struct {
 	EventType    string