Skip to content

Commit

Permalink
Deprecate enrich-rabbitmq (close #822)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjben authored and spenes committed Nov 15, 2023
1 parent 4788def commit 4c373e9
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 921 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/lacework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,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
8 changes: 1 addition & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
run: |
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 @@ -38,7 +37,6 @@ jobs:
files: |
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 @@ -54,11 +52,7 @@ jobs:
- kinesis
- kafka
- nsq
- rabbitmq
include:
- suffix: ""
- suffix: -experimental
app: rabbitmq
- app: kinesis
run_snyk: ${{ !contains(github.ref, 'rc') }}
- app: pubsub
Expand Down Expand Up @@ -94,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
21 changes: 1 addition & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ lazy val root = project.in(file("."))
.settings(projectSettings)
.settings(compilerSettings)
.settings(resolverSettings)
.aggregate(common, commonFs2, pubsub, kinesis, kafka, rabbitmq, nsq)
.aggregate(common, commonFs2, pubsub, kinesis, kafka, nsq)

lazy val common = project
.in(file("modules/common"))
Expand Down Expand Up @@ -113,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
284 changes: 0 additions & 284 deletions config/config.rabbitmq.extended.hocon

This file was deleted.

Loading

0 comments on commit 4c373e9

Please sign in to comment.