Skip to content

Commit

Permalink
Use updated etag-caching lib that models missing values
Browse files Browse the repository at this point in the history
The `etag-caching` library has had a small change to its API with
guardian/etag-caching#56, so we need make a small
code change to adapt to it.

ETag Caching was originally introduced to Frontend with #26338.
  • Loading branch information
rtyley committed Jul 23, 2024
1 parent 1a25c1d commit 594dfce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common/app/services/fronts/FrontJsonFapi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ trait FrontJsonFapi extends GuLogging {
def get(path: String, pageType: PressedPageType): Future[Option[PressedPage]] =
errorLoggingF(s"FrontJsonFapi.get $path") {
val objectId = s3ObjectIdFor(path, pageType.suffix)
pressedPageCache.get(objectId).map(Some(_)).recover { case s3Exception: S3Exception =>
pressedPageCache.get(objectId).recover { case s3Exception: S3Exception =>
logS3ExceptionWithDevHint(objectId, s3Exception)
None
}
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object Dependencies {
val awsEc2 = "com.amazonaws" % "aws-java-sdk-ec2" % awsVersion
val awsKinesis = "com.amazonaws" % "aws-java-sdk-kinesis" % awsVersion
val awsS3 = "com.amazonaws" % "aws-java-sdk-s3" % awsVersion
val eTagCachingS3 = "com.gu.etag-caching" %% "aws-s3-sdk-v2" % "3.0.12"
val eTagCachingS3 = "com.gu.etag-caching" %% "aws-s3-sdk-v2" % "4.0.0"
val awsSes = "com.amazonaws" % "aws-java-sdk-ses" % awsVersion
val awsSns = "com.amazonaws" % "aws-java-sdk-sns" % awsVersion
val awsSts = "com.amazonaws" % "aws-java-sdk-sts" % awsVersion
Expand Down

0 comments on commit 594dfce

Please sign in to comment.