Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 0 additions & 38 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,6 @@ jobs:
with:
node-version: 16

- name: Install AWS cli 1
run: |
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.27.127.zip" -o "awscliv1.zip"
unzip ./awscliv1.zip
ls
sudo ./awscli-bundle/install -i /usr/local/aws1 -b /usr/local/bin/aws1

- name: Install AWS cli 2
run: |
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip ./awscliv2.zip
ls
sudo ./aws/install -i /usr/local/aws2 -b /usr/local/bin/aws2

- name: Cache SBT
id: cache-sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -76,18 +62,6 @@ jobs:
with:
node-version: 16

- name: Install AWS cli 1
run: |
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.27.127.zip" -o "awscliv1.zip"
unzip -qq ./awscliv1.zip
sudo ./awscli-bundle/install -i /usr/local/aws1 -b /usr/local/bin/aws1

- name: Install AWS cli 2
run: |
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip -qq ./awscliv2.zip
sudo ./aws/install -i /usr/local/aws2 -b /usr/local/bin/aws2

- name: Cache SBT
id: cache-sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -122,18 +96,6 @@ jobs:
with:
node-version: 16

- name: Install AWS cli 1
run: |
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.27.127.zip" -o "awscliv1.zip"
unzip -qq ./awscliv1.zip
sudo ./awscli-bundle/install -i /usr/local/aws1 -b /usr/local/bin/aws1

- name: Install AWS cli 2
run: |
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip -qq ./awscliv2.zip
sudo ./aws/install -i /usr/local/aws2 -b /usr/local/bin/aws2

- name: Cache SBT
id: cache-sbt
uses: actions/cache@v2
Expand Down
9 changes: 1 addition & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ val sprayJson = "io.spray" %% "spray-json" % "1.3.6"
val pekkoHttpSprayJson = "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion
val pekkoHttpTestkit = "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % "test"

val awsSpringMessagingVersion = "2.2.6.RELEASE"
val springVersion = "5.3.34"
val awsSpringMessaging = "org.springframework.cloud" % "spring-cloud-aws-messaging" % awsSpringMessagingVersion
val springWeb = "org.springframework" % "spring-web" % springVersion

val scala2Async = "org.scala-lang.modules" %% "scala-async" % "1.0.1"
val scala3Async =
"com.github.rssh" %% "shim-scala-async-dotty-cps-async" % "0.9.21" // allows cross compilation w/o changes in source code
Expand Down Expand Up @@ -211,9 +206,7 @@ lazy val restSqsTestingAmazonJavaSdk: Project =
libraryDependencies ++= Seq(
amazonJavaSdkSqs,
amazonJavaV2SdkSqs,
awsSpringMessaging,
jclOverSlf4j,
springWeb
jclOverSlf4j
) ++ common,
publish / skip := true
)
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/scala/org/elasticmq/MessageAttribute.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ case class NumberMessageAttribute(stringValue: String, override val customType:
protected override val primaryDataType: String = "Number"
}

case class BinaryMessageAttribute(binaryValue: Array[Byte], override val customType: Option[String] = None)
case class BinaryMessageAttribute(binaryValue: Seq[Byte], override val customType: Option[String] = None)
extends MessageAttribute(customType) {
protected override val primaryDataType: String = "Binary"

def asBase64: String = Base64.getEncoder.encodeToString(binaryValue)
def asBase64: String = Base64.getEncoder.encodeToString(binaryValue.toArray)
}

object BinaryMessageAttribute {
def fromBase64(base64Str: String, customType: Option[String] = None): BinaryMessageAttribute =
BinaryMessageAttribute(
binaryValue = Base64.getDecoder.decode(base64Str),
binaryValue = Base64.getDecoder.decode(base64Str).toSeq,
customType = customType
)

Expand All @@ -44,7 +44,7 @@ object BinaryMessageAttribute {
val value = new Array[Byte](byteBuffer.capacity())
byteBuffer.get(value)
value
},
}.toSeq,
customType = customType
)
}
Loading