diff --git a/.github/workflows/deploy_to_aws.yml b/.github/workflows/deploy_to_aws.yml index 7ad542b61..420a7a7a8 100644 --- a/.github/workflows/deploy_to_aws.yml +++ b/.github/workflows/deploy_to_aws.yml @@ -216,6 +216,16 @@ jobs: push: true tags: ${{ vars.ECR_REGISTRY }}/${{ vars.IMAGE_NAME }}-logstash-${{ steps.get_env_name.outputs.lowercase }}:${{ env.GIT_COMMIT }} + - name: Build and push Database Anonymizer Docker image to ECR for ${{ vars.ENV_NAME }} + uses: docker/build-push-action@v2 + if: ${{ steps.get_env_name.outputs.lowercase == 'production' }} + with: + context: deployment/terraform/database_anonymizer_sheduled_task/docker + file: deployment/terraform/database_anonymizer_sheduled_task/docker/Dockerfile + push: false + tags: ${{ vars.ECR_REGISTRY }}/${{ vars.IMAGE_NAME }}-database-anonymizer-${{ steps.get_env_name.outputs.lowercase }}:${{ env.GIT_COMMIT }} + + create_kafka_topic: needs: build_and_push_docker_image runs-on: ubuntu-latest diff --git a/deployment/terraform/anonymize_db_job.tf b/deployment/terraform/anonymize_db_job.tf index 5fcd0b03b..4eae8b292 100644 --- a/deployment/terraform/anonymize_db_job.tf +++ b/deployment/terraform/anonymize_db_job.tf @@ -11,7 +11,7 @@ module "database_anonymizer" { aws_region = var.aws_region destination_aws_account = var.anonymizer_destination_aws_account anonymizer_db_identifier = var.anonymizer_db_identifier - database_anonymizer_image_tag = var.anonymizer_image_tag + database_anonymizer_image_tag = var.image_tag schedule_expression = var.anonymizer_schedule_expression kms_key_admin_users = var.anonymizer_kms_key_admin_users subnet_ids = module.vpc.private_subnet_ids diff --git a/doc/release/RELEASE-NOTES.md b/doc/release/RELEASE-NOTES.md index dd9909039..34866c87a 100644 --- a/doc/release/RELEASE-NOTES.md +++ b/doc/release/RELEASE-NOTES.md @@ -26,6 +26,11 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html * [OSDEV-1069](https://opensupplyhub.atlassian.net/browse/OSDEV-1069) - The following changes have been made: * Changed the Postgres Docker image for the database to use the official one and make the local database setup platform-agnostic, so it doesn't depend on the processor architecture. * Built the PostGIS program from source and installed it to avoid LLVM-related errors inside the database Docker container during local development. +* [OSDEV-1072](https://opensupplyhub.atlassian.net/browse/OSDEV-1072) - The following changes have been made: + * Added building database-anonymizer container to the pipeline. + * Pushing the database-anonymizer container to the repo is turned off until the database anonymizing scheduled task will be deployed to the production. +* [OSDEV-1089](https://opensupplyhub.atlassian.net/browse/OSDEV-1089) Change format gunicurn logs not pass IP address to AWS CloudWatch. +* Added command `reindex_database` * [OSDEV-1075](https://opensupplyhub.atlassian.net/browse/OSDEV-1075) - The following changes have been made: * All resources created via batch job will be tagged * [OSDEV-1089](https://opensupplyhub.atlassian.net/browse/OSDEV-1089) Change format gunicurn logs not pass IP address to AWS CloudWatch.