Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Panda v7 - support key rotation #204

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Upgrade to Panda v7 - support key rotation #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/controllers/StoryPackagesBaseController.scala
View file
Open in desktop
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
View file
Open in desktop
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
Loading