Merge pull request #333 from binbashar/feature/billing-budget-mon-update

Feature | moving cost-management layer to global scope dir
binbashar · Nov 17, 2021 · 0975b23 · 0975b23
2 parents 84195c2 + 67bb275
commit 0975b23
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/root/us-east-1/cost-mgmt/config.tf → root/global/cost-mgmt/config.tf b/root/us-east-1/cost-mgmt/config.tf → root/global/cost-mgmt/config.tf
@@ -11,7 +11,7 @@ provider "aws" {
 # Backend Config (partial)    #
 #=============================#
 terraform {
-  required_version = ">= 0.14.11"
+  required_version = ">= 1.0.9"
 
   required_providers {
     aws = "~> 3.0"

diff --git a/root/us-east-1/cost-mgmt/locals.tf → root/global/cost-mgmt/locals.tf b/root/us-east-1/cost-mgmt/locals.tf → root/global/cost-mgmt/locals.tf
diff --git a/root/us-east-1/cost-mgmt/main.tf → root/global/cost-mgmt/main.tf b/root/us-east-1/cost-mgmt/main.tf → root/global/cost-mgmt/main.tf
@@ -32,8 +32,7 @@ module "aws_cost_mgmt_billing_alert_100" {
 #
 # Budget = U$S100 at 75%
 module "aws_cost_mgmt_budget_notif_75" {
-  #source = "github.com/binbashar/terraform-aws-cost-budget.git?ref=v1.0.10"
-  source = "git::https://github.com/binbashar/terraform-aws-cost-budget.git?ref=feature/single-block"
+  source = "github.com/binbashar/terraform-aws-cost-budget.git?ref=v1.0.12"
 
   aws_env                = "${var.environment}-75-percent"
   currency               = var.currency
@@ -48,8 +47,7 @@ module "aws_cost_mgmt_budget_notif_75" {
 
 # Budget = U$S100 at 100%
 module "aws_cost_mgmt_budget_notif_100" {
-  #source = "github.com/binbashar/terraform-aws-cost-budget.git?ref=v1.0.10"
-  source = "git::https://github.com/binbashar/terraform-aws-cost-budget.git?ref=feature/single-block"
+  source = "github.com/binbashar/terraform-aws-cost-budget.git?ref=v1.0.12"
 
   aws_env                = "${var.environment}-100-percent"
   currency               = var.currency

diff --git a/root/us-east-1/cost-mgmt/outputs.tf → root/global/cost-mgmt/outputs.tf b/root/us-east-1/cost-mgmt/outputs.tf → root/global/cost-mgmt/outputs.tf
diff --git a/root/us-east-1/cost-mgmt/variables.tf → root/global/cost-mgmt/variables.tf b/root/us-east-1/cost-mgmt/variables.tf → root/global/cost-mgmt/variables.tf
@@ -25,7 +25,7 @@ variable "dynamodb_table" {
 }
 
 variable "encrypt" {
-  type        = string
+  type        = bool
   description = "Enable AWS DynamoDB with server side encryption"
 }
 
@@ -61,6 +61,11 @@ variable "region_secondary" {
   description = "AWS Scondary Region for HA"
 }
 
+variable "root_account_id" {
+  type        = string
+  description = "Account: Root"
+}
+
 variable "security_account_id" {
   type        = string
   description = "Account: Security & Users Management"
@@ -86,8 +91,14 @@ variable "appsprd_account_id" {
   description = "Account: Prod Modules & Libs"
 }
 
-variable "root_account_id" {
-  description = "Account: Root Organization"
+variable "vault_address" {
+  type        = string
+  description = "Vault Address"
+}
+
+variable "vault_token" {
+  type        = string
+  description = "Vault Token"
 }
 
 #==============================#