Fix tags regex, update test sleeps (#307)

* Fix tags regex, update test sleeps * Update test sleeps
etspaceman · Apr 18, 2022 · 60671ce · 60671ce
1 parent 72f66f7
commit 60671ce
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 43 deletions.
diff --git a/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala b/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala
@@ -132,7 +132,7 @@ trait AwsFunctionalTests extends CatsEffectSuite with CatsEffectFunFixtures {
       .toIO
     _ <- resources.logger.debug(s"Created stream ${resources.streamName}")
     _ <- IO.sleep(
-      resources.cacheConfig.createStreamDuration.plus(200.millis)
+      resources.cacheConfig.createStreamDuration.plus(400.millis)
     )
     _ <- resources.logger.debug(
       s"Describing stream summary for ${resources.streamName}"
@@ -163,7 +163,7 @@ trait AwsFunctionalTests extends CatsEffectSuite with CatsEffectFunFixtures {
       .toIO
     _ <- resources.logger.debug(s"Deleted stream ${resources.streamName}")
     _ <- IO.sleep(
-      resources.cacheConfig.deleteStreamDuration.plus(200.millis)
+      resources.cacheConfig.deleteStreamDuration.plus(400.millis)
     )
     _ <- resources.logger.debug(
       s"Describing stream summary for ${resources.streamName}"

diff --git a/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala b/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala
@@ -26,7 +26,7 @@ class DeregisterStreamConsumerTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.registerStreamConsumerDuration.plus(200.millis)
+        resources.cacheConfig.registerStreamConsumerDuration.plus(400.millis)
       )
       _ <- resources.kinesisClient
         .deregisterStreamConsumer(
@@ -39,7 +39,7 @@ class DeregisterStreamConsumerTests extends AwsFunctionalTests {
         .toIO
       check1 <- describeStreamConsumer(resources, consumerName, streamArn)
       _ <- IO.sleep(
-        resources.cacheConfig.deregisterStreamConsumerDuration.plus(200.millis)
+        resources.cacheConfig.deregisterStreamConsumerDuration.plus(400.millis)
       )
       check2 <- describeStreamConsumer(
         resources,

diff --git a/src/fun/scala/kinesis/mock/ListShardsTests.scala b/src/fun/scala/kinesis/mock/ListShardsTests.scala
@@ -23,7 +23,7 @@ class ListShardsTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.updateShardCountDuration.plus(200.millis)
+        resources.cacheConfig.updateShardCountDuration.plus(400.millis)
       )
       res <- resources.kinesisClient
         .listShards(

diff --git a/src/fun/scala/kinesis/mock/MergeShardsTests.scala b/src/fun/scala/kinesis/mock/MergeShardsTests.scala
@@ -23,7 +23,7 @@ class MergeShardsTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.updateShardCountDuration.plus(200.millis)
+        resources.cacheConfig.updateShardCountDuration.plus(400.millis)
       )
       openShards <- resources.kinesisClient
         .listShards(
@@ -49,7 +49,7 @@ class MergeShardsTests extends AwsFunctionalTests {
             .build()
         )
         .toIO
-      _ <- IO.sleep(resources.cacheConfig.mergeShardsDuration.plus(200.millis))
+      _ <- IO.sleep(resources.cacheConfig.mergeShardsDuration.plus(400.millis))
       openShards2 <- resources.kinesisClient
         .listShards(
           ListShardsRequest

diff --git a/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala b/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala
@@ -27,7 +27,7 @@ class RegisterStreamConsumerTests extends AwsFunctionalTests {
         .toIO
       check1 <- describeStreamConsumer(resources, consumerName, streamArn)
       _ <- IO.sleep(
-        resources.cacheConfig.registerStreamConsumerDuration.plus(200.millis)
+        resources.cacheConfig.registerStreamConsumerDuration.plus(400.millis)
       )
       check2 <- describeStreamConsumer(
         resources,

diff --git a/src/fun/scala/kinesis/mock/SplitShardTests.scala b/src/fun/scala/kinesis/mock/SplitShardTests.scala
@@ -34,7 +34,7 @@ class SplitShardTests extends AwsFunctionalTests {
             .build()
         )
         .toIO
-      _ <- IO.sleep(resources.cacheConfig.splitShardDuration.plus(200.millis))
+      _ <- IO.sleep(resources.cacheConfig.splitShardDuration.plus(400.millis))
       openShards <- resources.kinesisClient
         .listShards(
           ListShardsRequest

diff --git a/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala b/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala
@@ -25,7 +25,7 @@ class StartStreamEncryptionTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.startStreamEncryptionDuration.plus(200.millis)
+        resources.cacheConfig.startStreamEncryptionDuration.plus(400.millis)
       )
       res <- describeStreamSummary(resources)
     } yield assert(

diff --git a/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala b/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala
@@ -25,7 +25,7 @@ class StopStreamEncryptionTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.startStreamEncryptionDuration.plus(200.millis)
+        resources.cacheConfig.startStreamEncryptionDuration.plus(400.millis)
       )
       _ <- resources.kinesisClient
         .stopStreamEncryption(
@@ -38,7 +38,7 @@ class StopStreamEncryptionTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.stopStreamEncryptionDuration.plus(200.millis)
+        resources.cacheConfig.stopStreamEncryptionDuration.plus(400.millis)
       )
       res <- describeStreamSummary(resources)
     } yield assert(

diff --git a/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala b/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala
@@ -23,7 +23,7 @@ class UpdateShardCountTests extends AwsFunctionalTests {
         )
         .toIO
       _ <- IO.sleep(
-        resources.cacheConfig.updateShardCountDuration.plus(200.millis)
+        resources.cacheConfig.updateShardCountDuration.plus(400.millis)
       )
       openShards <- resources.kinesisClient
         .listShards(

diff --git a/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala b/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala
@@ -39,7 +39,7 @@ final case class AddTagsToStreamRequest(
                 else Right(())
               }, {
                 val invalidValues = tags.tags.values.filterNot(x =>
-                  x.matches("^([\\p{L}\\p{Z}\\p{N}_./=+\\-%@]*)$")
+                  x.matches("^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$")
                 )
                 if (invalidValues.nonEmpty)
                   InvalidArgumentException(

diff --git a/src/main/scala/kinesis/mock/validations/CommonValidations.scala b/src/main/scala/kinesis/mock/validations/CommonValidations.scala
@@ -141,7 +141,7 @@ object CommonValidations {
         else Right(())
       }, {
         val invalidKeyCharacters =
-          keys.filterNot(x => x.matches("^([\\p{L}\\p{Z}\\p{N}_./=+\\-%@]*)$"))
+          keys.filterNot(x => x.matches("^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"))
         if (invalidKeyCharacters.nonEmpty)
           InvalidArgumentException(
             s"Keys contain invalid characters. Invalid keys: ${invalidKeyCharacters.mkString(", ")}"

diff --git a/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala b/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala
@@ -44,7 +44,7 @@ class CreateStreamTests
           false,
           Some(awsRegion)
         )
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         checkStream2 <- cache.describeStreamSummary(
           describeStreamSummaryReq,
           context,

diff --git a/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala b/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala
@@ -37,7 +37,7 @@ class DecreaseStreamRetentionPeriodTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         _ <- cache
           .increaseStreamRetention(
             IncreaseStreamRetentionPeriodRequest(48, streamName),

diff --git a/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala b/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala
@@ -37,7 +37,7 @@ class DeleteStreamTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         res <- cache
           .deleteStream(
             DeleteStreamRequest(streamName, None),
@@ -53,7 +53,7 @@ class DeleteStreamTests
           false,
           Some(awsRegion)
         )
-        _ <- IO.sleep(cacheConfig.deleteStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.deleteStreamDuration.plus(400.millis))
         checkStream2 <- cache.describeStreamSummary(
           describeStreamSummaryReq,
           context,

diff --git a/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala
@@ -39,7 +39,7 @@ class DeregisterStreamConsumerTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         _ <- cache
           .registerStreamConsumer(
             RegisterStreamConsumerRequest(consumerName, streamArn),
@@ -48,7 +48,7 @@ class DeregisterStreamConsumerTests
           )
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.registerStreamConsumerDuration.plus(200.millis)
+          cacheConfig.registerStreamConsumerDuration.plus(400.millis)
         )
         _ <- cache
           .deregisterStreamConsumer(
@@ -74,7 +74,7 @@ class DeregisterStreamConsumerTests
           )
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.deregisterStreamConsumerDuration.plus(200.millis)
+          cacheConfig.deregisterStreamConsumerDuration.plus(400.millis)
         )
         checkStream2 <- cache.describeStreamConsumer(
           describeStreamConsumerReq,

diff --git a/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala
@@ -39,7 +39,7 @@ class DescribeStreamConsumerTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         registerRes <- cache
           .registerStreamConsumer(
             RegisterStreamConsumerRequest(

diff --git a/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala b/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala
@@ -38,7 +38,7 @@ class GetRecordsTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         recordRequests <- IO(
           putRecordRequestArb.arbitrary
             .take(5)

diff --git a/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala b/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala
@@ -37,7 +37,7 @@ class GetShardIteratorTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         shard <- cache
           .listShards(
             ListShardsRequest(None, None, None, None, None, Some(streamName)),

diff --git a/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala b/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala
@@ -37,7 +37,7 @@ class IncreaseStreamRetentionPeriodTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         _ <- cache
           .increaseStreamRetention(
             IncreaseStreamRetentionPeriodRequest(48, streamName),

diff --git a/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala b/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala
@@ -38,7 +38,7 @@ class ListStreamConsumersTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         streamArn <- cache
           .describeStreamSummary(
             DescribeStreamSummaryRequest(streamName),

diff --git a/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala b/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala
@@ -37,7 +37,7 @@ class MergeShardsTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         adjacentParentShardId = ShardId.create(1).shardId
         parentShardId = ShardId.create(0).shardId
         _ <- cache

diff --git a/src/test/scala/kinesis/mock/cache/PersistenceTests.scala b/src/test/scala/kinesis/mock/cache/PersistenceTests.scala
@@ -51,7 +51,7 @@ class PersistenceTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         recordRequests <- IO(
           putRecordRequestArb.arbitrary
             .take(5)

diff --git a/src/test/scala/kinesis/mock/cache/PutRecordTests.scala b/src/test/scala/kinesis/mock/cache/PutRecordTests.scala
@@ -39,7 +39,7 @@ class PutRecordTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         recordRequests <- IO(
           putRecordRequestArb.arbitrary
             .take(5)

diff --git a/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala b/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala
@@ -39,7 +39,7 @@ class PutRecordsTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         req <- IO(
           PutRecordsRequest(
             putRecordsRequestEntryArb.arbitrary

diff --git a/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala
@@ -39,7 +39,7 @@ class RegisterStreamConsumerTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         _ <- cache
           .registerStreamConsumer(
             RegisterStreamConsumerRequest(consumerName, streamArn),
@@ -60,7 +60,7 @@ class RegisterStreamConsumerTests
           )
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.registerStreamConsumerDuration.plus(200.millis)
+          cacheConfig.registerStreamConsumerDuration.plus(400.millis)
         )
         checkStream2 <- cache
           .describeStreamConsumer(

diff --git a/src/test/scala/kinesis/mock/cache/SplitShardTests.scala b/src/test/scala/kinesis/mock/cache/SplitShardTests.scala
@@ -37,7 +37,7 @@ class SplitShardTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         listShardsReq = ListShardsRequest(
           None,
           None,

diff --git a/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala b/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala
@@ -38,7 +38,7 @@ class StartStreamEncryptionTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         keyId <- IO(keyIdGen.one)
         _ <- cache
           .startStreamEncryption(
@@ -57,7 +57,7 @@ class StartStreamEncryptionTests
           .describeStreamSummary(describeReq, context, false, Some(awsRegion))
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.startStreamEncryptionDuration.plus(200.millis)
+          cacheConfig.startStreamEncryptionDuration.plus(400.millis)
         )
         checkStream2 <- cache
           .describeStreamSummary(describeReq, context, false, Some(awsRegion))

diff --git a/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala b/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala
@@ -38,7 +38,7 @@ class StopStreamEncryptionTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         keyId <- IO(keyIdGen.one)
         _ <- cache
           .startStreamEncryption(
@@ -53,7 +53,7 @@ class StopStreamEncryptionTests
           )
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.startStreamEncryptionDuration.plus(200.millis)
+          cacheConfig.startStreamEncryptionDuration.plus(400.millis)
         )
         _ <- cache
           .stopStreamEncryption(
@@ -72,7 +72,7 @@ class StopStreamEncryptionTests
           .describeStreamSummary(describeReq, context, false, Some(awsRegion))
           .rethrow
         _ <- IO.sleep(
-          cacheConfig.stopStreamEncryptionDuration.plus(200.millis)
+          cacheConfig.stopStreamEncryptionDuration.plus(400.millis)
         )
         checkStream2 <- cache
           .describeStreamSummary(describeReq, context, false, Some(awsRegion))

diff --git a/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala b/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala
@@ -37,7 +37,7 @@ class UpdateShardCountTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis))
         res <- cache
           .updateShardCount(
             UpdateShardCountRequest(
@@ -59,7 +59,7 @@ class UpdateShardCountTests
             Some(awsRegion)
           )
           .rethrow
-        _ <- IO.sleep(cacheConfig.updateShardCountDuration.plus(200.millis))
+        _ <- IO.sleep(cacheConfig.updateShardCountDuration.plus(400.millis))
         checkStream2 <- cache
           .describeStreamSummary(
             describeStreamSummaryReq,

diff --git a/src/test/scala/kinesis/mock/instances/arbitrary.scala b/src/test/scala/kinesis/mock/instances/arbitrary.scala
@@ -213,14 +213,14 @@ object arbitrary {
     .choose(1, 128)
     .flatMap(size =>
       Gen
-        .resize(size, RegexpGen.from("^([a-zA-Z0-9_./=+\\-%@ ]*)$"))
+        .resize(size, RegexpGen.from("^([a-zA-Z0-9_.:/=+\\-@ ]*)$"))
         .suchThat(x => !x.startsWith("aws:") && x.nonEmpty)
     )
 
   val tagValueGen: Gen[String] = Gen
     .choose(0, 256)
     .flatMap(size =>
-      Gen.resize(size, RegexpGen.from("^([a-zA-Z0-9_./=+\\-%@ ]*)$"))
+      Gen.resize(size, RegexpGen.from("^([a-zA-Z0-9_.:/=+\\-@ ]*)$"))
     )
 
   val tagsGen: Gen[Tags] = Gen