move ECR repo creation to shared-env (#236)

Author: deven96

templates/terraform/environments/prod/main.tf

@@ -29,7 +29,7 @@ provider "aws" {
   allowed_account_ids = [local.account_id]
 }
 
-# remote state of "shared" - contains mostly IAM users that will be shared between environments
+# remote state of "shared" - contains IAM users that will be shared between environments and ecr repository for docker images
 data "terraform_remote_state" "shared" {
   backend = "s3"
   config = {
@@ -52,9 +52,6 @@ module "prod" {
   allowed_account_ids = [local.account_id]
   random_seed         = local.random_seed
 
-  # ECR configuration
-  ecr_repositories = [] # Should be created by the staging environment
-
   # EKS configuration
   eks_cluster_version = "1.21"
   # Cluster addons. These often need to be updated when upgrading the cluster version.

templates/terraform/environments/shared/main.tf

@@ -110,6 +110,20 @@ resource "aws_iam_access_key" "access_user" {
   depends_on = [aws_iam_user.access_user]
 }
 
+data "aws_iam_user" "ci_user" {
+  user_name = local.ci_user_name
+}
+
+module "ecr" {
+  source  = "commitdev/zero/aws//modules/ecr"
+  version = "0.4.0"
+
+  environment      = "stage"
+  ecr_repositories = [local.project]
+  ecr_principals   = [data.aws_iam_user.ci_user.arn]
+}
+
+
 module "secret_keys" {
   source  = "commitdev/zero/aws//modules/secret"
   version = "0.0.2"

templates/terraform/environments/stage/main.tf

@@ -29,7 +29,7 @@ provider "aws" {
   allowed_account_ids = [local.account_id]
 }
 
-# remote state of "shared" - contains mostly IAM users that will be shared between environments
+# remote state of "shared" - contains IAM users that will be shared between environments and ecr repository for docker images
 data "terraform_remote_state" "shared" {
   backend = "s3"
   config = {
@@ -63,9 +63,6 @@ module "stage" {
   allowed_account_ids = [local.account_id]
   random_seed         = local.random_seed
 
-  # ECR configuration
-  ecr_repositories = [ local.project ]
-
   # EKS configuration
   eks_cluster_version = "1.21"
   # Cluster addons. These often need to be updated when upgrading the cluster version.

templates/terraform/modules/environment/main.tf

@@ -32,9 +32,6 @@ locals {
   ]
 }
 
-data "aws_iam_user" "ci_user" {
-  user_name = var.ci_user_name
-}
 
 module "vpc" {
   source  = "commitdev/zero/aws//modules/vpc"
@@ -125,15 +122,6 @@ module "db" {
   database_engine           = var.database
 }
 
-module "ecr" {
-  source  = "commitdev/zero/aws//modules/ecr"
-  version = "0.4.0"
-
-  environment      = var.environment
-  ecr_repositories = var.ecr_repositories
-  ecr_principals   = [data.aws_iam_user.ci_user.arn]
-}
-
 module "logging" {
   source  = "commitdev/zero/aws//modules/logging"
   version = "0.4.0"

templates/terraform/modules/environment/variables.tf

@@ -19,10 +19,6 @@ variable "random_seed" {
   description = "A randomly generated string to prevent collisions of resource names - should be unique within an AWS account"
 }
 
-variable "ecr_repositories" {
-  description = "List of ECR repository names to create"
-  type        = list(string)
-}
 
 variable "eks_cluster_version" {
   description = "EKS cluster version number to use. Incrementing this will start a cluster upgrade"
@@ -47,7 +43,7 @@ variable "eks_addon_coredns_version" {
 }
 
 variable "eks_node_groups" {
-  type = any
+  type        = any
   description = "Map of maps of eks node group config where keys are node group names. See the EKS module documentation for details"
 }