Refactor sbo{,_} prefix out of infra assets bucket resources

Author: heerener

hpc/compute-cluster/policies.tf

@@ -8,7 +8,7 @@ resource "aws_iam_policy" "parallelcluster_rpms_policy" {
       {
         "Effect" : "Allow",
         "Action" : "s3:GetObject",
-        "Resource" : "arn:aws:s3:::sboinfrastructureassets/rpms/*"
+        "Resource" : "arn:aws:s3:::sboinfrastructureassets*/rpms/*"
       }
     ]
   })

hpc/main.tf

@@ -103,7 +103,7 @@ module "resource-provisioner" {
   containers_bucket    = var.containers_bucket
   scratch_bucket       = var.scratch_bucket
   scratch_bucket_arn   = var.scratch_bucket_arn
-  infra_assets_bucket  = var.sboinfrastructureassets_bucket_name
+  infra_assets_bucket  = var.infrastructureassets_bucket_name
   fsx_policy_arn       = module.security.fsx_policy_arn
   fs_subnet_ids        = module.networking.fs_subnet_ids
   fs_sg_id             = module.security.compute_efs_sg_id
@@ -117,7 +117,7 @@ module "dynamodb" {
 
 module "s3" {
   source                                        = "./s3/"
-  sboinfrastructureassets_bucket_name           = var.sboinfrastructureassets_bucket_name
+  infrastructureassets_bucket_name              = var.infrastructureassets_bucket_name
   hpc_resource_provisioner_sbo_nexusdata_bucket = var.sbo_nexusdata_bucket
   hpc_resource_provisioner_scratch_bucket       = var.scratch_bucket
   account_id                                    = var.account_id

hpc/s3/main.tf

@@ -1,5 +1,5 @@
 locals {
-  infra_assets_bucket_name = trimprefix(var.sboinfrastructureassets_bucket_name, "s3://")
+  infra_assets_bucket_name = trimprefix(var.infrastructureassets_bucket_name, "s3://")
   projects_bucket_name     = trimprefix(var.hpc_resource_provisioner_sbo_nexusdata_bucket, "s3://")
   scratch_bucket_name      = trimprefix(var.hpc_resource_provisioner_scratch_bucket, "s3://")
 }

hpc/s3/variables.tf

@@ -1,4 +1,4 @@
-variable "sboinfrastructureassets_bucket_name" {
+variable "infrastructureassets_bucket_name" {
   type = string
 }
 

hpc/variables.tf

@@ -110,7 +110,7 @@ variable "private_alb_https_listener_arn" {
   type = string
 }
 
-variable "sboinfrastructureassets_bucket_name" {
+variable "infrastructureassets_bucket_name" {
   type = string
 }
 

main.tf

@@ -247,7 +247,7 @@ module "github_ami_build_role" {
   github_organisation      = local.github_organisation
   github_oidc_provider_arn = module.github_oidc_provider.oidc_provider_arn
   repo_name                = "machine-images"
-  bucket_name              = var.sbo_infrastructureassets_bucket
+  bucket_name              = var.infrastructureassets_bucket
 }
 
 module "notebook_service" {
@@ -323,7 +323,7 @@ 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
-  sboinfrastructureassets_bucket_name        = var.sbo_infrastructureassets_bucket
+  infrastructureassets_bucket_name           = var.infrastructureassets_bucket
   pcluster_ami_id                            = var.pcluster_ami_id
 }
 

production.tfvars

@@ -68,7 +68,7 @@ core_web_app_deployment_env                = "production"
 core_web_app_next_public_matomo_site_id    = "1"
 
 hpc_resource_provisioner_sbo_nexusdata_bucket = ""
-sbo_infrastructureassets_bucket               = "s3://sboinfrastructureassets"
+infrastructureassets_bucket                   = "s3://sboinfrastructureassets"
 hpc_resource_provisioner_containers_bucket    = ""
 hpc_resource_provisioner_scratch_bucket       = ""
 hpc_resource_provisioner_scratch_bucket_arn   = ""

sandbox-benchmarks.tfvars

@@ -62,7 +62,7 @@ nise_dockerhub_password = "placeholder"
 ec_apikey2              = "placeholder"
 
 hpc_resource_provisioner_sbo_nexusdata_bucket = "s3://sbonexusdata-sandbox-benchmarks"
-sbo_infrastructureassets_bucket               = "s3://sboinfrastructureassets-sandbox-benchmarks"
+infrastructureassets_bucket                   = "s3://sboinfrastructureassets-sandbox-benchmarks"
 hpc_resource_provisioner_containers_bucket    = "s3://sboinfrastructureassets-sandbox-benchmarks/containers"
 hpc_resource_provisioner_scratch_bucket       = "s3://sbosandbox-cn6l7t"
 hpc_resource_provisioner_scratch_bucket_arn   = "arn:aws:s3:::sbosandbox-cn6l7t"

sandbox-hpc.tfvars

@@ -67,7 +67,7 @@ nise_dockerhub_password = "placeholder"
 ec_apikey2              = "placeholder"
 
 hpc_resource_provisioner_sbo_nexusdata_bucket = "s3://sbonexusdata-sandbox"
-sbo_infrastructureassets_bucket               = "s3://sboinfrastructureassets-sandbox"
+infrastructureassets_bucket                   = "s3://sboinfrastructureassets-sandbox"
 hpc_resource_provisioner_containers_bucket    = "s3://sboinfrastructureassets-sandbox/containers"
 hpc_resource_provisioner_scratch_bucket       = "s3://sbosandbox-lec3cn"
 hpc_resource_provisioner_scratch_bucket_arn   = "arn:aws:s3:::sbosandbox-lec3cn"

staging.tfvars

@@ -57,7 +57,7 @@ core_web_app_deployment_env                = "staging"
 core_web_app_next_public_matomo_site_id    = "3"
 
 hpc_resource_provisioner_sbo_nexusdata_bucket = ""
-sbo_infrastructureassets_bucket               = "s3://sboinfrastructureassets-staging"
+infrastructureassets_bucket                   = "s3://sboinfrastructureassets-staging"
 hpc_resource_provisioner_containers_bucket    = ""
 hpc_resource_provisioner_scratch_bucket       = ""
 hpc_resource_provisioner_scratch_bucket_arn   = ""