From cb1e96d429e5c440e23896b3d25009eebe7870ce Mon Sep 17 00:00:00 2001 From: larisa17 Date: Mon, 30 Sep 2024 12:40:27 +0300 Subject: [PATCH 1/4] fix data model export --- .../management/commands/scorer_dump_data_model_score.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/data_model/management/commands/scorer_dump_data_model_score.py b/api/data_model/management/commands/scorer_dump_data_model_score.py index 74236b77..1997ebb4 100644 --- a/api/data_model/management/commands/scorer_dump_data_model_score.py +++ b/api/data_model/management/commands/scorer_dump_data_model_score.py @@ -174,7 +174,9 @@ def handle(self, *args, **options): if cloudfront_distribution_id: client = boto3.client("cloudfront") - paths_to_invalidate = [f"/{s3_folder}/{filename}"] + s3_key = f"{s3_folder}/{filename}" + paths_to_invalidate = [s3_key] + self.stdout.write( f"Create invalidation for {s3_key} in the cloufront distribution {cloudfront_distribution_id}" ) From af6e459a0a4514ff13fab5b2778e193858a4edf3 Mon Sep 17 00:00:00 2001 From: larisa17 Date: Mon, 30 Sep 2024 13:53:01 +0300 Subject: [PATCH 2/4] fix data model export v2 --- .../management/commands/scorer_dump_data_model_score.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/data_model/management/commands/scorer_dump_data_model_score.py b/api/data_model/management/commands/scorer_dump_data_model_score.py index 1997ebb4..be338c34 100644 --- a/api/data_model/management/commands/scorer_dump_data_model_score.py +++ b/api/data_model/management/commands/scorer_dump_data_model_score.py @@ -181,7 +181,7 @@ def handle(self, *args, **options): f"Create invalidation for {s3_key} in the cloufront distribution {cloudfront_distribution_id}" ) response = client.create_invalidation( - DistributionId=distribution_id, + DistributionId=cloudfront_distribution_id, InvalidationBatch={ "Paths": { "Quantity": len(paths_to_invalidate), From 6d81e4fccd893e7cfffe98766949e97ed6344ec4 Mon Sep 17 00:00:00 2001 From: larisa17 Date: Mon, 30 Sep 2024 14:29:28 +0300 Subject: [PATCH 3/4] update ceramich cache data dump --- api/ceramic_cache/management/commands/scorer_dump_data.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api/ceramic_cache/management/commands/scorer_dump_data.py b/api/ceramic_cache/management/commands/scorer_dump_data.py index 9559c97e..db2fe289 100644 --- a/api/ceramic_cache/management/commands/scorer_dump_data.py +++ b/api/ceramic_cache/management/commands/scorer_dump_data.py @@ -257,7 +257,6 @@ def add_arguments(self, parser): default="{}", help="Extra args to add to the summary file upload. This can be used to set S3 permissions, see: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3/client/upload_file.html. Defaults to {}.", ) - # TODO: Add the cloudfront distribution id def handle_cron_job(self, *args, **options): self.stdout.write("Dumping DB data") @@ -344,7 +343,7 @@ def handle_cron_job(self, *args, **options): paths_to_invalidate = [f"/{s3_key}"] self.stdout.write(f"Create invalidation for {s3_key} in the cloufront distribution {cloudfront_distribution_id}") response = client.create_invalidation( - DistributionId=distribution_id, + DistributionId=cloudfront_distribution_id, InvalidationBatch={ 'Paths': { 'Quantity': len(paths_to_invalidate), From 279b895362bb9d4e6eedeb79e50beb6b28092a82 Mon Sep 17 00:00:00 2001 From: larisa17 <42570262+larisa17@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:13:29 +0300 Subject: [PATCH 4/4] Allow cloudfront create invalidation --- infra/aws/index.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/infra/aws/index.ts b/infra/aws/index.ts index 9bb6a253..24c6509d 100644 --- a/infra/aws/index.ts +++ b/infra/aws/index.ts @@ -634,6 +634,14 @@ const serviceTaskRole = new aws.iam.Role("scorer-service-task-role", { ], Resource: "*", }, + // CloudFront + { + Effect: "Allow", + Action: [ + "cloudfront:CreateInvalidation", + ], + Resource: "*", + }, ], }) ),