Merge pull request #523 from SmartColumbusOS/aip_migration

Adding visibility tag to vpc

Author: srashee1

features/elasticsearch.hcl

@@ -133,7 +133,7 @@ POLICY
 }
 
 resource "aws_iam_service_linked_role" "elasticsearch" {
-  count = var.sandbox ? 0 : 1
+  count            = var.sandbox ? 0 : 1
   aws_service_name = "es.amazonaws.com"
 }
 
@@ -161,10 +161,10 @@ resource "aws_security_group_rule" "vpn_to_elasticsearch" {
   description       = "Allow VPN hosts to communicate with ElasticSearch instances."
   protocol          = "tcp"
   security_group_id = aws_security_group.elasticsearch.id
-  cidr_blocks = [data.terraform_remote_state.alm_remote_state.outputs.vpc_cidr_block]
-  from_port   = 443
-  to_port     = 443
-  type        = "ingress"
+  cidr_blocks       = [data.terraform_remote_state.alm_remote_state.outputs.vpc_cidr_block]
+  from_port         = 443
+  to_port           = 443
+  type              = "ingress"
 }
 
 resource "aws_security_group_rule" "elasticsearch_intra_cluster" {

features/redis.hcl

@@ -36,7 +36,7 @@ resource "aws_security_group_rule" "eks_workers_to_redis" {
 }
 
 resource "aws_elasticache_subnet_group" "redis_cache_subnet" {
-  name = "redis-cache-subnet-${terraform.workspace}"
+  name       = "redis-cache-subnet-${terraform.workspace}"
   subnet_ids = module.vpc.private_subnets
 }
 

s3.tf

@@ -61,7 +61,7 @@ resource "aws_s3_bucket_public_access_block" "os_hosted_datasets_s3_access" {
 }
 
 resource "aws_s3_bucket_policy" "os_hosted_datasets_ssl_policy" {
-  depends_on = [ aws_s3_bucket_public_access_block.os_hosted_datasets_s3_access ]
+  depends_on = [aws_s3_bucket_public_access_block.os_hosted_datasets_s3_access]
 
   bucket = aws_s3_bucket.os_hosted_datasets.id
 
@@ -112,7 +112,7 @@ resource "aws_s3_bucket_public_access_block" "ckan_s3_access" {
 }
 
 resource "aws_s3_bucket_policy" "ckan_ssl_policy" {
-  depends_on = [ aws_s3_bucket_public_access_block.ckan_s3_access ]
+  depends_on = [aws_s3_bucket_public_access_block.ckan_s3_access]
 
   bucket = aws_s3_bucket.ckan.id
 
@@ -178,7 +178,7 @@ resource "aws_s3_bucket_public_access_block" "andi_public_sample_datasets_access
 }
 
 resource "aws_s3_bucket_policy" "andi_ssl_policy" {
-  depends_on = [ aws_s3_bucket_public_access_block.andi_public_sample_datasets_access ]
+  depends_on = [aws_s3_bucket_public_access_block.andi_public_sample_datasets_access]
 
   bucket = aws_s3_bucket.andi_public_sample_datasets.id
 

shared

@@ -47,6 +47,11 @@ module "vpc" {
   private_subnet_tags = {
     "kubernetes.io/role/internal-elb" = ""
     "kubernetes.io/role/alb-ingress"  = ""
+    "Visibility"                      = "private"
+  }
+
+  public_subnet_tags = {
+    "Visibility" = "public"
   }
 
   tags = {
@@ -60,7 +65,7 @@ module "vpc" {
 resource "aws_db_subnet_group" "default" {
   name        = "environment db ${terraform.workspace} subnet group"
   description = "DB Subnet Group"
-  subnet_ids = module.vpc.private_subnets
+  subnet_ids  = module.vpc.private_subnets
 
   tags = {
     Name = "Subnet Group for Environment ${terraform.workspace} VPC"