junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

deployment from infrastructure

Browse source
This commit is contained in:
Jun-te Kim 2026-05-19 12:55:30 +00:00
parent a11ea1b9b8
commit bc8ca3ead3
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.dockerignore
View file

@ -6,7 +6,7 @@ backend/.idea/*
backend/.env backend/.env
recommendations/tests/* recommendations/tests/*
model_data/tests/* model_data/tests/*
infrastructure/* deployment/*
data_collection/* data_collection/*
node_modules/* node_modules/*
conservation_areas/* conservation_areas/*

46
.github/workflows/deploy_terraform.yml vendored
View file

@ -62,20 +62,20 @@ jobs:
- uses: hashicorp/setup-terraform@v3 - uses: hashicorp/setup-terraform@v3
- name: Terraform Init - name: Terraform Init
working-directory: infrastructure/terraform/shared working-directory: deployment/terraform/shared
run: terraform init -reconfigure run: terraform init -reconfigure
- name: Terraform Workspace - name: Terraform Workspace
working-directory: infrastructure/terraform/shared working-directory: deployment/terraform/shared
run: terraform workspace select ${STAGE} || terraform workspace new ${STAGE} run: terraform workspace select ${STAGE} || terraform workspace new ${STAGE}
- name: Terraform Plan - name: Terraform Plan
working-directory: infrastructure/terraform/shared working-directory: deployment/terraform/shared
run: terraform plan -var-file=${STAGE}.tfvars -out=tfplan run: terraform plan -var-file=${STAGE}.tfvars -out=tfplan
- name: Terraform Apply - name: Terraform Apply
if: env.TERRAFORM_APPLY == 'true' if: env.TERRAFORM_APPLY == 'true'
working-directory: infrastructure/terraform/shared working-directory: deployment/terraform/shared
run: terraform apply -auto-approve tfplan run: terraform apply -auto-approve tfplan
# ============================================================ # ============================================================
@ -101,7 +101,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: ara_engine lambda_name: ara_engine
lambda_path: infrastructure/terraform/lambda/engine lambda_path: deployment/terraform/lambda/engine
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: engine-${{ needs.determine_stage.outputs.stage }} ecr_repo: engine-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.ara_engine_image.outputs.image_digest }} image_digest: ${{ needs.ara_engine_image.outputs.image_digest }}
@ -150,7 +150,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: address2uprn lambda_name: address2uprn
lambda_path: infrastructure/terraform/lambda/address2UPRN lambda_path: deployment/terraform/lambda/address2UPRN
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: address2uprn-${{ needs.determine_stage.outputs.stage }} ecr_repo: address2uprn-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.address2uprn_image.outputs.image_digest }} image_digest: ${{ needs.address2uprn_image.outputs.image_digest }}
@ -191,7 +191,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: postcodeSplitter lambda_name: postcodeSplitter
lambda_path: infrastructure/terraform/lambda/postcodeSplitter lambda_path: deployment/terraform/lambda/postcodeSplitter
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: postcode_splitter-${{ needs.determine_stage.outputs.stage }} ecr_repo: postcode_splitter-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.postcodeSplitter_image.outputs.image_digest }} image_digest: ${{ needs.postcodeSplitter_image.outputs.image_digest }}
@ -231,7 +231,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: bulk_address2uprn_combiner lambda_name: bulk_address2uprn_combiner
lambda_path: infrastructure/terraform/lambda/bulk_address2uprn_combiner lambda_path: deployment/terraform/lambda/bulk_address2uprn_combiner
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: bulk_address2uprn_combiner-${{ needs.determine_stage.outputs.stage }} ecr_repo: bulk_address2uprn_combiner-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.bulk_address2uprn_combiner_image.outputs.image_digest }} image_digest: ${{ needs.bulk_address2uprn_combiner_image.outputs.image_digest }}
@ -271,7 +271,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: condition-etl lambda_name: condition-etl
lambda_path: infrastructure/terraform/lambda/condition-etl lambda_path: deployment/terraform/lambda/condition-etl
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: condition-etl-${{ needs.determine_stage.outputs.stage }} ecr_repo: condition-etl-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.condition_etl_image.outputs.image_digest }} image_digest: ${{ needs.condition_etl_image.outputs.image_digest }}
@ -311,7 +311,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: categorisation lambda_name: categorisation
lambda_path: infrastructure/terraform/lambda/categorisation lambda_path: deployment/terraform/lambda/categorisation
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: categorisation-${{ needs.determine_stage.outputs.stage }} ecr_repo: categorisation-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.categorisation_image.outputs.image_digest }} image_digest: ${{ needs.categorisation_image.outputs.image_digest }}
@ -351,7 +351,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: ordnanceSurvey lambda_name: ordnanceSurvey
lambda_path: infrastructure/terraform/lambda/ordnanceSurvey lambda_path: deployment/terraform/lambda/ordnanceSurvey
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: ordnance-${{ needs.determine_stage.outputs.stage }} ecr_repo: ordnance-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.ordnanceSurvey_image.outputs.image_digest }} image_digest: ${{ needs.ordnanceSurvey_image.outputs.image_digest }}
@ -386,7 +386,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: pashub_to_ara lambda_name: pashub_to_ara
lambda_path: infrastructure/terraform/lambda/pashub_to_ara lambda_path: deployment/terraform/lambda/pashub_to_ara
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: pashub_to_ara-${{ needs.determine_stage.outputs.stage }} ecr_repo: pashub_to_ara-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.pashub_to_ara_image.outputs.image_digest }} image_digest: ${{ needs.pashub_to_ara_image.outputs.image_digest }}
@ -419,7 +419,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: ara_fast_api lambda_name: ara_fast_api
lambda_path: infrastructure/terraform/lambda/fast-api lambda_path: deployment/terraform/lambda/fast-api
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
terraform_apply: ${{ needs.determine_stage.outputs.terraform_apply }} terraform_apply: ${{ needs.determine_stage.outputs.terraform_apply }}
secrets: secrets:
@ -458,17 +458,17 @@ jobs:
- uses: hashicorp/setup-terraform@v3 - uses: hashicorp/setup-terraform@v3
- name: Terraform Init - name: Terraform Init
working-directory: infrastructure/terraform/cdn_certificate working-directory: deployment/terraform/cdn_certificate
run: terraform init -reconfigure run: terraform init -reconfigure
- name: Terraform Workspace - name: Terraform Workspace
working-directory: infrastructure/terraform/cdn_certificate working-directory: deployment/terraform/cdn_certificate
run: | run: |
terraform workspace select $STAGE \ terraform workspace select $STAGE \
|| terraform workspace new $STAGE || terraform workspace new $STAGE
- name: Terraform Plan - name: Terraform Plan
working-directory: infrastructure/terraform/cdn_certificate working-directory: deployment/terraform/cdn_certificate
run: | run: |
terraform plan \ terraform plan \
-var="stage=${STAGE}" \ -var="stage=${STAGE}" \
@ -476,7 +476,7 @@ jobs:
- name: Terraform Apply - name: Terraform Apply
if: env.TERRAFORM_APPLY == 'true' if: env.TERRAFORM_APPLY == 'true'
working-directory: infrastructure/terraform/cdn_certificate working-directory: deployment/terraform/cdn_certificate
run: terraform apply -auto-approve tfplan run: terraform apply -auto-approve tfplan
@ -503,17 +503,17 @@ jobs:
- uses: hashicorp/setup-terraform@v3 - uses: hashicorp/setup-terraform@v3
- name: Terraform Init - name: Terraform Init
working-directory: infrastructure/terraform/cdn working-directory: deployment/terraform/cdn
run: terraform init -reconfigure run: terraform init -reconfigure
- name: Terraform Workspace - name: Terraform Workspace
working-directory: infrastructure/terraform/cdn working-directory: deployment/terraform/cdn
run: | run: |
terraform workspace select $STAGE \ terraform workspace select $STAGE \
|| terraform workspace new $STAGE || terraform workspace new $STAGE
- name: Terraform Plan - name: Terraform Plan
working-directory: infrastructure/terraform/cdn working-directory: deployment/terraform/cdn
run: | run: |
terraform plan \ terraform plan \
-var="stage=${STAGE}" \ -var="stage=${STAGE}" \
@ -521,7 +521,7 @@ jobs:
- name: Terraform Apply - name: Terraform Apply
if: env.TERRAFORM_APPLY == 'true' if: env.TERRAFORM_APPLY == 'true'
working-directory: infrastructure/terraform/cdn working-directory: deployment/terraform/cdn
run: terraform apply -auto-approve tfplan run: terraform apply -auto-approve tfplan
# ============================================================ # ============================================================
@ -562,7 +562,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: magic_plan lambda_name: magic_plan
lambda_path: infrastructure/terraform/lambda/magic_plan lambda_path: deployment/terraform/lambda/magic_plan
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: magic-plan-${{ needs.determine_stage.outputs.stage }} ecr_repo: magic-plan-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.magic_plan_image.outputs.image_digest }} image_digest: ${{ needs.magic_plan_image.outputs.image_digest }}
@ -585,7 +585,7 @@ jobs:
uses: ./.github/workflows/_deploy_lambda.yml uses: ./.github/workflows/_deploy_lambda.yml
with: with:
lambda_name: hubspot-etl-to-ara lambda_name: hubspot-etl-to-ara
lambda_path: infrastructure/terraform/lambda/hubspot_deal_etl lambda_path: deployment/terraform/lambda/hubspot_deal_etl
stage: ${{ needs.determine_stage.outputs.stage }} stage: ${{ needs.determine_stage.outputs.stage }}
ecr_repo: hubspot-etl-${{ needs.determine_stage.outputs.stage }} ecr_repo: hubspot-etl-${{ needs.determine_stage.outputs.stage }}
image_digest: ${{ needs.hubspot_etl_image.outputs.image_digest }} image_digest: ${{ needs.hubspot_etl_image.outputs.image_digest }}

2
Dockerfile.test.dockerignore
View file

@ -4,7 +4,7 @@ model_data/local_data/
backend/node_modules/ backend/node_modules/
backend/.idea/ backend/.idea/
backend/.env backend/.env
infrastructure/ deployment/
data_collection/ data_collection/
node_modules/ node_modules/
conservation_areas/ conservation_areas/

2
infrastructure/terraform/lambda/_template/README.md
View file

@ -10,7 +10,7 @@
### 2. Add infrastructure prerequisites (shared stack) ### 2. Add infrastructure prerequisites (shared stack)
- Add a new ECR repository in: - Add a new ECR repository in:
infrastructure/terraform/shared/main.tf deployment/terraform/shared/main.tf
- Create a PR to deploy this to main then dev in order to deploy the shared stack - Create a PR to deploy this to main then dev in order to deploy the shared stack

2
infrastructure/terraform/modules/lambda_with_api_gateway/variables.tf
View file

@ -11,7 +11,7 @@ variable "zip_excludes" {
"**/*.pyc", "**/*.pyc",
"**/.pytest_cache/**", "**/.pytest_cache/**",
"**/tests/**", "**/tests/**",
"**/infrastructure/**" "**/deployment/**"
] ]
} }