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.

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

Release 6.1.2 #1368

Merged
merged 4 commits into from
Nov 22, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 6.1.2 (2024-11-21)
--------------------------
Add slash at the end of the load path (#1366)
Bump Iglu Scala Client to 4.0.1 (#1367)
Upgrade dependencies to fix some vulnerabilities (#1367)

Version 6.1.1 (2024-10-09)
--------------------------
Upgrade dependencies to fix some vulnerabilites (#1364)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Licensed under the [Snowplow Limited Use License Agreement][license]. _(If you a
[build-image]: https://github.com/snowplow/snowplow-rdb-loader/workflows/CI/badge.svg
[build]: https://github.com/snowplow/snowplow-rdb-loader/actions/workflows/ci.yml

[release-image]: https://img.shields.io/badge/release-6.1.1-blue.svg?style=flat
[release-image]: https://img.shields.io/badge/release-6.1.2-blue.svg?style=flat
[releases]: https://github.com/snowplow/snowplow-rdb-loader/releases

[license]: https://docs.snowplow.io/limited-use-license-1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ object ShreddedType {
*/
final case class Json(info: Info, jsonPaths: BlobStorage.Key) extends ShreddedType {
def getLoadPath: String =
s"${info.base}${Common.GoodPrefix}/vendor=${info.vendor}/name=${info.name}/format=json/model=${info.version.model}/revision=${info.version.revision}/addition=${info.version.addition}"
s"${info.base}${Common.GoodPrefix}/vendor=${info.vendor}/name=${info.name}/format=json/model=${info.version.model}/revision=${info.version.revision}/addition=${info.version.addition}/"

def show: String = s"${info.toCriterion.asString} ($jsonPaths)"
}
Expand All @@ -78,7 +78,7 @@ object ShreddedType {
*/
final case class Tabular(info: Info) extends ShreddedType {
def getLoadPath: String =
s"${info.base}${Common.GoodPrefix}/vendor=${info.vendor}/name=${info.name}/format=tsv/model=${info.version.model}/revision=${info.version.revision}/addition=${info.version.addition}"
s"${info.base}${Common.GoodPrefix}/vendor=${info.vendor}/name=${info.name}/format=tsv/model=${info.version.model}/revision=${info.version.revision}/addition=${info.version.addition}/"

def show: String = s"${info.toCriterion.asString} TSV"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ class RedshiftSpec extends Specification {
result.toList must containTheSameElementsAs(
List(
"COPY events FROM s3://my-bucket/my-path/", // atomic
"COPY com_acme_event_2 FROM s3://my-bucket/my-path/output=good/vendor=com.acme/name=event/format=tsv/model=2/revision=0/addition=0",
"COPY com_acme_event_3 FROM s3://my-bucket/my-path/output=good/vendor=com.acme/name=event/format=tsv/model=3/revision=0/addition=0"
"COPY com_acme_event_2 FROM s3://my-bucket/my-path/output=good/vendor=com.acme/name=event/format=tsv/model=2/revision=0/addition=0/",
"COPY com_acme_event_3 FROM s3://my-bucket/my-path/output=good/vendor=com.acme/name=event/format=tsv/model=3/revision=0/addition=0/"
)
)
}
Expand Down
7 changes: 5 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Dependencies {
object V {
// Scala (Loader)
val decline = "2.4.1"
val igluClient = "4.0.0"
val igluClient = "4.0.1"
val igluCore = "1.1.1"
val badrows = "2.2.0"
val analyticsSdk = "3.1.0"
Expand Down Expand Up @@ -64,7 +64,7 @@ object Dependencies {

val slf4j = "2.0.3"
val redshiftJdbc = "1.2.55.1083"
val snowflakeJdbc = "3.13.30"
val snowflakeJdbc = "3.20.0"
val enumeratum = "1.7.0"
val aws = "1.12.677"
val aws2 = "2.23.17"
Expand All @@ -77,6 +77,7 @@ object Dependencies {
val jettison = "1.5.4" // Fix CVE
val reactorNetty = "1.0.39" // Fix CVE
val jettyHttp = "9.4.51.v20230217" // Fix CVE
val jettyServer = "9.4.56.v20240826" // Fix CVE
val zookeeper = "3.9.2" // Fix CVE
val dnsjava = "3.6.1" // Fix CVE

Expand Down Expand Up @@ -187,6 +188,7 @@ object Dependencies {
val jettison = "org.codehaus.jettison" % "jettison" % V.jettison
val reactorNetty = "io.projectreactor.netty" % "reactor-netty-http" % V.reactorNetty
val jettyHttp = "org.eclipse.jetty" % "jetty-http" % V.jettyHttp
val jettyServer = "org.eclipse.jetty" % "jetty-server" % V.jettyServer

// Java (Shredder)
val dynamodb = "com.amazonaws" % "aws-java-sdk-dynamodb" % V.aws
Expand Down Expand Up @@ -261,6 +263,7 @@ object Dependencies {
avro,
reactorNetty,
jettyHttp,
jettyServer,
dnsjava
)

Expand Down
Loading