Merge branch 'main' into sbt-dependency-graph-614e4fbf854e7b9d

guardian · Jan 22, 2025 · e5c9a61 · e5c9a61
2 parents 2a198dd + b6f8a3d
commit e5c9a61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,8 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
 
-      - uses: guardian/setup-scala@v1
+      - name: Setup Scala
+        uses: guardian/setup-scala@v1
 
       - name: Build the stack
         run: |

diff --git a/apps/common-lib/src/main/scala/com/gu/typerighter/lib/CommonConfig.scala b/apps/common-lib/src/main/scala/com/gu/typerighter/lib/CommonConfig.scala
@@ -9,6 +9,7 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder
 import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder
 import com.amazonaws.services.secretsmanager.model.GetSecretValueRequest
 import com.gu.pandomainauth.PanDomainAuthSettingsRefresher
+import com.gu.pandomainauth.S3BucketLoader
 import play.api.libs.ws.WSClient
 
 import scala.util.Try
@@ -52,12 +53,10 @@ abstract class CommonConfig(
     .withRegion(awsRegion)
     .build()
 
-  val panDomainSettings = new PanDomainAuthSettingsRefresher(
+  val panDomainSettings = PanDomainAuthSettingsRefresher(
     domain = stageDomain,
     system = appName,
-    bucketName = "pan-domain-auth-settings",
-    settingsFileKey = s"$stageDomain.settings",
-    s3Client = pandaS3Client
+    s3BucketLoader = S3BucketLoader.forAwsSdkV1(pandaS3Client, "pan-domain-auth-settings")
   )
 
   private val secretsManagerClient = AWSSecretsManagerClientBuilder

diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ val languageToolVersion = "6.0"
 val awsSdkVersion = "1.12.749"
 val capiModelsVersion = "17.5.1"
 val capiClientVersion = "19.2.1"
-val pandaVersion = "4.0.0"
+val pandaVersion = "7.0.0"
 val circeVersion = "0.14.1"
 val scalikejdbcVersion = scalikejdbc.ScalikejdbcBuildInfo.version
 val scalikejdbcPlayVersion = "2.8.0-scalikejdbc-3.5"