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.

Sign up for GitHub

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

Deprecate Stream Enrich and enrich-rabbitmq #787

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Deprecate Stream Enrich and enrich-rabbitmq #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfcaa5e
Deprecate Stream Enrich (close #788)
benjben Apr 27, 2023
4a9f950
Deprecate enrich-rabbitmq (close #822)
benjben Oct 18, 2023
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
56 changes: 0 additions & 56 deletions .github/workflows/lacework.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,48 +60,6 @@ jobs:
LW_SCANNER_SAVE_RESULTS: ${{ !contains(steps.version.outputs.tag, 'rc') }}
run: ./lw-scanner image evaluate snowplow/snowplow-enrich-kinesis ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich Kinesis
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/stream-enrich-kinesis ${{ steps.ver.outputs.tag }} --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich Kinesis 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/stream-enrich-kinesis ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich Kafka
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/stream-enrich-kafka ${{ steps.ver.outputs.tag }} --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich Kafka 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/stream-enrich-kafka ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich NSQ
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/stream-enrich-nsq ${{ steps.ver.outputs.tag }} --build-id ${{ github.run_id }} --no-pull

- name: Scan Stream Enrich NSQ 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/stream-enrich-nsq ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan enrich-kafka
env:
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
Expand All @@ -116,20 +74,6 @@ jobs:
LW_SCANNER_SAVE_RESULTS: ${{ !contains(steps.version.outputs.tag, 'rc') }}
run: ./lw-scanner image evaluate snowplow/snowplow-enrich-kafka ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan enrich-rabbitmq
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-enrich-rabbitmq ${{ steps.ver.outputs.tag }} --build-id ${{ github.run_id }} --no-pull

- name: Scan enrich-rabbitmq 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-enrich-rabbitmq ${{ steps.ver.outputs.tag }}-distroless --build-id ${{ github.run_id }} --no-pull

- name: Scan enrich-nsq
env:
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ jobs:
run: echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
- name: Assemble fat jars
run: |
sbt "project streamKinesis; set assembly / test := {}; assembly" \
"project streamKafka; set assembly / test := {}; assembly" \
"project streamNsq; set assembly / test := {}; assembly" \
"project pubsub; set assembly / test := {}; assembly" \
sbt "project pubsub; set assembly / test := {}; assembly" \
"project kinesis; set assembly / test := {}; assembly" \
"project rabbitmq; set assembly / test := {}; assembly" \
"project kafka; set assembly / test := {}; assembly" \
"project nsq; set assembly / test := {}; assembly"
- name: Create GitHub release and attach artifacts
Expand All @@ -39,12 +35,8 @@ jobs:
name: ${{ steps.ver.outputs.tag }}
tag_name: ${{ steps.ver.outputs.tag }}
files: |
modules/stream/kinesis/target/scala-2.12/snowplow-stream-enrich-kinesis-${{ steps.ver.outputs.tag }}.jar
modules/stream/kafka/target/scala-2.12/snowplow-stream-enrich-kafka-${{ steps.ver.outputs.tag }}.jar
modules/stream/nsq/target/scala-2.12/snowplow-stream-enrich-nsq-${{ steps.ver.outputs.tag }}.jar
modules/pubsub/target/scala-2.12/snowplow-enrich-pubsub-${{ steps.ver.outputs.tag }}.jar
modules/kinesis/target/scala-2.12/snowplow-enrich-kinesis-${{ steps.ver.outputs.tag }}.jar
modules/rabbitmq/target/scala-2.12/snowplow-enrich-rabbitmq-${{ steps.ver.outputs.tag }}.jar
modules/kafka/target/scala-2.12/snowplow-enrich-kafka-${{ steps.ver.outputs.tag }}.jar
modules/nsq/target/scala-2.12/snowplow-enrich-nsq-${{ steps.ver.outputs.tag }}.jar
env:
Expand All @@ -56,18 +48,11 @@ jobs:
strategy:
matrix:
app:
- streamKinesis
- streamKafka
- streamNsq
- pubsub
- kinesis
- kafka
- nsq
- rabbitmq
include:
- suffix: ""
- suffix: -experimental
app: rabbitmq
- app: kinesis
run_snyk: ${{ !contains(github.ref, 'rc') }}
- app: pubsub
Expand Down Expand Up @@ -103,7 +88,7 @@ jobs:
- name: Get app package name
id: packageName
run: |
export PACKAGE_NAME=$(sbt "project ${{ matrix.app }}" dockerAlias -Dsbt.log.noformat=true | sed -n '/\[info\]/ s/\[info\] //p' | tail -1 | tr -d '\n' | cut -d":" -f1)${{ matrix.suffix }}
export PACKAGE_NAME=$(sbt "project ${{ matrix.app }}" dockerAlias -Dsbt.log.noformat=true | sed -n '/\[info\]/ s/\[info\] //p' | tail -1 | tr -d '\n' | cut -d":" -f1)
echo "::set-output name=package_name::$PACKAGE_NAME"
- name: Get app base directory
id: baseDirectory
Expand Down
89 changes: 2 additions & 87 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2022 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2012-2023 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand All @@ -23,80 +23,14 @@ lazy val root = project.in(file("."))
.settings(projectSettings)
.settings(compilerSettings)
.settings(resolverSettings)
.aggregate(common, commonFs2, pubsub, pubsubDistroless, kinesis, kinesisDistroless, streamCommon, streamKinesis, streamKinesisDistroless, streamKafka, streamKafkaDistroless, streamNsq, streamNsqDistroless, streamStdin, kafka, kafkaDistroless, rabbitmq, rabbitmqDistroless, nsq, nsqDistroless)
.aggregate(common, commonFs2, pubsub, pubsubDistroless, kinesis, kinesisDistroless, kafka, kafkaDistroless, nsq, nsqDistroless)

lazy val common = project
.in(file("modules/common"))
.settings(commonBuildSettings)
.settings(libraryDependencies ++= commonDependencies)
.settings(excludeDependencies ++= exclusions)

lazy val streamCommon = project
.in(file("modules/stream/common"))
.enablePlugins(BuildInfoPlugin)
.settings(streamCommonBuildSettings)
.settings(libraryDependencies ++= streamCommonDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(common % "test->test;compile->compile")

lazy val streamKinesis = project
.in(file("modules/stream/kinesis"))
.enablePlugins(JavaAppPackaging, SnowplowDockerPlugin)
.settings(streamKinesisBuildSettings)
.settings(libraryDependencies ++= streamKinesisDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamKinesisDistroless = project
.in(file("modules/distroless/stream/kinesis"))
.enablePlugins(JavaAppPackaging, SnowplowDistrolessDockerPlugin)
.settings(sourceDirectory := (streamKinesis / sourceDirectory).value)
.settings(streamKinesisDistrolessBuildSettings)
.settings(libraryDependencies ++= streamKinesisDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamKafka = project
.in(file("modules/stream/kafka"))
.enablePlugins(JavaAppPackaging, SnowplowDockerPlugin)
.settings(streamKafkaBuildSettings)
.settings(libraryDependencies ++= streamKafkaDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamKafkaDistroless = project
.in(file("modules/distroless/stream/kafka"))
.enablePlugins(JavaAppPackaging, SnowplowDistrolessDockerPlugin)
.settings(sourceDirectory := (streamKafka / sourceDirectory).value)
.settings(streamKafkaDistrolessBuildSettings)
.settings(libraryDependencies ++= streamKafkaDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamNsq = project
.in(file("modules/stream/nsq"))
.enablePlugins(JavaAppPackaging, SnowplowDockerPlugin)
.settings(streamNsqBuildSettings)
.settings(libraryDependencies ++= streamNsqDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamNsqDistroless = project
.in(file("modules/distroless/stream/nsq"))
.enablePlugins(JavaAppPackaging, SnowplowDistrolessDockerPlugin)
.settings(sourceDirectory := (streamNsq / sourceDirectory).value)
.settings(streamNsqDistrolessBuildSettings)
.settings(libraryDependencies ++= streamNsqDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val streamStdin = project
.in(file("modules/stream/stdin"))
.settings(streamStdinBuildSettings)
.settings(libraryDependencies ++= streamCommonDependencies)
.settings(excludeDependencies ++= exclusions)
.dependsOn(streamCommon)

lazy val commonFs2 = project
.in(file("modules/common-fs2"))
.enablePlugins(BuildInfoPlugin)
Expand Down Expand Up @@ -179,25 +113,6 @@ lazy val kafkaDistroless = project
.settings(addCompilerPlugin(betterMonadicFor))
.dependsOn(commonFs2)

lazy val rabbitmq = project
.in(file("modules/rabbitmq"))
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, SnowplowDockerPlugin)
.settings(rabbitmqBuildSettings)
.settings(libraryDependencies ++= rabbitmqDependencies)
.settings(excludeDependencies ++= exclusions)
.settings(addCompilerPlugin(betterMonadicFor))
.dependsOn(commonFs2)

lazy val rabbitmqDistroless = project
.in(file("modules/distroless/rabbitmq"))
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, SnowplowDistrolessDockerPlugin)
.settings(sourceDirectory := (rabbitmq / sourceDirectory).value)
.settings(rabbitmqDistrolessBuildSettings)
.settings(libraryDependencies ++= rabbitmqDependencies)
.settings(excludeDependencies ++= exclusions)
.settings(addCompilerPlugin(betterMonadicFor))
.dependsOn(commonFs2)

lazy val nsq = project
.in(file("modules/nsq"))
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, SnowplowDockerPlugin)
Expand Down
Loading
Loading