[NRL-1386] Rename ec2 module, add toggle for powerbi gw deploy.

Author: mattdean3-nhs

terraform/account-wide-infrastructure/dev/ec2.tf

@@ -1,4 +1,5 @@
 module "vpc" {
+  count                          = var.enable_powerbi_auto_push ? 1 : 0
   source                         = "../modules/vpc"
   vpc_cidr_block                 = var.vpc_cidr_block
   enable_dns_hostnames           = var.enable_dns_hostnames
@@ -8,16 +9,17 @@ module "vpc" {
   name_prefix                    = "nhsd-nrlf--dev"
 }
 
-module "powerbi_gw_instance_v2" {
-  source             = "../modules/ec2"
-  use_custom_ami     = true
-  instance_type      = var.instance_type
+module "powerbi_gw_instance" {
+  count              = var.enable_powerbi_auto_push ? 1 : 0
+  source             = "../modules/powerbi-gw-ec2"
+  use_custom_ami     = var.use_powerbi_gw_custom_ami
+  instance_type      = var.powerbi_gw_instance_type
   name_prefix        = "nhsd-nrlf--dev-powerbi-gw-v2"
   target_bucket_arn  = module.dev-glue.target_bucket_arn
   glue_kms_key_arn   = module.dev-glue.aws_kms_key_arn
   athena_kms_key_arn = module.dev-athena.kms_key_arn
   athena_bucket_arn  = module.dev-athena.bucket_arn
 
-  subnet_id       = module.vpc.private_subnet_id
-  security_groups = [module.vpc.powerbi_gw_security_group_id]
+  subnet_id       = module.vpc[0].private_subnet_id
+  security_groups = [module.vpc[0].powerbi_gw_security_group_id]
 }

terraform/account-wide-infrastructure/dev/vars.tf

@@ -44,14 +44,20 @@ variable "vpc_private_subnets_cidr_block" {
   default     = "10.0.1.0/24"
 }
 
-variable "instance_type" {
+variable "enable_powerbi_auto_push" {
+  type        = bool
+  description = "Enable automatic pushing of info into PowerBI"
+  default     = false
+}
+
+variable "powerbi_gw_instance_type" {
   type        = string
-  description = "Type for EC2 Instance"
+  description = "Type for PowerBI GW EC2 Instance"
   default     = "t2.micro"
 }
 
-variable "use_custom_ami" {
+variable "use_powerbi_gw_custom_ami" {
   type        = bool
-  description = "Use custom image"
-  default     = false
+  description = "Use custom image for PowerBI GW instance"
+  default     = true
 }

…-wide-infrastructure/modules/ec2/data.tf …structure/modules/powerbi-gw-ec2/data.tfterraform/account-wide-infrastructure/modules/ec2/data.tf renamed to terraform/account-wide-infrastructure/modules/powerbi-gw-ec2/data.tf terraform/account-wide-infrastructure/modules/ec2/data.tf renamed to terraform/account-wide-infrastructure/modules/powerbi-gw-ec2/data.tf

@@ -55,7 +55,6 @@ resource "aws_route_table" "private_rt" {
 }
 
 resource "aws_eip" "natgw-ip" {
-  domain = "vpc"
 }
 
 resource "aws_nat_gateway" "nat" {