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 #490

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Upgrade to panda v7 #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42ece4a
Fix GHA CI
waisingyiu Jan 15, 2025
d460466
Upgrade to Panda v7
waisingyiu Jan 15, 2025
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
7 changes: 2 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@ jobs:
role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
aws-region: eu-west-1

- uses: actions/setup-java@v3
with:
java-version: "11"
distribution: "corretto"
cache: "sbt"
- name: Setup Scala
uses: guardian/setup-scala@v1

- name: Build the stack
run: |
Expand Down
7 changes: 3 additions & 4 deletions apps/common-lib/src/main/scala/com/gu/typerighter/lib/CommonConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
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 @@ -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"
Expand Down
Loading