Feat/#55: 변수 처리 방식 변경

.github/workflows/CI.yml

@@ -91,6 +91,8 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       INFRACOST_TERRAFORM_CLI_WRAPPER: false
       TF_VAR_slack_webhook_url: ${{ secrets.TF_VAR_slack_webhook_url }}
+      TF_VAR_operation_account_id: ${{ secrets.TF_VAR_operation_account_id }}
+      TF_VAR_prod_account_id: ${{ secrets.TF_VAR_prod_account_id }}
 
     steps:
       - name: Checkout Code

.github/workflows/cd.yml

@@ -109,3 +109,6 @@ jobs:
         env:
           TF_VAR_slack_webhook_url: ${{ secrets.TF_VAR_slack_webhook_url }}
           TF_VAR_allowed_source_ips: ${{ secrets.TF_VAR_allowed_source_ips }}
+          TF_VAR_operation_account_id: ${{ secrets.TF_VAR_operation_account_id }}
+          TF_VAR_prod_account_id: ${{ secrets.TF_VAR_prod_account_id }}
+

.gitignore

@@ -28,4 +28,4 @@ ehthumbs.db             # Windows
 .vscode/
 
 # OpenSearch alert 생성 시 생기는 임시 파일
-modules/opensearch/slack_response.json
+modules/opensearch/slack_response.json

management-team-account/inspector-delegation/organizations/main.tf

@@ -12,15 +12,6 @@ provider "aws" {
   region = "ap-northeast-2"
 }
 
-provider "aws" {
-  alias  = "operation"
-  region = "ap-northeast-2"
-}
-
-data "aws_caller_identity" "operation" {
-  provider = aws.operation
-}
-
 resource "aws_inspector2_delegated_admin_account" "this" {
-  account_id = data.aws_caller_identity.operation.account_id
+  account_id = var.operation_account_id
 }

management-team-account/inspector-delegation/organizations/variables.tf

@@ -0,0 +1,5 @@
+variable "operation_account_id" {
+  description = "operation account"
+  type        = string
+  sensitive   = true
+}

operation-team-account/runtime-verification/inspector/main.tf

@@ -12,14 +12,6 @@ provider "aws" {
   region = "ap-northeast-2"
 }
 
-provider "aws" {
-  alias  = "prod"
-  region = "ap-northeast-2"
-}
-
-data "aws_caller_identity" "prod" {
-  provider = aws.prod
-}
 
 data "aws_caller_identity" "current" {}
 
@@ -29,5 +21,5 @@ resource "aws_inspector2_enabler" "this" {
 }
 
 resource "aws_inspector2_delegated_admin_account" "prod_account" {
-  account_id = data.aws_caller_identity.prod.account_id
+  account_id = var.prod_account_id
 }

operation-team-account/runtime-verification/inspector/variables.tf

@@ -0,0 +1,5 @@
+variable "prod_account_id" {
+  description = "prod account"
+  type        = string
+  sensitive   = true
+}