From b45fc8a94dc696c836e4eaa81a8d918f680c01b7 Mon Sep 17 00:00:00 2001
From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:35:04 +0000
Subject: [PATCH] Update dynamo client creation

---
 .../com/gu/sfl/persistence/SavedArticlesPersistence.scala | 6 +-----
 .../scala/coml/gu/sfl/userdeletion/db/SflDynamoDb.scala   | 8 +-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/common/src/main/scala/com/gu/sfl/persistence/SavedArticlesPersistence.scala b/common/src/main/scala/com/gu/sfl/persistence/SavedArticlesPersistence.scala
index e3765737..de82be50 100644
--- a/common/src/main/scala/com/gu/sfl/persistence/SavedArticlesPersistence.scala
+++ b/common/src/main/scala/com/gu/sfl/persistence/SavedArticlesPersistence.scala
@@ -12,7 +12,6 @@ import org.scanamo.{
 import com.gu.sfl.Logging
 import com.gu.sfl.lib.Jackson._
 import com.gu.sfl.model._
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
@@ -97,10 +96,7 @@ class SavedArticlesPersistenceImpl(persistanceConfig: PersistenceConfig)
     SavedArticles(dynamoSavedArticles.version, articles)
   }
 
-  private val client = DynamoDbClient
-    .builder()
-    .credentialsProvider(DefaultCredentialsProvider.create())
-    .build()
+  private val client = DynamoDbClient.create()
   //TODO confirm that it's ok to share the same client concurrently in all requests.. I guess if this is a lambda there won't be concurrent requests anyway ?
   private val scanamo = Scanamo(client)
 
diff --git a/mobile-save-for-later-user-deletion/src/main/scala/coml/gu/sfl/userdeletion/db/SflDynamoDb.scala b/mobile-save-for-later-user-deletion/src/main/scala/coml/gu/sfl/userdeletion/db/SflDynamoDb.scala
index c2c4c872..2c42956b 100644
--- a/mobile-save-for-later-user-deletion/src/main/scala/coml/gu/sfl/userdeletion/db/SflDynamoDb.scala
+++ b/mobile-save-for-later-user-deletion/src/main/scala/coml/gu/sfl/userdeletion/db/SflDynamoDb.scala
@@ -1,22 +1,16 @@
 package coml.gu.sfl.userdeletion.db
 
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
 import org.scanamo.{Scanamo, Table}
 import org.scanamo.syntax._
 import com.gu.sfl.Logging
 import com.gu.sfl.persistence.{DynamoSavedArticles, PersistenceConfig}
 import com.gu.sfl.userdeletion.model.UserDeleteMessage
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
 
 class SflDynamoDb(persistanceConfig: PersistenceConfig) extends Logging {
 
   private val table = Table[DynamoSavedArticles](persistanceConfig.tableName)
-  private val client =
-    DynamoDbClient
-      .builder()
-      .credentialsProvider(DefaultCredentialsProvider.create())
-      .build()
+  private val client = DynamoDbClient.create()
   private val scanamo = Scanamo(client)
 
   def deleteSavedArticleasForUser(user: UserDeleteMessage) = {