Pass account id instead of hardcoding it

aws · Jan 29, 2025 · 1865e1d · 1865e1d
1 parent 0e07445
commit 1865e1d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/environment/metadata.go b/environment/metadata.go
@@ -63,6 +63,7 @@ type MetaData struct {
 	PrometheusConfig                            string
 	OtelConfig                                  string
 	SampleApp                                   string
+	AccountId                                   string
 }
 
 type MetaDataStrings struct {
@@ -105,6 +106,7 @@ type MetaDataStrings struct {
 	PrometheusConfig                            string
 	OtelConfig                                  string
 	SampleApp                                   string
+	AccountId                                   string
 }
 
 func registerComputeType(dataString *MetaDataStrings) {
@@ -282,6 +284,10 @@ func registerAmpWorkspaceId(dataString *MetaDataStrings) {
 	flag.StringVar(&(dataString.AmpWorkspaceId), "ampWorkspaceId", "", "workspace Id for Amazon Managed Prometheus (AMP)")
 }
 
+func registerAccountId(dataString *MetaDataStrings) {
+	flag.StringVar(&(dataString.AccountId), "accountId", "", "AWS account Id")
+}
+
 func RegisterEnvironmentMetaDataFlags() *MetaDataStrings {
 	registerComputeType(registeredMetaDataStrings)
 	registerECSData(registeredMetaDataStrings)
@@ -300,6 +306,7 @@ func RegisterEnvironmentMetaDataFlags() *MetaDataStrings {
 	registerInstancePlatform(registeredMetaDataStrings)
 	registerAgentStartCommand(registeredMetaDataStrings)
 	registerAmpWorkspaceId(registeredMetaDataStrings)
+	registerAccountId(registeredMetaDataStrings)
 
 	return registeredMetaDataStrings
 }
@@ -344,6 +351,7 @@ func GetEnvironmentMetaData() *MetaData {
 	metaDataStorage.PrometheusConfig = registeredMetaDataStrings.PrometheusConfig
 	metaDataStorage.OtelConfig = registeredMetaDataStrings.OtelConfig
 	metaDataStorage.SampleApp = registeredMetaDataStrings.SampleApp
+	metaDataStorage.AccountId = registeredMetaDataStrings.AccountId
 
 	return metaDataStorage
 }
diff --git a/terraform/ec2/assume_role/main.tf b/terraform/ec2/assume_role/main.tf
@@ -11,6 +11,12 @@ module "basic_components" {
   region = var.region
 }
 
+data "aws_caller_identity" "current" {}
+
+output "account_id" {
+  value = data.aws_caller_identity.current.account_id
+}
+
 #####################################################################
 # Generate EC2 Key Pair for log in access to EC2
 #####################################################################
@@ -202,7 +208,7 @@ resource "null_resource" "integration_test_run" {
       "cd ~/amazon-cloudwatch-agent-test",
       "echo run sanity test && go test ./test/sanity -p 1 -v",
       "echo base assume role arn is ${aws_iam_role.roles["no_context_keys"].arn}",
-      "go test ${var.test_dir} -p 1 -timeout 1h -computeType=EC2 -bucket=${var.s3_bucket} -plugins='${var.plugin_tests}' -cwaCommitSha=${var.cwa_github_sha} -caCertPath=${var.ca_cert_path} -assumeRoleArn=${aws_iam_role.roles["no_context_keys"].arn} -instanceArn=${aws_instance.cwagent.arn} -v"
+      "go test ${var.test_dir} -p 1 -timeout 1h -computeType=EC2 -bucket=${var.s3_bucket} -plugins='${var.plugin_tests}' -cwaCommitSha=${var.cwa_github_sha} -caCertPath=${var.ca_cert_path} -assumeRoleArn=${aws_iam_role.roles["no_context_keys"].arn} -instanceArn=${aws_instance.cwagent.arn} -accountId=${data.aws_caller_identity.account_id.account_id} -v"
     ]
   }
 
@@ -219,3 +225,5 @@ data "aws_ami" "latest" {
     values = [var.ami]
   }
 }
+
+
diff --git a/test/assume_role/assume_role_unix.go b/test/assume_role/assume_role_unix.go
@@ -48,12 +48,6 @@ func (suite *AssumeRoleTestSuite) TearDownSuite() {
 
 var (
 	testRunners []*test_runner.TestRunner = []*test_runner.TestRunner{
-		// {
-		// 	TestRunner: &AssumeRoleTestRunner{
-		// 		BaseTestRunner: test_runner.BaseTestRunner{},
-		// 		name:           "AssumeRoleTest",
-		// 	},
-		// },
 		{
 			TestRunner: &ConfusedDeputyAssumeRoleTestRunner{
 				AssumeRoleTestRunner: AssumeRoleTestRunner{
@@ -424,7 +418,7 @@ func (t *ConfusedDeputyAssumeRoleTestRunner) setupEnvironmentVariables() error {
 	common.CopyFile("service_configs/amazon-cloudwatch-agent.service", "/etc/systemd/system/amazon-cloudwatch-agent.service")
 
 	if t.setSourceAccountEnvVar {
-		sourceAccount := "506463145083"
+		sourceAccount := environment.GetEnvironmentMetaData().AccountId
 		if t.useIncorrectSourceAccount {
 			sourceAccount = "123456789012"
 		}