No more need for eventbridge

Author: heerener

hpc/resource-provisioner/eventbridge.tf

@@ -31,8 +31,7 @@ resource "aws_lambda_function" "hpc_resource_provisioner_lambda" {
       FS_SUBNET_IDS        = jsonencode(var.fs_subnet_ids)
       FS_SG_ID             = var.fs_sg_id
       # API_GW_STAGE_ARN     = aws_api_gateway_stage.hpc_resource_provisioner_api_stage.arn
-      API_GW_STAGE_ARN     = "arn:aws:execute-api:${var.aws_region}:${var.account_id}:kmlnf84csk/" # TODO: don't hardcode, find a way to do this without a cycle
-      EVENTBRIDGE_ROLE_ARN = aws_iam_role.resource_provisioner_eventbridge.arn
+      API_GW_STAGE_ARN = "arn:aws:execute-api:${var.aws_region}:${var.account_id}:kmlnf84csk/" # TODO: don't hardcode, find a way to do this without a cycle
     }
   }
 }

hpc/resource-provisioner/hpc_resource_provisioner_eventbridge_assume_role_policy.json

@@ -110,12 +110,6 @@ variable "private_alb_https_listener_arn" {
   type = string
 }
 
-variable "is_hpc_dev" {
-  type      = bool
-  default   = false
-  sensitive = false
-}
-
 variable "sboinfrastructureassets_bucket_name" {
   type = string
 }

hpc/resource-provisioner/hpc_resource_provisioner_eventbridge_policy.tftpl

@@ -323,7 +323,6 @@ module "hpc" {
   scratch_bucket                             = var.hpc_resource_provisioner_scratch_bucket
   scratch_bucket_arn                         = var.hpc_resource_provisioner_scratch_bucket_arn
   private_alb_https_listener_arn             = local.private_alb_https_listener_arn
-  is_hpc_dev                                 = true
   sboinfrastructureassets_bucket_name        = var.sbo_infrastructureassets_bucket
   pcluster_ami_id                            = var.pcluster_ami_id
 }

hpc/resource-provisioner/iam.tf

@@ -58,10 +58,9 @@ keycloak_task_size = {
   memory = 2048
 }
 coreservices_public_key                    = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCy8UW1JdUjIuiiaI+xFId3smXFe6iwxdn6Klqi8y4E+cFHP/uQxW4AuCfJVoOjOQ2CNU0UIGRlCkw3IwUmZvwGjFZS1Vs6jt+KjWiDRdFzQQrz5+vuqPX2576wXlT+EHe0W6r7Qla5i1L6cjz6/E4u5yFZ3MJQSBYjLqXjT7Da4R72gPx9oiIoSH2JBu3vHyfkTEo3l6C+WJlYnUGOLnUxGGGnhJrBKmIRNMmtRNgQlBkPR4mnCAFABJfgpzgNf4bpqLbma5DabQGbvpX6qCLSAV5Zdd4gBQLIAJfS/a5pMWaIy9qDTWB2vy4Z39HI45k6efrLL+xgo+XYSRqn5jDT heeren@Mac"
-hpc_resource_provisioner_container_version = "0.5.12.dev5"
+hpc_resource_provisioner_container_version = "0.5.12.dev12"
 core_web_app_deployment_env                = "staging"
 core_web_app_next_public_matomo_site_id    = "3"
-is_hpc_dev                                 = true
 
 # Sandbox placeholders
 nise_dockerhub_password = "placeholder"

hpc/resource-provisioner/lambda.tf

@@ -5,7 +5,6 @@ terraform apply -auto-approve \
                 -target="module.hpc.module.security" \
                 -target="module.hpc.module.networking" \
                 -target="module.hpc.module.resource-provisioner" \
-               -target="module.hpc.module.resource-provisioner-dev" \
                 -target="module.hpc.module.dynamodb" \
                 -target="module.hpc.module.efs" \
                 -target="module.coreservices_key" \

hpc/variables.tf

@@ -41,9 +41,3 @@ variable "deployment_env" {
   type        = string
   description = "The deployment environment, values: 'staging', 'production'"
 }
-
-variable "is_hpc_dev" {
-  type      = bool
-  default   = false
-  sensitive = false
-}