Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: snowplow/snowplow-s3-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.1-rc1
Choose a base ref
...
head repository: snowplow/snowplow-s3-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 501 additions and 292 deletions.
  1. +123 −0 .github/workflows/ci.yml
  2. +15 −1 .github/workflows/lacework.yml
  3. +0 −20 .github/workflows/snyk.yml
  4. +0 −69 .github/workflows/test_and_publish.yml
  5. +76 −1 CHANGELOG
  6. +1 −1 LICENSE-2.0.txt
  7. +5 −66 README.md
  8. +25 −36 build.sbt
  9. +2 −2 config/config.hocon.sample
  10. +5 −3 ...serializers → modules/lzo/src/main/scala/com.snowplowanalytics.s3.loader.lzo}/LzoSerializer.scala
  11. +20 −0 modules/lzo/src/main/scala/com.snowplowanalytics.s3.loader.lzo/Main.scala
  12. +26 −0 modules/lzo/src/main/scala/com.snowplowanalytics.s3.loader.lzo/S3Loader.scala
  13. +2 −2 ...alizers → modules/lzo/src/test/scala/com.snowplowanalytics.s3.loader.lzo}/LzoSerializerSpec.scala
  14. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/Config.scala
  15. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/DynamicPath.scala
  16. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/KinesisSink.scala
  17. +9 −4 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/Main.scala
  18. +12 −9 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/S3Loader.scala
  19. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/connector/IdentityTransformer.scala
  20. +3 −2 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/connector/KinesisS3Emitter.scala
  21. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/connector/KinesisS3Pipeline.scala
  22. +4 −4 ...odules/main}/src/main/scala/com/snowplowanalytics/s3/loader/connector/KinesisSourceExecutor.scala
  23. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/monitoring/Monitoring.scala
  24. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/monitoring/SnowplowTracking.scala
  25. +18 −0 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/monitoring/StatsD.scala
  26. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/package.scala
  27. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/processing/Batch.scala
  28. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/processing/Common.scala
  29. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/processing/RowType.scala
  30. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/serializers/GZipSerializer.scala
  31. +1 −1 { → modules/main}/src/main/scala/com/snowplowanalytics/s3/loader/serializers/ISerializer.scala
  32. 0 { → modules/main}/src/test/resources/config.invalid
  33. +2 −2 { → modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/ConfigSpec.scala
  34. +1 −1 { → modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/DynamicPathSpec.scala
  35. +1 −1 ...modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/connector/KinesisS3EmitterSpec.scala
  36. +1 −1 { → modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/processing/BatchSpec.scala
  37. +1 −1 { → modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/processing/CommonSpec.scala
  38. +3 −3 ...modules/main}/src/test/scala/com/snowplowanalytics/s3/loader/serializers/GZipSerializerSpec.scala
  39. +40 −21 project/BuildSettings.scala
  40. +91 −26 project/Dependencies.scala
  41. +1 −1 project/build.properties
  42. +1 −2 project/plugins.sbt
123 changes: 123 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
name: CI

on:
push:
tags:
- '*'
branches:
- master
- develop
pull_request:

jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 11
distribution: adopt

- name: Install LZO
run: sudo apt-get install -y lzop liblzo2-dev

- name: Run tests
run: |
sbt "project main" test
sbt "project lzo" test
- name: Check formatting
run: sbt scalafmtCheck

publish_docker:
needs: test
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
strategy:
matrix:
app:
- main
- lzo
- distroless
include:
- suffix: ""
- app: lzo
run_snyk: ${{ !contains(github.ref, 'rc') }}
- app: distroless
run_snyk: ${{ !contains(github.ref, 'rc') }}

steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 11
distribution: adopt

- name: Install LZO
run: sudo apt-get install -y lzop liblzo2-dev

- name: Login to Docker Hub
run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

- name: Publish to Docker Hub
run: sbt "project ${{ matrix.app }}" docker:publish

- name: Build local image, which is needed to run Snyk
if: matrix.run_snyk
run: sbt "project ${{ matrix.app }}" docker:publishLocal
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/docker@master
if: matrix.run_snyk
with:
image: "snowplow/snowplow-s3-loader:${{ github.ref_name }}-${{ matrix.app }}"
args: "--app-vulns --org=data-processing-new"
command: monitor
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

create_release:
needs: test
if: ${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'rc') }}
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 11
distribution: adopt

- name: Install LZO
run: sudo apt-get install -y lzop liblzo2-dev

- name: Build artifacts
run: |
sbt assembly
- name: Get current version
id: ver
run: |
export PROJECT_VERSION=$(sbt version -Dsbt.log.noformat=true | perl -ne 'print "$1\n" if /info.*(\d+\.\d+\.\d+[^\r\n]*)/' | tail -n 1 | tr -d '\n')
echo "::set-output name=project_version::$PROJECT_VERSION"
- name: Create GitHub release and attach artifacts
uses: softprops/action-gh-release@v1
with:
draft: true
prerelease: true
name: Version ${{ steps.ver.outputs.project_version }}
tag_name: ${{ steps.ver.outputs.project_version }}
files: |
modules/main/target/scala-2.13/snowplow-s3-loader-${{ steps.ver.outputs.project_version }}.jar
modules/lzo/target/scala-2.13/snowplow-s3-loader-lzo-${{ steps.ver.outputs.project_version }}.jar
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16 changes: 15 additions & 1 deletion .github/workflows/lacework.yml
Original file line number Diff line number Diff line change
@@ -29,9 +29,23 @@ jobs:
- name: Build docker images
run: sbt docker:publishLocal

- name: Scan snowplow-s3-loader
- name: Scan snowplow-s3-loader focal
env:
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
LW_SCANNER_SAVE_RESULTS: ${{ !contains(steps.version.outputs.tag, 'rc') }}
run: ./lw-scanner image evaluate snowplow/snowplow-s3-loader ${{ steps.ver.outputs.tag }} --build-id ${{ github.run_id }} --no-pull

- name: Scan snowplow-s3-loader distroless
env:
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
LW_SCANNER_SAVE_RESULTS: ${{ !contains(steps.version.outputs.tag, 'rc') }}
run: ./lw-scanner image evaluate snowplow/snowplow-s3-loader ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan snowplow-s3-loader lzo
env:
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
LW_SCANNER_SAVE_RESULTS: ${{ !contains(steps.version.outputs.tag, 'rc') }}
run: ./lw-scanner image evaluate snowplow/snowplow-s3-loader ${{ steps.ver.outputs.tag }}-lzo --build-id ${{ github.run_id }} --no-pull
20 changes: 0 additions & 20 deletions .github/workflows/snyk.yml

This file was deleted.

69 changes: 0 additions & 69 deletions .github/workflows/test_and_publish.yml

This file was deleted.

77 changes: 76 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,78 @@
Version 2.2.9 (2024-07-16)
--------------------------
Bump amazon-kinesis-client to 1.15.1
Add sts module to lzo Docker image

Version 2.2.8 (2023-11-24)
--------------------------
Scan Docker images in Snyk Github action (#285)
Bump pureconfig to 0.15.0 (#286)
Bump reload4j to 1.2.22 (#286)
Bump snappy-java to 1.1.10.4 (#286)

Version 2.2.7 (2023-04-14)
--------------------------
Bump sbt-snowplow-release to 0.3.1 (#282)

Version 2.2.6 (2023-01-10)
--------------------------
Update copyright notice to 2023 (#279)
Use sbt-snowplow-release to build docker images (#278)
Bump protobuf-java to 3.21.12 (#277)
Bump jackson to 2.14.1 (#276)

Version 2.2.5 (2022-11-15)
--------------------------
Add STS to runtime dependencies (#275)

Version 2.2.4 (2022-11-02)
--------------------------
Ensure docker image has latest libexpat version (#271)

Version 2.2.3 (2022-09-27)
--------------------------
Fix: loader cannot start with InitialPosition = AT_TIMESTAMP (#267)
Bump scala version to 2.13.9 (#270)

Version 2.2.2 (2022-07-21)
--------------------------
Ensure docker image has latest libfreetype6 version (#265)

Version 2.2.1 (2022-06-30)
--------------------------
Bump hadoop to 3.3.3 (#263)

Version 2.2.0 (2022-05-19)
--------------------------
Publish distroless docker image (#258)
Bump jackson-databind to 2.12.6.1 (#260)
Bump amazon-kinesis-client to 1.14.8 (#259)
Split lzo serializers into a separate sbt project (#261)

Version 2.1.4 (2022-02-15)
--------------------------
Update copyright notice to 2022 (#255)
Change docker base image to eclipse-temurin:11-jre-focal (#254)
Bump protobuf-java to 3.19.4 (#253)
Bump jackson to 2.12.6 (2.12.6)
Bump kinesis client to 1.14.7 (#251)

Version 2.1.3 (2021-12-23)
--------------------------
Fix partition format in example hocon (#247)
Clean up terminated shards before expiry (#248)

Version 2.1.2 (2021-12-15)
--------------------------
Bump amazon-kinesis-client to 1.14.5 (#245)

Version 2.1.1 (2021-12-15)
--------------------------
Exclude transitive dependencies of hadoop (#243)
Bump commons-collections to 3.2.2 (#242)
Bump elephant-bird-core to 4.17 (#241)
Remove log4j (#240)

Version 2.1.0 (2021-11-26)
--------------------------
Update readme (#239)
@@ -16,7 +91,7 @@ Use AdoptOpenJDK 11 as docker base image (#224)
Use snowplow-badrows (#215)
Use sbt-tpolecat (#222)
Report metrics to StatsD (#216)
Integrate Sentry (close #218)
Integrate Sentry (#218)
Redesign config file structure (#214)
Harmonize module structure (#210)
Drop NSQ support (#211)
2 changes: 1 addition & 1 deletion LICENSE-2.0.txt
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014-2021 Snowplow Analytics Ltd.
Copyright 2014-2023 Snowplow Analytics Ltd.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Loading