Skip to content

Commit

Permalink
upgrade ZIO AWS and fix breaking changes (#517)
Browse files Browse the repository at this point in the history
  • Loading branch information
@googley42
googley42 authored Oct 28, 2024
1 parent 3ab1bcc commit f89741d
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")

val zioVersion = "2.1.11"
val zioAwsVersion = "7.21.15.15"
val zioAwsVersion = "7.28.26.1"
val zioSchemaVersion = "1.5.0"
val zioPreludeVersion = "1.0.0-RC31"
val zioInteropCats3Version = "23.1.0.3"
Expand Down
44 changes: 22 additions & 22 deletions dynamodb/src/main/scala/zio/dynamodb/DynamoDBExecutorImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import zio.aws.dynamodb.model.primitives.{
KeyExpression => ZIOAwsKeyExpression,
KeySchemaAttributeName => ZIOAwsKeySchemaAttributeName,
ProjectionExpression => ZIOAwsProjectionExpression,
TableName => ZIOAwsTableName,
TableArn,
UpdateExpression => ZIOAwsUpdateExpression
}
import zio.aws.dynamodb.model.{
Expand Down Expand Up @@ -156,7 +156,7 @@ private[dynamodb] final case class DynamoDBExecutorImpl private[dynamodb] (dynam

private def executeDeleteTable(deleteTable: DeleteTable): ZIO[Any, Throwable, Unit] =
dynamoDb
.deleteTable(DeleteTableRequest(ZIOAwsTableName(deleteTable.tableName.value)))
.deleteTable(DeleteTableRequest(TableArn(deleteTable.tableName.value)))
.mapError(_.toThrowable)
.unit

Expand All @@ -174,7 +174,7 @@ private[dynamodb] final case class DynamoDBExecutorImpl private[dynamodb] (dynam

private def executeDescribeTable(describeTable: DescribeTable): ZIO[Any, Throwable, DescribeTableResponse] =
dynamoDb
.describeTable(DescribeTableRequest(ZIOAwsTableName(describeTable.tableName.value)))
.describeTable(DescribeTableRequest(TableArn(describeTable.tableName.value)))
.flatMap(s =>
for {
table <- ZIO.fromOption(s.table.toOption).orElseFail(FieldIsNone("table"))
Expand Down Expand Up @@ -546,7 +546,7 @@ case object DynamoDBExecutorImpl {
TransactGetItem(
Get(
key = s.key.toZioAwsMap(),
tableName = ZIOAwsTableName(s.tableName.value),
tableName = TableArn(s.tableName.value),
projectionExpression =
toOption(s.projections).map(awsProjectionExpression).map(ZIOAwsProjectionExpression(_))
)
Expand All @@ -559,7 +559,7 @@ case object DynamoDBExecutorImpl {
TransactGetItem(
Get(
key = key.toZioAwsMap(),
tableName = ZIOAwsTableName(tableName.value),
tableName = TableArn(tableName.value),
projectionExpression = toOption(items.projectionExpressionSet)
.map(awsProjectionExpression)
.map(ZIOAwsProjectionExpression(_))
Expand Down Expand Up @@ -593,7 +593,7 @@ case object DynamoDBExecutorImpl {
Some(
ZIOAwsDelete(
key = key.toZioAwsMap(),
tableName = ZIOAwsTableName(table.value)
tableName = TableArn(table.value)
)
)
)
Expand All @@ -602,7 +602,7 @@ case object DynamoDBExecutorImpl {
Some(
ZIOAwsPut(
item = item.toZioAwsMap(),
tableName = ZIOAwsTableName(table.value)
tableName = TableArn(table.value)
)
)
)
Expand Down Expand Up @@ -710,7 +710,7 @@ case object DynamoDBExecutorImpl {
val (aliasMap, maybeCondExprn) = AliasMapRender.collectAll(putItem.conditionExpression.map(_.render)).execute

PutItemRequest(
tableName = ZIOAwsTableName(putItem.tableName.value),
tableName = TableArn(putItem.tableName.value),
item = awsAttributeValueMap(putItem.item.map),
returnConsumedCapacity = Some(awsConsumedCapacity(putItem.capacity)),
returnItemCollectionMetrics = Some(ReturnItemCollectionMetrics.toZioAws(putItem.itemMetrics)),
Expand All @@ -726,7 +726,7 @@ case object DynamoDBExecutorImpl {
AliasMapRender.forEach(getItem.projections.toList).execute

GetItemRequest(
tableName = ZIOAwsTableName(getItem.tableName.value),
tableName = TableArn(getItem.tableName.value),
key = getItem.key.toZioAwsMap(),
consistentRead = Some(ConsistencyMode.toBoolean(getItem.consistency)).map(ZIOAwsConsistentRead(_)),
returnConsumedCapacity = Some(awsConsumedCapacity(getItem.capacity)),
Expand All @@ -739,7 +739,7 @@ case object DynamoDBExecutorImpl {
BatchWriteItemRequest(
requestItems = batchWriteItem.requestItems.map {
case (tableName, items) =>
(ZIOAwsTableName(tableName.value), items.map(awsWriteRequest))
(TableArn(tableName.value), items.map(awsWriteRequest))
}.toMap, // TODO(adam): MapOfSet uses iterable, maybe we should add a mapKeyValues?
returnConsumedCapacity = Some(awsConsumedCapacity(batchWriteItem.capacity)),
returnItemCollectionMetrics = Some(awsReturnItemCollectionMetrics(batchWriteItem.itemMetrics))
Expand All @@ -749,7 +749,7 @@ case object DynamoDBExecutorImpl {
BatchGetItemRequest(
requestItems = batchGetItem.requestItems.map {
case (tableName, tableGet) =>
(ZIOAwsTableName(tableName.value), tableGetToKeysAndAttributes(tableGet))
(TableArn(tableName.value), tableGetToKeysAndAttributes(tableGet))
},
returnConsumedCapacity = Some(awsConsumedCapacity(batchGetItem.capacity))
)
Expand All @@ -758,7 +758,7 @@ case object DynamoDBExecutorImpl {
val (aliasMap, maybeCondExprn) = AliasMapRender.collectAll(deleteItem.conditionExpression.map(_.render)).execute

DeleteItemRequest(
tableName = ZIOAwsTableName(deleteItem.tableName.value),
tableName = TableArn(deleteItem.tableName.value),
key = deleteItem.key.toZioAwsMap(),
conditionExpression = maybeCondExprn.map(ZIOAwsConditionExpression(_)),
expressionAttributeValues = aliasMapToExpressionZIOAwsAttributeValues(aliasMap),
Expand All @@ -772,7 +772,7 @@ case object DynamoDBExecutorImpl {
private def awsCreateTableRequest(createTable: CreateTable): CreateTableRequest =
CreateTableRequest(
attributeDefinitions = createTable.attributeDefinitions.map(awsAttributeDefinition),
tableName = ZIOAwsTableName(createTable.tableName.value),
tableName = TableArn(createTable.tableName.value),
keySchema = awsKeySchema(createTable.keySchema),
localSecondaryIndexes = toOption(
createTable.localSecondaryIndexes.map(awsLocalSecondaryIndex).toList
Expand Down Expand Up @@ -803,7 +803,7 @@ case object DynamoDBExecutorImpl {
} yield (updateExpr, conditionExpr)).execute

UpdateItemRequest(
tableName = ZIOAwsTableName(updateItem.tableName.value),
tableName = TableArn(updateItem.tableName.value),
key = updateItem.key.toZioAwsMap(),
returnValues = Some(awsReturnValues(updateItem.returnValues)),
returnConsumedCapacity = Some(awsConsumedCapacity(updateItem.capacity)),
Expand All @@ -823,7 +823,7 @@ case object DynamoDBExecutorImpl {
} yield (filter, keyExpr, projections)).execute

QueryRequest(
tableName = ZIOAwsTableName(queryAll.tableName.value),
tableName = TableArn(queryAll.tableName.value),
indexName = queryAll.indexName.map(_.value).map(ZIOAwsIndexName(_)),
select = queryAll.select.map(awsSelect),
limit = queryAll.limit.map(PositiveIntegerObject(_)),
Expand All @@ -847,7 +847,7 @@ case object DynamoDBExecutorImpl {
} yield (filter, keyExpr, projections)).execute

QueryRequest(
tableName = ZIOAwsTableName(querySome.tableName.value),
tableName = TableArn(querySome.tableName.value),
indexName = querySome.indexName.map(_.value).map(ZIOAwsIndexName(_)),
select = querySome.select.map(awsSelect),
limit = Some(querySome.limit).map(PositiveIntegerObject(_)),
Expand All @@ -869,7 +869,7 @@ case object DynamoDBExecutorImpl {
} yield (maybeFilterExpr, projections)).execute

ScanRequest(
tableName = ZIOAwsTableName(scanAll.tableName.value),
tableName = TableArn(scanAll.tableName.value),
indexName = scanAll.indexName.map(_.value).map(ZIOAwsIndexName(_)),
select = scanAll.select.map(awsSelect),
exclusiveStartKey = scanAll.exclusiveStartKey.map(m => awsAttributeValueMap(m.map)),
Expand All @@ -892,7 +892,7 @@ case object DynamoDBExecutorImpl {
} yield (maybeFilterExpr, projections)).execute

ScanRequest(
tableName = ZIOAwsTableName(scanSome.tableName.value),
tableName = TableArn(scanSome.tableName.value),
indexName = scanSome.indexName.map(_.value).map(ZIOAwsIndexName(_)),
select = scanSome.select.map(awsSelect),
exclusiveStartKey = scanSome.exclusiveStartKey.map(m => awsAttributeValueMap(m.map)),
Expand Down Expand Up @@ -921,7 +921,7 @@ case object DynamoDBExecutorImpl {

ZIOAwsConditionCheck(
key = conditionCheck.primaryKey.toZioAwsMap(),
tableName = ZIOAwsTableName(conditionCheck.tableName.value),
tableName = TableArn(conditionCheck.tableName.value),
conditionExpression = ZIOAwsConditionExpression(conditionExpression),
expressionAttributeValues = aliasMapToExpressionZIOAwsAttributeValues(aliasMap),
expressionAttributeNames = aliasMapToExpressionZIOAwsAttributeNames(aliasMap)
Expand All @@ -934,7 +934,7 @@ case object DynamoDBExecutorImpl {

ZIOAwsPut(
item = put.item.toZioAwsMap(),
tableName = ZIOAwsTableName(put.tableName.value),
tableName = TableArn(put.tableName.value),
conditionExpression = maybeConditionExpression.map(ZIOAwsConditionExpression(_)),
expressionAttributeValues = aliasMapToExpressionZIOAwsAttributeValues(aliasMap),
expressionAttributeNames = aliasMapToExpressionZIOAwsAttributeNames(aliasMap)
Expand All @@ -947,7 +947,7 @@ case object DynamoDBExecutorImpl {

ZIOAwsDelete(
key = delete.key.toZioAwsMap(),
tableName = ZIOAwsTableName(delete.tableName.value),
tableName = TableArn(delete.tableName.value),
conditionExpression = maybeConditionExpression.map(ZIOAwsConditionExpression(_)),
expressionAttributeValues = aliasMapToExpressionZIOAwsAttributeValues(aliasMap),
expressionAttributeNames = aliasMapToExpressionZIOAwsAttributeNames(aliasMap)
Expand All @@ -962,7 +962,7 @@ case object DynamoDBExecutorImpl {

ZIOAwsUpdate(
key = update.key.toZioAwsMap(),
tableName = ZIOAwsTableName(update.tableName.value),
tableName = TableArn(update.tableName.value),
conditionExpression = maybeConditionExpr.map(ZIOAwsConditionExpression(_)),
updateExpression = ZIOAwsUpdateExpression(updateExpr),
expressionAttributeValues = aliasMapToExpressionZIOAwsAttributeValues(aliasMap),
Expand Down
18 changes: 9 additions & 9 deletions dynamodb/src/test/scala/zio/dynamodb/AutoBatchedFailureSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package zio.dynamodb

import zio.aws.dynamodb.model.primitives.{ AttributeName, StringAttributeValue, TableName => ZIOAwsTableName }
import zio.aws.dynamodb.model.primitives.{ AttributeName, StringAttributeValue, TableArn }
import zio.aws.dynamodb.model.{
BatchWriteItemResponse,
AttributeValue => ZIOAwsAttributeValue,
Expand Down Expand Up @@ -106,7 +106,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
unprocessedKeys = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> ZIOAwsKeysAndAttributes(
TableArn(mockBatches) -> ZIOAwsKeysAndAttributes(
keys = List(
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1")))),
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v2"))))
Expand All @@ -126,7 +126,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
unprocessedKeys = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> ZIOAwsKeysAndAttributes(
TableArn(mockBatches) -> ZIOAwsKeysAndAttributes(
keys = List(
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1"))))
)
Expand All @@ -145,7 +145,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
unprocessedKeys = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> ZIOAwsKeysAndAttributes(
TableArn(mockBatches) -> ZIOAwsKeysAndAttributes(
keys = List(
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1"))))
)
Expand All @@ -165,7 +165,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
responses = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> List(
TableArn(mockBatches) -> List(
ScalaMap(
AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1")))
),
Expand Down Expand Up @@ -265,7 +265,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneAndTwoPutWriteRequest
TableArn(mockBatches) -> itemOneAndTwoPutWriteRequest
)
)
).asReadOnly
Expand All @@ -280,7 +280,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneAndTwoDeleteWriteRequest
TableArn(mockBatches) -> itemOneAndTwoDeleteWriteRequest
)
)
).asReadOnly
Expand All @@ -295,7 +295,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneWriteRequest
TableArn(mockBatches) -> itemOneWriteRequest
)
)
).asReadOnly
Expand All @@ -310,7 +310,7 @@ object AutoBatchedFailureSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneWriteRequest
TableArn(mockBatches) -> itemOneWriteRequest
)
)
).asReadOnly
Expand Down
14 changes: 7 additions & 7 deletions dynamodb/src/test/scala/zio/dynamodb/ExecutorSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package zio.dynamodb

import zio.aws.dynamodb.model.primitives.{ AttributeName, StringAttributeValue, TableName => ZIOAwsTableName }
import zio.aws.dynamodb.model.primitives.{ AttributeName, StringAttributeValue, TableArn }
import zio.aws.dynamodb.model.{
BatchWriteItemResponse,
AttributeValue => ZIOAwsAttributeValue,
Expand Down Expand Up @@ -72,7 +72,7 @@ object ExecutorSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
unprocessedKeys = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> ZIOAwsKeysAndAttributes(
TableArn(mockBatches) -> ZIOAwsKeysAndAttributes(
keys = List(
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v2")))),
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1"))))
Expand All @@ -92,14 +92,14 @@ object ExecutorSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
responses = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> List(
TableArn(mockBatches) -> List(
ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v1"))))
)
)
),
unprocessedKeys = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> ZIOAwsKeysAndAttributes(
TableArn(mockBatches) -> ZIOAwsKeysAndAttributes(
keys = List(ScalaMap(AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v2")))))
)
)
Expand All @@ -113,7 +113,7 @@ object ExecutorSpec extends ZIOSpecDefault with DynamoDBFixtures {
ZIOAwsBatchGetItemResponse(
responses = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> List(
TableArn(mockBatches) -> List(
ScalaMap(
AttributeName("k1") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v2"))),
AttributeName("k2") -> ZIOAwsAttributeValue(s = Some(StringAttributeValue("v23")))
Expand Down Expand Up @@ -166,7 +166,7 @@ object ExecutorSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneWriteRequest
TableArn(mockBatches) -> itemOneWriteRequest
)
)
).asReadOnly
Expand All @@ -181,7 +181,7 @@ object ExecutorSpec extends ZIOSpecDefault with DynamoDBFixtures {
BatchWriteItemResponse(
unprocessedItems = Some(
ScalaMap(
ZIOAwsTableName(mockBatches) -> itemOneWriteRequest
TableArn(mockBatches) -> itemOneWriteRequest
)
)
).asReadOnly
Expand Down

0 comments on commit f89741d

Please sign in to comment.