diff --git a/.github/workflows/_deploy_lambda.yml b/.github/workflows/_deploy_lambda.yml index ce1a0e77..103dee82 100644 --- a/.github/workflows/_deploy_lambda.yml +++ b/.github/workflows/_deploy_lambda.yml @@ -58,6 +58,8 @@ on: required: false TF_VAR_google_solar_api_key: required: false + TF_VAR_ORDNANCE_SURVEY_API_KEY: + required: false jobs: deploy: @@ -115,6 +117,7 @@ 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_ORDNANCE_SURVEY_API_KEY: ${{ secrets.ORDNANCE_SURVEY_API_KEY}} run: | terraform plan \ -var="stage=${{ inputs.stage }}" \ @@ -140,6 +143,7 @@ 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_ORDNANCE_SURVEY_API_KEY: ${{ secrets.ORDNANCE_SURVEY_API_KEY}} run: | terraform destroy -auto-approve \ -var="stage=${{ inputs.stage }}" \ diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml index bde7eb21..6633eefd 100644 --- a/.github/workflows/deploy_terraform.yml +++ b/.github/workflows/deploy_terraform.yml @@ -320,3 +320,4 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{ secrets.DEV_AWS_REGION }} + TF_VAR_ORDNANCE_SURVEY_API_KEY: ${{ secrets.ORDNANCE_SURVEY_API_KEY }} diff --git a/infrastructure/terraform/lambda/ordnanceSurvey/main.tf b/infrastructure/terraform/lambda/ordnanceSurvey/main.tf index a62996a1..7e045621 100644 --- a/infrastructure/terraform/lambda/ordnanceSurvey/main.tf +++ b/infrastructure/terraform/lambda/ordnanceSurvey/main.tf @@ -33,7 +33,7 @@ module "ordnance" { DB_USERNAME = local.db_credentials.db_assessment_model_username DB_PASSWORD = local.db_credentials.db_assessment_model_password S3_BUCKET_NAME = data.terraform_remote_state.shared.outputs.retrofit_sap_data_bucket_name - ORDNANCE_SURVEY_API_KEY:= "Reminder to add This somehow, ask if we are doing aws secret method or github secret method" + ORDNANCE_SURVEY_API_KEY = var.ordnance_survey_api_key }, ) } diff --git a/infrastructure/terraform/lambda/ordnanceSurvey/variables.tf b/infrastructure/terraform/lambda/ordnanceSurvey/variables.tf index e7646811..936aebc9 100644 --- a/infrastructure/terraform/lambda/ordnanceSurvey/variables.tf +++ b/infrastructure/terraform/lambda/ordnanceSurvey/variables.tf @@ -28,6 +28,12 @@ variable "batch_size" { default = 1 } +variable "ordnance_survey_api_key" { + type = string + sensitive = true +} + + locals { image_uri = "${var.ecr_repo_url}@${var.image_digest}" }