update examples for 0.12

terraform-aws-modules · May 23, 2019 · bb5a855 · bb5a855
1 parent 19b2d71
commit bb5a855
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 58 deletions.
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -11,7 +11,7 @@ data "aws_vpc" "default" {
 
 data "aws_security_group" "default" {
   name   = "default"
-  vpc_id = "${data.aws_vpc.default.id}"
+  vpc_id = data.aws_vpc.default.id
 }
 
 ##################################################
@@ -32,7 +32,7 @@ module "main_sg" {
 
   name        = "main-sg"
   description = "Security group which is used as an argument in complete-sg"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["10.10.0.0/16"]
   ingress_rules       = ["https-443-tcp"]
@@ -46,7 +46,7 @@ module "complete_sg" {
 
   name        = "complete-sg"
   description = "Security group with all available arguments set (this is just an example)"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   tags = {
     Cash       = "king"
@@ -97,7 +97,7 @@ module "complete_sg" {
       to_port     = 25
       protocol    = 6
       description = "Service name with vpc cidr"
-      cidr_blocks = "${module.vpc.vpc_cidr_block}"
+      cidr_blocks = module.vpc.vpc_cidr_block
     },
   ]
 
@@ -130,28 +130,28 @@ module "complete_sg" {
   ingress_with_source_security_group_id = [
     {
       rule                     = "mysql-tcp"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
     {
       from_port                = 10
       to_port                  = 10
       protocol                 = 6
       description              = "Service name"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
   ]
 
   computed_ingress_with_source_security_group_id = [
     {
       rule                     = "postgresql-tcp"
-      source_security_group_id = "${module.main_sg.this_security_group_id}"
+      source_security_group_id = module.main_sg.this_security_group_id
     },
     {
       from_port                = 23
       to_port                  = 23
       protocol                 = 6
       description              = "Service name"
-      source_security_group_id = "${module.main_sg.this_security_group_id}"
+      source_security_group_id = module.main_sg.this_security_group_id
     },
   ]
 
@@ -225,7 +225,7 @@ module "complete_sg" {
   computed_egress_with_cidr_blocks = [
     {
       rule        = "https-443-tcp"
-      cidr_blocks = "${module.vpc.vpc_cidr_block}"
+      cidr_blocks = module.vpc.vpc_cidr_block
     },
   ]
 
@@ -258,21 +258,21 @@ module "complete_sg" {
   egress_with_source_security_group_id = [
     {
       rule                     = "mysql-tcp"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
     {
       from_port                = 10
       to_port                  = 10
       protocol                 = 6
       description              = "Service name"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
   ]
 
   computed_egress_with_source_security_group_id = [
     {
       rule                     = "postgresql-tcp"
-      source_security_group_id = "${module.main_sg.this_security_group_id}"
+      source_security_group_id = module.main_sg.this_security_group_id
     },
   ]
 
@@ -315,7 +315,7 @@ module "ipv4_ipv6_example" {
 
   name        = "ipv4-ipv6-example"
   description = "IPv4 and IPv6 example"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_with_cidr_blocks = [
     {
@@ -366,10 +366,11 @@ module "fixed_name_sg" {
 
   name        = "fixed-name-sg"
   description = "Security group with fixed name"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   use_name_prefix = false
 
   ingress_cidr_blocks = ["10.10.0.0/16"]
   ingress_rules       = ["https-443-tcp"]
 }
+
diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
@@ -1,24 +1,25 @@
 output "this_security_group_id" {
   description = "The ID of the security group"
-  value       = "${module.complete_sg.this_security_group_id}"
+  value       = module.complete_sg.this_security_group_id
 }
 
 output "this_security_group_vpc_id" {
   description = "The VPC ID"
-  value       = "${module.complete_sg.this_security_group_vpc_id}"
+  value       = module.complete_sg.this_security_group_vpc_id
 }
 
 output "this_security_group_owner_id" {
   description = "The owner ID"
-  value       = "${module.complete_sg.this_security_group_owner_id}"
+  value       = module.complete_sg.this_security_group_owner_id
 }
 
 output "this_security_group_name" {
   description = "The name of the security group"
-  value       = "${module.complete_sg.this_security_group_name}"
+  value       = module.complete_sg.this_security_group_name
 }
 
 output "this_security_group_description" {
   description = "The description of the security group"
-  value       = "${module.complete_sg.this_security_group_description}"
+  value       = module.complete_sg.this_security_group_description
 }
+
diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/examples/computed/main.tf b/examples/computed/main.tf
@@ -11,7 +11,7 @@ data "aws_vpc" "default" {
 
 data "aws_security_group" "default" {
   name   = "default"
-  vpc_id = "${data.aws_vpc.default.id}"
+  vpc_id = data.aws_vpc.default.id
 }
 
 ###########################
@@ -22,14 +22,14 @@ module "http_sg" {
 
   name        = "computed-http-sg"
   description = "Security group with HTTP port open for everyone, and HTTPS open just for the default security group"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["0.0.0.0/0"]
 
   ingress_with_source_security_group_id = [
     {
       rule                     = "https-443-tcp"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
   ]
 }
@@ -39,16 +39,17 @@ module "mysql_sg" {
 
   name        = "computed-mysql-sg"
   description = "Security group with MySQL/Aurora port open for HTTP security group created above (computed)"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["0.0.0.0/0"]
 
   computed_ingress_with_source_security_group_id = [
     {
       rule                     = "mysql-tcp"
-      source_security_group_id = "${module.http_sg.this_security_group_id}"
+      source_security_group_id = module.http_sg.this_security_group_id
     },
   ]
 
   number_of_computed_ingress_with_source_security_group_id = 1
 }
+
diff --git a/examples/computed/outputs.tf b/examples/computed/outputs.tf
@@ -1,24 +1,25 @@
 output "this_security_group_id" {
   description = "The ID of the security group"
-  value       = "${module.mysql_sg.this_security_group_id}"
+  value       = module.mysql_sg.this_security_group_id
 }
 
 output "this_security_group_vpc_id" {
   description = "The VPC ID"
-  value       = "${module.mysql_sg.this_security_group_vpc_id}"
+  value       = module.mysql_sg.this_security_group_vpc_id
 }
 
 output "this_security_group_owner_id" {
   description = "The owner ID"
-  value       = "${module.mysql_sg.this_security_group_owner_id}"
+  value       = module.mysql_sg.this_security_group_owner_id
 }
 
 output "this_security_group_name" {
   description = "The name of the security group"
-  value       = "${module.mysql_sg.this_security_group_name}"
+  value       = module.mysql_sg.this_security_group_name
 }
 
 output "this_security_group_description" {
   description = "The description of the security group"
-  value       = "${module.mysql_sg.this_security_group_description}"
+  value       = module.mysql_sg.this_security_group_description
 }
+
diff --git a/examples/computed/versions.tf b/examples/computed/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/examples/disabled/main.tf b/examples/disabled/main.tf
@@ -11,7 +11,7 @@ data "aws_vpc" "default" {
 
 data "aws_security_group" "default" {
   name   = "default"
-  vpc_id = "${data.aws_vpc.default.id}"
+  vpc_id = data.aws_vpc.default.id
 }
 
 ########################################################
@@ -23,7 +23,7 @@ module "complete_sg_disabled" {
   create      = false
   name        = "complete-sg"
   description = "Security group with all available arguments set (this is just an example)"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["0.0.0.0/0"]
 }
@@ -34,7 +34,8 @@ module "http_sg_disabled" {
   create      = false
   name        = "http-sg"
   description = "Security group with HTTP ports open for everybody (IPv4 CIDR), egress ports are all world open"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["0.0.0.0/0"]
 }
+
diff --git a/examples/disabled/outputs.tf b/examples/disabled/outputs.tf
@@ -1,4 +1,5 @@
 output "this_security_group_id" {
   description = "The ID of the security group"
-  value       = "${module.complete_sg_disabled.this_security_group_id}"
+  value       = module.complete_sg_disabled.this_security_group_id
 }
+
diff --git a/examples/disabled/versions.tf b/examples/disabled/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/examples/dynamic/main.tf b/examples/dynamic/main.tf
@@ -11,7 +11,7 @@ data "aws_vpc" "default" {
 
 data "aws_security_group" "default" {
   name   = "default"
-  vpc_id = "${data.aws_vpc.default.id}"
+  vpc_id = data.aws_vpc.default.id
 }
 
 ###########################
@@ -26,14 +26,15 @@ module "http_sg" {
 
   name        = "dynamic-http-sg"
   description = "Security group with HTTP port open for everyone, and HTTPS open just for the default security group"
-  vpc_id      = "${data.aws_vpc.default.id}"
+  vpc_id      = data.aws_vpc.default.id
 
   ingress_cidr_blocks = ["0.0.0.0/0"]
 
   ingress_with_source_security_group_id = [
     {
       rule                     = "https-443-tcp"
-      source_security_group_id = "${data.aws_security_group.default.id}"
+      source_security_group_id = data.aws_security_group.default.id
     },
   ]
 }
+
diff --git a/examples/dynamic/outputs.tf b/examples/dynamic/outputs.tf
@@ -1,24 +1,25 @@
 output "this_security_group_id" {
   description = "The ID of the security group"
-  value       = "${module.http_sg.this_security_group_id}"
+  value       = module.http_sg.this_security_group_id
 }
 
 output "this_security_group_vpc_id" {
   description = "The VPC ID"
-  value       = "${module.http_sg.this_security_group_vpc_id}"
+  value       = module.http_sg.this_security_group_vpc_id
 }
 
 output "this_security_group_owner_id" {
   description = "The owner ID"
-  value       = "${module.http_sg.this_security_group_owner_id}"
+  value       = module.http_sg.this_security_group_owner_id
 }
 
 output "this_security_group_name" {
   description = "The name of the security group"
-  value       = "${module.http_sg.this_security_group_name}"
+  value       = module.http_sg.this_security_group_name
 }
 
 output "this_security_group_description" {
   description = "The description of the security group"
-  value       = "${module.http_sg.this_security_group_description}"
+  value       = module.http_sg.this_security_group_description
 }
+
diff --git a/examples/dynamic/versions.tf b/examples/dynamic/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}