From 1cce759fcd3add6df94071ec641d8517c0774c7b Mon Sep 17 00:00:00 2001
From: mohit <MMotwani@no10.gov.uk>
Date: Mon, 25 Mar 2024 17:28:26 +0000
Subject: [PATCH] cleaning up code for iam permissions

---
 infrastructure/batch.tf    | 19 -------------------
 infrastructure/ecr.tf      |  4 ++--
 infrastructure/ecs.tf      |  2 +-
 infrastructure/provider.tf | 10 ++++++++++
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/infrastructure/batch.tf b/infrastructure/batch.tf
index 39842480..9216f3d6 100644
--- a/infrastructure/batch.tf
+++ b/infrastructure/batch.tf
@@ -24,22 +24,3 @@ module "batch_job_defintiion" {
   image                   = module.ecr_pre_processing.ecr_repository_url
   fargate_flag            = false
 }
-
-# The ECS task will need to invoke SageMaker endpoint
-resource "aws_iam_policy" "sagemaker_invoke" {
-  name        = "SageMakerInvokePolicy"
-  description = "Policy that allows ECS tasks to invoke SageMaker endpoints"
-
-  policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Action": "sagemaker:InvokeEndpoint",
-      "Effect": "Allow",
-      "Resource": "*"
-    }
-  ]
-}
-EOF
-}
diff --git a/infrastructure/ecr.tf b/infrastructure/ecr.tf
index 0581d0eb..fb4bc75b 100644
--- a/infrastructure/ecr.tf
+++ b/infrastructure/ecr.tf
@@ -3,11 +3,11 @@ module "ecr_front_end" {
   source = "../../i-ai-core-infrastructure//modules/ecr"
 
   project_name_prefix = var.project_name
-  container_name      = "front-end"
+  container_name      = "${terraform.workspace}-front-end"
 }
 
 module "ecr_pre_processing" {
   source              = "../../i-ai-core-infrastructure//modules/ecr"
   project_name_prefix = var.project_name
-  container_name      = "pre-processing"
+  container_name      = "${terraform.workspace}-pre-processing"
 }
diff --git a/infrastructure/ecs.tf b/infrastructure/ecs.tf
index e2accb2d..6d21ac3d 100644
--- a/infrastructure/ecs.tf
+++ b/infrastructure/ecs.tf
@@ -2,7 +2,7 @@ module "ecs" {
   source             = "../../i-ai-core-infrastructure//modules/ecs"
   project_name       = var.project_name
   image_tag          = "dfcde6a235a58d4e708e53c9c2252477516c414b"
-  prefix             = "i-dot-ai"
+  prefix             = "i-ai"
   ecr_repository_uri = module.ecr_front_end.ecr_repository_url
   ecs_cluster_id     = data.terraform_remote_state.platform.outputs.ecs_cluster_id
   health_check = {
diff --git a/infrastructure/provider.tf b/infrastructure/provider.tf
index db82f184..30b4769a 100644
--- a/infrastructure/provider.tf
+++ b/infrastructure/provider.tf
@@ -10,8 +10,18 @@ terraform {
   backend "s3" {
     key = "consultation-analyser/terraform.tfstate"
   }
+
 }
 
 provider "random" {
 
 }
+
+provider "aws" {
+  default_tags {
+    tags = {
+      Environment = terraform.workspace
+      Deployed    = "github"
+    }
+  }
+}