Skip to content

Commit 31b7845

Browse files
Tian-2017Tian-2017
committed
Merge branch 'main' of github.com:LBHackney-IT/Data-Platform into di-706-repoint-active-persons
2 parents da3591a + c8ae27c commit 31b7845

File tree

155 files changed

+2187
-23055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+2187
-23055
lines changed

‎.github/actions/terraform-validate/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ runs:
2727
id: setup
2828
run: |
2929
${{ github.action_path }}/../.helpers/box.sh "Setting up build environment"
30-
echo -e "Installing TFLint"
31-
curl -L "$(curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 | grep -o -E "https://.+?_linux_amd64.zip")" -o tflint.zip && unzip tflint.zip && rm tflint.zip
30+
curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 \
31+
| jq -r '.assets[] | select(.name == "tflint_linux_amd64.zip") | .browser_download_url' \
32+
| xargs curl -L -o tflint.zip
33+
unzip tflint.zip
34+
rm tflint.zip
3235
echo -e "\n"
3336
shell: bash
3437
working-directory: "${{ inputs.build_path }}"

‎.github/workflows/lint-terraform.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ jobs:
8989
9090
- name: Install tflint
9191
run: |
92-
curl -L "$(curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 | grep -o -E "https://.+?_linux_amd64.zip")" -o tflint.zip && unzip tflint.zip && rm tflint.zip
92+
curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 \
93+
| jq -r '.assets[] | select(.name == "tflint_linux_amd64.zip") | .browser_download_url' \
94+
| xargs curl -L -o tflint.zip
95+
unzip tflint.zip
96+
rm tflint.zip
9397
9498
- name: Configuring AWS credentials
9599
working-directory: ${{ inputs.build_path }}
@@ -105,4 +109,5 @@ jobs:
105109
terraform init -backend=false
106110
../../tflint --init --config="../config/.tflint.hcl"
107111
../../tflint --var-file='../config/stg.tfvars' --var 'aws_deploy_region=${{ env.aws_deploy_region }}' --var 'aws_deploy_account_id=${{ secrets.aws_deploy_account_id }}' --var 'aws_api_account_id=${{ secrets.AWS_API_ACCOUNT_PROD }}' --var 'aws_hackit_account_id=${{ secrets.AWS_HACKIT_ACCOUNT_ID }}' --var 'aws_sandbox_account_id=${{ secrets.AWS_SANDBOX_ACCOUNT_ID }}' --var 'aws_deploy_iam_role_name=${{ secrets.AWS_ROLE_TO_ASSUME }}' --var 'environment=${{ inputs.environment }}' --var 'google_project_id=${{ env.google_project_id }}' --var 'automation_build_url=${{ inputs.automation_build_url }}' --var 'aws_api_vpc_id=${{ secrets.AWS_API_VPC_ID }}' --var 'copy_liberator_to_pre_prod_lambda_execution_role=${{ secrets.COPY_LIBERATOR_TO_PRE_PROD_LAMBDA_EXECUTION_ROLE }}' --var 'pre_production_liberator_data_storage_kms_key_arn=${{ secrets.PRE_PRODUCTION_LIBERATOR_DATA_STORAGE_KMS_KEY_ARN }}' --module --config="../config/.tflint.hcl" --loglevel=warn .
108-
112+
env:
113+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/validate-and-lint-terraform.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ jobs:
131131
132132
- name: Install tflint
133133
run: |
134-
curl -L "$(curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 | grep -o -E "https://.+?_linux_amd64.zip")" -o tflint.zip && unzip tflint.zip && rm tflint.zip
134+
curl -Ls https://api.github.com/repos/terraform-linters/tflint/releases/74267234 \
135+
| jq -r '.assets[] | select(.name == "tflint_linux_amd64.zip") | .browser_download_url' \
136+
| xargs curl -L -o tflint.zip
137+
unzip tflint.zip
138+
rm tflint.zip
135139
136140
- name: Configuring AWS credentials
137141
working-directory: ${{ inputs.build_path }}
@@ -147,3 +151,5 @@ jobs:
147151
terraform init -backend=false
148152
../../tflint --init --config="../config/.tflint.hcl"
149153
../../tflint --var-file='../config/stg.tfvars' --var 'aws_deploy_region=${{ env.aws_deploy_region }}' --var 'aws_deploy_account_id=${{ secrets.aws_deploy_account_id }}' --var 'aws_api_account_id=${{ secrets.AWS_API_ACCOUNT_PROD }}' --var 'aws_hackit_account_id=${{ secrets.AWS_HACKIT_ACCOUNT_ID }}' --var 'aws_sandbox_account_id=${{ secrets.AWS_SANDBOX_ACCOUNT_ID }}' --var 'aws_deploy_iam_role_name=${{ secrets.AWS_ROLE_TO_ASSUME }}' --var 'environment=${{ inputs.environment }}' --var 'google_project_id=${{ env.google_project_id }}' --var 'automation_build_url=${{ inputs.automation_build_url }}' --var 'aws_api_vpc_id=${{ secrets.AWS_API_VPC_ID }}' --var 'copy_liberator_to_pre_prod_lambda_execution_role=${{ secrets.COPY_LIBERATOR_TO_PRE_PROD_LAMBDA_EXECUTION_ROLE }}' --var 'pre_production_liberator_data_storage_kms_key_arn=${{ secrets.PRE_PRODUCTION_LIBERATOR_DATA_STORAGE_KMS_KEY_ARN }}' --module --config="../config/.tflint.hcl" --loglevel=warn .
154+
env:
155+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎lambdas/lambda_layers/requirements1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pandas==2.2.3
1+
pandas==2.3.1

‎lambdas/lambda_layers/requirements2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests==2.32.3
1+
requests==2.32.4
22
httplib2==0.22.0

‎lambdas/lambda_layers/requirements5.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
gspread==6.2.1
22
oauth2client==4.1.3
3-
google-api-python-client==2.169.0
3+
google-api-python-client==2.176.0
44
yagmail==0.15.293

‎lambdas/lambda_layers/requirements6.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urllib3==2.4.0
1+
urllib3==2.5.0

‎lambdas/lambda_layers/requirements7.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
s3fs==2025.3.2
1+
s3fs==2025.7.0

‎scripts/jobs/parking/Parking_interim_cycle_hangar_waiting_list.py‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)