Skip to content

Commit

Permalink
Merge pull request #204 from guardian/bump-panda
Browse files Browse the repository at this point in the history
Upgrade to Panda v7 - support key rotation
  • Loading branch information
davidfurey authored Jan 17, 2025
2 parents ee8f021 + 7b5ce6e commit b0ba967
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions app/controllers/StoryPackagesBaseController.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package controllers

import com.gu.pandomainauth.PanDomainAuthSettingsRefresher
import com.gu.pandomainauth.{PanDomainAuthSettingsRefresher, S3BucketLoader}
import conf.ApplicationConfiguration
import play.api.libs.ws.WSClient
import play.api.mvc.{BaseController, ControllerComponents}
Expand All @@ -14,11 +14,12 @@ abstract class StoryPackagesBaseController(
final override val controllerComponents: ControllerComponents = components

lazy val panDomainSettings: PanDomainAuthSettingsRefresher =
new PanDomainAuthSettingsRefresher(
config.pandomain.domain,
config.pandomain.service,
config.pandomain.bucketName,
config.pandomain.settingsFileKey,
config.aws.s3Client.get
PanDomainAuthSettingsRefresher(
domain = config.pandomain.domain,
system = config.pandomain.service,
S3BucketLoader.forAwsSdkV1(
config.aws.s3Client.get,
"pan-domain-auth-settings"
)
)
}
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ libraryDependencies ++= jacksonOverrides ++ Seq(
"com.gu" %% "content-api-models-json" % capiModelsVersion,
"com.gu" %% "content-api-client-aws" % "0.7.5",
"com.gu" %% "fapi-client-play30" % "12.0.0",
"com.gu" %% "pan-domain-auth-play_3-0" % "4.0.0",
"com.gu" %% "pan-domain-auth-play_3-0" % "7.0.0",
"com.gu" %% "editorial-permissions-client" % "2.15",
"com.gu" %% "story-packages-model" % "2.2.0",
"com.gu" %% "thrift-serializer" % "4.0.2",
Expand Down

0 comments on commit b0ba967

Please sign in to comment.