remove additional bucket names as env vars in deploy_lambda

This commit is contained in:
Daniel Roth 2026-03-04 16:12:25 +00:00
parent 30c3a77368
commit 19656f20a4
3 changed files with 7 additions and 10 deletions

View file

@ -52,10 +52,6 @@ on:
required: false
TF_VAR_google_solar_api_key:
required: false
TF_VAR_plan_trigger_bucket:
required: false
TF_VAR_data_bucket:
required: false
TF_VAR_predictions_bucket:
required: false
@ -112,8 +108,6 @@ jobs:
TF_VAR_domain_name: ${{ secrets.TF_VAR_domain_name }}
TF_VAR_epc_auth_token: ${{ secrets.TF_VAR_epc_auth_token }}
TF_VAR_google_solar_api_key: ${{ secrets.TF_VAR_google_solar_api_key }}
TF_VAR_plan_trigger_bucket: ${{ secrets.TF_VAR_plan_trigger_bucket }}
TF_VAR_data_bucket: ${{ secrets.TF_VAR_data_bucket }}
TF_VAR_predictions_bucket: ${{ secrets.TF_VAR_predictions_bucket }}
run: |
terraform plan \
@ -137,8 +131,6 @@ jobs:
TF_VAR_domain_name: ${{ secrets.TF_VAR_domain_name }}
TF_VAR_epc_auth_token: ${{ secrets.TF_VAR_epc_auth_token }}
TF_VAR_google_solar_api_key: ${{ secrets.TF_VAR_google_solar_api_key }}
TF_VAR_plan_trigger_bucket: ${{ secrets.TF_VAR_plan_trigger_bucket }}
TF_VAR_data_bucket: ${{ secrets.TF_VAR_data_bucket }}
TF_VAR_predictions_bucket: ${{ secrets.TF_VAR_predictions_bucket }}
run: |
terraform destroy -auto-approve \

View file

@ -47,8 +47,8 @@ module "lambda" {
GOOGLE_SOLAR_API_KEY = var.google_solar_api_key
# Buckets - from terraform state
PLAN_TRIGGER_BUCKET = var.plan_trigger_bucket
DATA_BUCKET = var.data_bucket
PLAN_TRIGGER_BUCKET = data.terraform_remote_state.shared.outputs.retrofit_plan_trigger_bucket_name
DATA_BUCKET = data.terraform_remote_state.shared.outputs.retrofit_sap_data_bucket_name
PREDICTIONS_BUCKET = var.predictions_bucket
SAP_PREDICTIONS_BUCKET = data.terraform_remote_state.shared.outputs.retrofit_sap_predictions_bucket_name
CARBON_PREDICTIONS_BUCKET = data.terraform_remote_state.shared.outputs.retrofit_carbon_predictions_bucket_name

View file

@ -102,6 +102,11 @@ module "s3_presignable_bucket" {
allowed_origins = var.allowed_origins
}
output "retrofit_plan_trigger_bucket_name" {
value = module.s3_presignable_bucket.bucket_name
description = "Name of the retrofit plan trigger bucket"
}
module "s3_due_considerations_bucket" {
source = "../modules/s3_presignable_bucket"
bucketname = "retrofit-due-considerations-${var.stage}"