Merge pull request #361 from guardian/try-out-updated-panda-settings-…

…code

Upgrade to Panda v7 - support key rotation

app/AppComponents.scala

@@ -1,6 +1,6 @@
 import com.gu.AppIdentity
 import com.gu.atom.play.ReindexController
-import com.gu.pandomainauth.PanDomainAuthSettingsRefresher
+import com.gu.pandomainauth.{PanDomainAuthSettingsRefresher, S3BucketLoader}
 import config.{AWS, Config}
 import controllers.{AssetsComponents, ExplainerReindexController, PanDomainAuthActions}
 import db.{AtomDataStores, AtomWorkshopDB, ExplainerDB}
@@ -30,12 +30,10 @@ class AppComponents(context: Context, identity: AppIdentity)
 
     override def controllerComponents: ControllerComponents = AppComponents.this.controllerComponents
 
-    override def panDomainSettings: PanDomainAuthSettingsRefresher = new PanDomainAuthSettingsRefresher(
+    override val panDomainSettings: PanDomainAuthSettingsRefresher = PanDomainAuthSettingsRefresher(
       domain = config.pandaDomain,
       system = config.pandaSystem,
-      bucketName = "pan-domain-auth-settings",
-      settingsFileKey = s"${config.pandaDomain}.settings",
-      s3Client = AWS.S3Client,
+      S3BucketLoader.forAwsSdkV1(AWS.S3Client, "pan-domain-auth-settings")
     )
 
     override def permissions: Permissions = appPermissions

build.sbt

@@ -9,6 +9,8 @@ libraryDependencies ++= dependencies
 
 routesGenerator := InjectedRoutesGenerator
 
+resolvers ++= Resolver.sonatypeOssRepos("releases")
+
 lazy val root = (project in file(".")).enablePlugins(PlayScala, JDebPackaging, SystemdPlugin)
   .settings(Defaults.coreDefaultSettings: _*)
   .settings(

project/Dependencies.scala

@@ -33,10 +33,10 @@ object Dependencies {
     "com.gu" %% "editorial-permissions-client" % "2.15",
     "com.gu" %% "simple-configuration-ssm" % "1.5.6",
     "com.gu" %% "fezziwig" % "1.6",
-    "com.gu" %% "pan-domain-auth-play_3-0" % "5.0.0",
+    "com.gu" %% "pan-domain-auth-play_3-0" % "7.0.0",
     "io.circe" %% "circe-parser" % "0.14.5",
     "net.logstash.logback" % "logstash-logback-encoder" % "6.6",
     "com.gu" %% "content-api-client-aws" % "0.7",
     "com.gu" %% "content-api-client" % "20.0.0"
   )
-}
+}