From eb72b0223f629e2e3499b887598fd72142fe282a Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Thu, 4 Jun 2026 09:11:08 +0000 Subject: [PATCH] add ECO_SHAREPOINT_ID env var --- .github/workflows/_deploy_lambda.yml | 4 ++++ .github/workflows/deploy_terraform.yml | 1 + backend/app/config.py | 1 + backend/pashub_fetcher/trigger_pashub_sqs_from_file.py | 8 +++++--- deployment/terraform/lambda/pashub_to_ara/main.tf | 1 + deployment/terraform/lambda/pashub_to_ara/variables.tf | 5 +++++ utils/sharepoint/domna_sites.py | 1 + 7 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_deploy_lambda.yml b/.github/workflows/_deploy_lambda.yml index 70f9eabe..0035a579 100644 --- a/.github/workflows/_deploy_lambda.yml +++ b/.github/workflows/_deploy_lambda.yml @@ -76,6 +76,8 @@ on: required: false TF_VAR_social_housing_wave_3_sharepoint_id: required: false + TF_VAR_eco_sharepoint_id: + required: false TF_VAR_pashub_email: required: false TF_VAR_pashub_password: @@ -159,6 +161,7 @@ jobs: TF_VAR_osmosis_acd_sharepoint_id: ${{ secrets.TF_VAR_osmosis_acd_sharepoint_id }} TF_VAR_private_pay_sharepoint_id: ${{ secrets.TF_VAR_private_pay_sharepoint_id }} TF_VAR_social_housing_wave_3_sharepoint_id: ${{ secrets.TF_VAR_social_housing_wave_3_sharepoint_id }} + TF_VAR_eco_sharepoint_id: ${{ secrets.TF_VAR_eco_sharepoint_id }} TF_VAR_pashub_email: ${{ secrets.TF_VAR_pashub_email }} TF_VAR_pashub_password: ${{ secrets.TF_VAR_pashub_password }} TF_VAR_pashub_coordination_email: ${{ secrets.TF_VAR_pashub_coordination_email }} @@ -210,6 +213,7 @@ jobs: TF_VAR_osmosis_acd_sharepoint_id: ${{ secrets.TF_VAR_osmosis_acd_sharepoint_id }} TF_VAR_private_pay_sharepoint_id: ${{ secrets.TF_VAR_private_pay_sharepoint_id }} TF_VAR_social_housing_wave_3_sharepoint_id: ${{ secrets.TF_VAR_social_housing_wave_3_sharepoint_id }} + TF_VAR_eco_sharepoint_id: ${{ secrets.TF_VAR_eco_sharepoint_id }} TF_VAR_pashub_email: ${{ secrets.TF_VAR_pashub_email }} TF_VAR_pashub_password: ${{ secrets.TF_VAR_pashub_password }} TF_VAR_pashub_coordination_email: ${{ secrets.TF_VAR_pashub_coordination_email }} diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml index fc999bc0..fd003c8c 100644 --- a/.github/workflows/deploy_terraform.yml +++ b/.github/workflows/deploy_terraform.yml @@ -448,6 +448,7 @@ jobs: TF_VAR_osmosis_acd_sharepoint_id: ${{ secrets.OSMOSIS_ACD_SHAREPOINT_ID }} TF_VAR_private_pay_sharepoint_id: ${{ secrets.PRIVATE_PAY_SHAREPOINT_ID }} TF_VAR_social_housing_wave_3_sharepoint_id: ${{ secrets.SOCIAL_HOUSING_WAVE_3_SHAREPOINT_ID }} + TF_VAR_eco_sharepoint_id: ${{ secrets.TF_VAR_eco_sharepoint_id }} TF_VAR_pashub_email: ${{ secrets.PASHUB_EMAIL }} TF_VAR_pashub_password: ${{ secrets.PASHUB_PASSWORD }} TF_VAR_pashub_coordination_email: ${{ secrets.PASHUB_COORDINATION_EMAIL }} diff --git a/backend/app/config.py b/backend/app/config.py index f969518d..1dc3daaf 100644 --- a/backend/app/config.py +++ b/backend/app/config.py @@ -82,6 +82,7 @@ class Settings(BaseSettings): OSMOSIS_ACD_SHAREPOINT_ID: Optional[str] = None PRIVATE_PAY_SHAREPOINT_ID: Optional[str] = None SOCIAL_HOUSING_WAVE_3_SHAREPOINT_ID: Optional[str] = None + ECO_SHAREPOINT_ID: Optional[str] = None OPENAI_API_KEY: Optional[str] = None # Pas Hub diff --git a/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py b/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py index 118c0aca..fe3ec7d8 100644 --- a/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py +++ b/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py @@ -52,12 +52,14 @@ EXCEL_PATH: str = os.path.join( "local_run_02-06-2026/ECO_Approach_Coordination_Design_KN.xlsx", ) -SHAREPOINT_PROPERTIES_FOLDER: str = "" +SHAREPOINT_PROPERTIES_FOLDER: str = ( + "https://domnagroup.sharepoint.com/:f:/s/ECO/IgCCLUg3PJ-eS7BLDAwiNlelAW_WXLCb9wcjkigbLfHhPOY?e=DTbNNv" +) def _build_requests(excel_path: str) -> list[PashubToAraTriggerRequest]: wb = load_workbook(excel_path, data_only=True) - ws = wb.worksheets[0] + ws = wb.worksheets[1] headers: dict[str, int] = {} for col in range(1, ws.max_column + 1): @@ -123,7 +125,7 @@ def main() -> None: for request in trigger_requests: action: str = "DRY RUN" if DRY_RUN else "SENDING" logger.info( - f"[{action}] deal_id={request.hubspot_deal_id} pashub_link={request.pashub_link}" + f"[{action}] deal_id={request.hubspot_deal_id} pashub_link={request.pashub_link} sharepoint_link={request.sharepoint_link}" ) if not DRY_RUN: diff --git a/deployment/terraform/lambda/pashub_to_ara/main.tf b/deployment/terraform/lambda/pashub_to_ara/main.tf index eba9c874..b5714055 100644 --- a/deployment/terraform/lambda/pashub_to_ara/main.tf +++ b/deployment/terraform/lambda/pashub_to_ara/main.tf @@ -47,6 +47,7 @@ module "lambda" { OSMOSIS_ACD_SHAREPOINT_ID = var.osmosis_acd_sharepoint_id PRIVATE_PAY_SHAREPOINT_ID = var.private_pay_sharepoint_id SOCIAL_HOUSING_WAVE_3_SHAREPOINT_ID = var.social_housing_wave_3_sharepoint_id + ECO_SHAREPOINT_ID = var.eco_sharepoint_id PASHUB_EMAIL = var.pashub_email PASHUB_PASSWORD = var.pashub_password PASHUB_COORDINATION_EMAIL = var.pashub_coordination_email diff --git a/deployment/terraform/lambda/pashub_to_ara/variables.tf b/deployment/terraform/lambda/pashub_to_ara/variables.tf index cdeff256..29b7af70 100644 --- a/deployment/terraform/lambda/pashub_to_ara/variables.tf +++ b/deployment/terraform/lambda/pashub_to_ara/variables.tf @@ -92,6 +92,11 @@ variable "social_housing_wave_3_sharepoint_id" { sensitive = true } +variable "eco_sharepoint_id" { + type = string + sensitive = true +} + variable "pashub_email" { type = string sensitive = true diff --git a/utils/sharepoint/domna_sites.py b/utils/sharepoint/domna_sites.py index e5efb82c..ce579af6 100644 --- a/utils/sharepoint/domna_sites.py +++ b/utils/sharepoint/domna_sites.py @@ -9,3 +9,4 @@ class DomnaSites(Enum): OSMOSIS_ACD = os.getenv("OSMOSIS_ACD_SHAREPOINT_ID") PRIVATE_PAY = os.getenv("PRIVATE_PAY_SHAREPOINT_ID") SOCIAL_HOUSING_WAVE_3 = os.getenv("SOCIAL_HOUSING_WAVE_3_SHAREPOINT_ID") + ECO = os.getenv("ECO_SHAREPOINT_ID")