Merge pull request #110 from guardian/update-panda-to-v7

Update panda to v7

.github/workflows/ci.yml

@@ -10,10 +10,9 @@ jobs:
         runs-on: ubuntu-latest
 
         permissions:
-            # Allow GitHub to request an OIDC JWT ID token, for exchange with `aws-actions/configure-aws-credentials`
-            # See https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services#updating-your-github-actions-workflow
+            # id-token and pull-requests required by actions-riff-raff
             id-token: write
-
+            pull-requests: write
             # Required for `actions/checkout`
             contents: read
 
@@ -40,11 +39,7 @@ jobs:
                   npm install
                   npm run build
 
-            - uses: actions/setup-java@v3
-              with:
-                  java-version: '11'
-                  distribution: 'corretto'
-                  cache: 'sbt'
+            - uses: guardian/setup-scala@v1
 
             - name: Scala Build
               run: |
@@ -54,17 +49,13 @@ jobs:
               run: |
                   mv target/restorer2_1.0.0_all.deb restorer2.deb
 
-            # Fetch AWS credentials, allowing us to upload to Riff-Raff (well, S3)
-            - uses: aws-actions/configure-aws-credentials@v4
-              with:
-                  role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
-                  aws-region: eu-west-1
-
             # Upload our build artifacts to Riff-Raff (well, S3)
-            - uses: guardian/actions-riff-raff@v2
+            - uses: guardian/actions-riff-raff@v4
               with:
                   projectName: editorial-tools:flexible:restorer2
                   buildNumber: ${{ env.BUILD_NUMBER }}
+                  roleArn: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
+                  githubToken: ${{ secrets.GITHUB_TOKEN }}
                   configPath: riff-raff.yaml
                   contentDirectories: |
                       restorer2:

.tool-versions

@@ -0,0 +1 @@
+java corretto-11.0.25.9.1

app/AppComponents.scala

@@ -1,5 +1,5 @@
 import com.gu.AppIdentity
-import com.gu.pandomainauth.PanDomainAuthSettingsRefresher
+import com.gu.pandomainauth.{PanDomainAuthSettingsRefresher, S3BucketLoader}
 import com.gu.permissions.{PermissionsConfig, PermissionsProvider}
 import config.AppConfig
 import config.AWS._
@@ -27,12 +27,10 @@ class AppComponents(context: Context, identity: AppIdentity) extends BuiltInComp
     awsCredentials = credentialsV1
   ))
 
-  val panDomainSettings: PanDomainAuthSettingsRefresher = new PanDomainAuthSettingsRefresher(
+  val panDomainSettings: PanDomainAuthSettingsRefresher = PanDomainAuthSettingsRefresher(
     domain = config.domain,
     system = "restorer",
-    bucketName = "pan-domain-auth-settings",
-    settingsFileKey = s"${config.domain}.settings",
-    s3Client = S3ClientV1
+    S3BucketLoader.forAwsSdkV1(S3ClientV1, "pan-domain-auth-settings")
   )
 
   val snapshotApi = new SnapshotApi(s3Client)

project/Dependencies.scala

@@ -14,7 +14,7 @@ object Dependencies {
   )
 
   val guardianDependencies = Seq(
-    "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" %% "simple-configuration-ssm" % "2.0.0"
   )