Bugfix/repair errors from recent merges (#186)

* testing current version * latest:
uktrade · Dec 17, 2024 · f3f7660 · f3f7660
1 parent b8583ca
commit f3f7660
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/infra/ecr.tf b/infra/ecr.tf
@@ -229,10 +229,6 @@ resource "aws_ecr_repository" "arango" {
   name  = "${var.prefix}-arango"
 }
 
-resource "aws_ecr_repository" "sagemaker" {
-  name = "${var.prefix}-sagemaker"
-}
-
 resource "aws_ecr_lifecycle_policy" "arango_expire_untagged_after_one_day" {
   count      = var.arango_on ? 1 : 0
   repository = aws_ecr_repository.arango[0].name

diff --git a/infra/sagemaker.tf b/infra/sagemaker.tf
@@ -10,7 +10,7 @@ module "sagemaker_domain" {
 # IAM Roles and Policies for SageMaker
 module "iam" {
   source                        = "./modules/sagemaker_init/iam"
-  prefix                        = "sagemaker"
+  prefix                        = var.prefix
   sagemaker_default_bucket_name = var.sagemaker_default_bucket
   aws_s3_bucket_notebook        = aws_s3_bucket.notebooks
   account_id                    = data.aws_caller_identity.aws_caller_identity.account_id
@@ -119,6 +119,13 @@ module "sns" {
   notification_email = var.sagemaker_budget_emails
 }
 
+module "sagemaker_output_mover" {
+  source                  = "./modules/sagemaker_output_mover"
+  account_id              = data.aws_caller_identity.aws_caller_identity.account_id
+  aws_region              = data.aws_region.aws_region.name
+  s3_bucket_notebooks_arn = aws_s3_bucket.notebooks.arn
+}
+
 module "log_group" {
   source              = "./modules/logs"
   prefix              = "data-workspace-sagemaker"
@@ -154,5 +161,3 @@ module "budgets" {
   sns_topic_arn       = module.sns.sns_topic_arn
   notification_email  = var.sagemaker_budget_emails
 }
-
-