Skip to content

Commit

Permalink
Upgrade to Panda v7 - support key rotation
Browse files Browse the repository at this point in the history
This upgrades Panda from v5 to v7, allowing us to use key rotation as
introduced with guardian/pan-domain-authentication#150.
  • Loading branch information
rtyley committed Sep 19, 2024
1 parent 21ab1fc commit 3b8d84a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
11 changes: 3 additions & 8 deletions app/AppComponents.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import com.amazonaws.auth.{AWSCredentialsProvider, DefaultAWSCredentialsProviderChain}
import com.gu.pandomainauth.PanDomainAuthSettingsRefresher
import com.gu.permissions.{PermissionsConfig, PermissionsProvider}
import com.gu.pandomainauth.{PanDomainAuthSettingsRefresher, S3BucketLoader}
import controllers.AssetsComponents
import model.jobs.JobRunner
import modules.clustersync.ClusterSynchronisation
import modules.sponsorshiplifecycle.SponsorshipLifecycleJobs
import permissions.Permissions
import play.api.ApplicationLoader.Context
import play.api.BuiltInComponentsFromContext
import play.api.libs.ws.ahc.AhcWSComponents
Expand All @@ -32,12 +29,10 @@ class AppComponents(context: Context, config: Config)
new JobRunner(context.lifecycle)
new SponsorshipLifecycleJobs(context.lifecycle)

val panDomainSettings = new PanDomainAuthSettingsRefresher(
val panDomainSettings = PanDomainAuthSettingsRefresher(
domain = config.pandaDomain,
system = config.pandaSystemIdentifier,
bucketName = config.pandaBucketName,
settingsFileKey= config.pandaSettingsFileKey,
s3Client = AWS.S3Client,
S3BucketLoader.forAwsSdkV1(AWS.S3Client, "pan-domain-auth-settings")
)

lazy val router: Router = new Routes(
Expand Down
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ scalacOptions ++= Seq(

lazy val awsVersion = "1.12.403"

val pandaVersion = "7.0.0"
lazy val dependencies = Seq(
"com.amazonaws" % "aws-java-sdk-dynamodb" % awsVersion,
"com.amazonaws" % "aws-java-sdk-ec2" % awsVersion,
Expand All @@ -26,7 +27,7 @@ lazy val dependencies = Seq(
"com.amazonaws" % "aws-java-sdk-sqs" % awsVersion,
"com.amazonaws" % "aws-java-sdk-sts" % awsVersion,
"com.amazonaws" % "amazon-kinesis-client" % "1.14.10",
"com.gu" %% "pan-domain-auth-play_2-8" % "4.0.0",
"com.gu" %% "pan-domain-auth-play_2-8" % pandaVersion,
"com.gu" %% "editorial-permissions-client" % "2.15",
ws, // for panda
"ai.x" %% "play-json-extensions" % "0.42.0",
Expand All @@ -37,7 +38,7 @@ lazy val dependencies = Seq(
"net.logstash.logback" % "logstash-logback-encoder" % "7.2",
"org.slf4j" % "slf4j-api" % "1.7.12",
"org.slf4j" % "jcl-over-slf4j" % "1.7.12",
"com.gu" %% "panda-hmac-play_2-8" % "4.0.0",
"com.gu" %% "panda-hmac-play_2-8" % pandaVersion,
"com.gu" %% "content-api-client-aws" % "0.7.4",
"com.beachape" %% "enumeratum" % "1.5.13",
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
Expand Down

0 comments on commit 3b8d84a

Please sign in to comment.