modules: remove deprecated data.aws_region.current parameter

fpco · Apr 16, 2018 · bfe0345 · bfe0345
1 parent b9932c9
commit bfe0345
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 22 deletions.
diff --git a/modules/cloudtrail/main.tf b/modules/cloudtrail/main.tf
@@ -19,9 +19,7 @@ resource "aws_s3_bucket" "cloudtrail" {
   tags = "${merge(map("Name", "${var.name_prefix}-cloudtrail"), "${var.extra_tags}")}"
 }
 
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 data "aws_iam_policy_document" "cloudtrail-bucket" {
   statement {

diff --git a/modules/cloudwatch-auto-recover-existing-ec2/main.tf b/modules/cloudwatch-auto-recover-existing-ec2/main.tf
@@ -5,9 +5,7 @@
  *
  */
 
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 resource "aws_cloudwatch_metric_alarm" "auto-recover" {
   count               = "${length(compact(var.ec2_instance_ids))}"

diff --git a/modules/credstash-setup/data.tf b/modules/credstash-setup/data.tf
@@ -1,8 +1,6 @@
 data "aws_caller_identity" "current" {}
 
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 data "template_file" "credstash-get-cmd" {
   template = "env credstash -r ${data.aws_region.current.name} -t ${var.db_table_name} get"

diff --git a/modules/dnsmasq-server/main.tf b/modules/dnsmasq-server/main.tf
@@ -135,9 +135,7 @@ resource "null_resource" "dnsmasq" {
 }
 
 # Current AWS region
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 # Cloudwatch alarm that recovers the instance after two minutes of system status
 # check failure

diff --git a/modules/ec2-auto-recover-instances/main.tf b/modules/ec2-auto-recover-instances/main.tf
@@ -106,9 +106,7 @@ resource "aws_instance" "auto-recover" {
 }
 
 # Current AWS region
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 # Cloudwatch alarm that recovers the instance after two minutes of system status
 # check failure

diff --git a/modules/elasticsearch/master-nodes.tf b/modules/elasticsearch/master-nodes.tf
@@ -23,9 +23,7 @@ module "master-node-ebs-volumes" {
   }
 }
 
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 resource "aws_iam_role_policy_attachment" "master-node-attach-ebs-volume" {
   count      = "${var.master_node_count}"
@@ -129,7 +127,8 @@ data "template_file" "master-node-config" {
     security_groups    = "[${aws_security_group.transport-sg.id}, ${aws_security_group.elasticsearch-api-sg.id}]"
     availability_zones = "[${join(",", data.aws_subnet.private.*.availability_zone)}]"
     cluster_tag        = "${var.name_prefix}-elasticsearch-cluster"
-    extra_config       = <<EXTRA_CONFIG
+
+    extra_config = <<EXTRA_CONFIG
 # Only set the region for Elasticsearch 5.x, since it is deprecated in 6.x
 ${element(split(".", var.elasticsearch_version), 0) < 6 ? "cloud.aws.region: ${data.aws_region.current.name}" : ""}
 

diff --git a/modules/persistent-ebs-volumes/iam.tf b/modules/persistent-ebs-volumes/iam.tf
@@ -1,8 +1,6 @@
 data "aws_caller_identity" "current" {}
 
-data "aws_region" "current" {
-  current = true
-}
+data "aws_region" "current" {}
 
 resource "aws_iam_policy" "ebs-volume-policy" {
   count = "${var.volume_count}"