Skip to content

Commit

Permalink
Use caselawclient generate_signed_asset_url, remove unused functions …
Browse files Browse the repository at this point in the history
…in judgments.utils.aws
  • Loading branch information
dragon-dxw committed Jan 30, 2025
1 parent 65963b2 commit ef31207
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 40 deletions.
38 changes: 0 additions & 38 deletions judgments/utils/aws.py
Original file line number Diff line number Diff line change
@@ -1,49 +1,11 @@
import time

import boto3
import botocore.client
import environ

env = environ.Env()


def create_aws_client(service: str): # service
"""@param: service The AWS service, e.g. 's3'"""
aws = boto3.session.Session(
aws_access_key_id=env("AWS_ACCESS_KEY_ID", default=None),
aws_secret_access_key=env("AWS_SECRET_KEY", default=None),
)
return aws.client(
service,
endpoint_url=env("AWS_ENDPOINT_URL", default=None),
region_name=env("PRIVATE_ASSET_BUCKET_REGION", default=None),
config=botocore.client.Config(signature_version="s3v4"),
)


def create_s3_client():
return create_aws_client("s3")


def uri_for_s3(uri: str):
return uri.lstrip("/")


def generate_signed_asset_url(key: str):
# If there isn't a PRIVATE_ASSET_BUCKET, don't try to get the bucket.
# This helps local environment setup where we don't use S3.
bucket = env("PRIVATE_ASSET_BUCKET", None)
if not bucket:
return ""

client = create_s3_client()

return client.generate_presigned_url(
"get_object",
Params={"Bucket": bucket, "Key": key},
)


def invalidate_caches(uri: str) -> None:
aws = boto3.session.Session()
cloudfront = aws.client("cloudfront")
Expand Down
3 changes: 1 addition & 2 deletions judgments/views/signed_asset.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from caselawclient.models.utilities.aws import generate_signed_asset_url
from django.shortcuts import redirect

from judgments.utils.aws import generate_signed_asset_url


def redirect_to_signed_asset(request, key):
return redirect(generate_signed_asset_url(key))

0 comments on commit ef31207

Please sign in to comment.