bugfix: repair erroneous commits

uktrade · Dec 16, 2024 · 3883a2b · 3883a2b
1 parent b8583ca
commit 3883a2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/infra/ecr.tf b/infra/ecr.tf
@@ -251,10 +251,6 @@ data "aws_ecr_lifecycle_policy_document" "expire_untagged_after_one_day" {
   }
 }
 
-resource "aws_ecr_repository" "sagemaker" {
-  name = "${var.prefix}-sagemaker"
-}
-
 resource "aws_vpc_endpoint" "ecr_dkr" {
   vpc_id              = aws_vpc.main.id
   service_name        = "com.amazonaws.${data.aws_region.aws_region.name}.ecr.dkr"

diff --git a/infra/sagemaker.tf b/infra/sagemaker.tf
@@ -24,15 +24,6 @@ module "s3" {
   prefix = "sagemaker-logs"
 }
 
-
-# Security Group for SageMaker Notebooks and Endpoints
-# module "security_groups" {
-#   source      = "./modules/sagemaker_init/security"
-#   vpc_id      = aws_vpc.main.id
-#   prefix      = var.prefix
-#   cidr_blocks = [aws_vpc.notebooks.cidr_block]
-# }
-
 resource "aws_security_group" "notebooks_endpoints" {
   name        = "${var.prefix}-notebooks-endpoints"
   description = "${var.prefix}-notebooks-endpoints"
@@ -94,14 +85,6 @@ output "default_sagemaker_bucket" {
   value = module.iam.default_sagemaker_bucket
 }
 
-# # Security Group Output
-# output "security_group_id" {
-#   value       = module.security_groups.security_group_id
-#   description = "The ID of the security group for SageMaker endpoints"
-# }
-
-# Cost monitoring
-
 module "cost_monitoring_dashboard" {
   source         = "./modules/cost_monitoring/sagemaker"
   dashboard_name = "aws-cost-monitoring-dashboard"
@@ -112,6 +95,13 @@ module "cost_monitoring_dashboard" {
   ]
 }
 
+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 "sns" {
   source             = "./modules/sns"
   prefix             = "data-workspace-sagemaker"
@@ -154,5 +144,3 @@ module "budgets" {
   sns_topic_arn       = module.sns.sns_topic_arn
   notification_email  = var.sagemaker_budget_emails
 }
-
-