revert changes from other mr

Author: erezo9

modules/eks-managed-node-group/main.tf

@@ -1,13 +1,13 @@
 data "aws_partition" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.partition == "" ? 1 : 0
 }
 data "aws_caller_identity" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.account_id == "" ? 1 : 0
 }
 
 locals {
-  partition  = try(data.aws_partition.current[0].partition, "")
-  account_id = try(data.aws_caller_identity.current[0].account_id, "")
+  partition  = try(data.aws_partition.current[0].partition, var.partition)
+  account_id = try(data.aws_caller_identity.current[0].account_id, var.account_id)
 }
 
 ################################################################################

modules/eks-managed-node-group/variables.tf

@@ -17,6 +17,18 @@ variable "region" {
   default     = null
 }
 
+variable "partition" {
+  description = "The AWS partition - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
+variable "account_id" {
+  description = "The AWS account ID - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
 ################################################################################
 # User Data
 ################################################################################

modules/fargate-profile/main.tf

@@ -4,15 +4,15 @@ data "aws_region" "current" {
   region = var.region
 }
 data "aws_partition" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.partition == "" ? 1 : 0
 }
 data "aws_caller_identity" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.account_id == "" ? 1 : 0
 }
 
 locals {
-  account_id = try(data.aws_caller_identity.current[0].account_id, "")
-  partition  = try(data.aws_partition.current[0].partition, "")
+  account_id = try(data.aws_caller_identity.current[0].account_id, var.account_id)
+  partition  = try(data.aws_partition.current[0].partition, var.partition)
   region     = try(data.aws_region.current[0].region, "")
 }
 

modules/fargate-profile/variables.tf

@@ -18,6 +18,18 @@ variable "region" {
   default     = null
 }
 
+variable "partition" {
+  description = "The AWS partition - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
+variable "account_id" {
+  description = "The AWS account ID - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
 ################################################################################
 # IAM Role
 ################################################################################

modules/self-managed-node-group/main.tf

@@ -1,13 +1,13 @@
 data "aws_partition" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.partition == "" ? 1 : 0
 }
 data "aws_caller_identity" "current" {
-  count = var.create ? 1 : 0
+  count = var.create && var.account_id == "" ? 1 : 0
 }
 
 locals {
-  partition  = try(data.aws_partition.current[0].partition, "")
-  account_id = try(data.aws_caller_identity.current[0].account_id, "")
+  partition  = try(data.aws_partition.current[0].partition, var.partition)
+  account_id = try(data.aws_caller_identity.current[0].account_id, var.account_id)
 }
 
 ################################################################################

modules/self-managed-node-group/variables.tf

@@ -17,6 +17,18 @@ variable "region" {
   default     = null
 }
 
+variable "partition" {
+  description = "The AWS partition - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
+variable "account_id" {
+  description = "The AWS account ID - pass through value to reduce number of GET requests from data sources"
+  type        = string
+  default     = ""
+}
+
 ################################################################################
 # User Data
 ################################################################################