From d37a40da22477ee82f3da084c7f284f0dfa1c68f Mon Sep 17 00:00:00 2001 From: Mikayla Thompson Date: Fri, 19 Apr 2024 16:05:25 -0600 Subject: [PATCH 1/2] Revert "update aws-msk-iam-auth" This reverts commit 545af0346cc0354b6c945ef1c63a61c0ad1defd2. Signed-off-by: Mikayla Thompson --- TrafficCapture/captureKafkaOffloader/build.gradle | 2 +- .../dockerSolution/src/main/docker/migrationConsole/Dockerfile | 2 +- TrafficCapture/trafficReplayer/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TrafficCapture/captureKafkaOffloader/build.gradle b/TrafficCapture/captureKafkaOffloader/build.gradle index 73508c60c..82af8c0c0 100644 --- a/TrafficCapture/captureKafkaOffloader/build.gradle +++ b/TrafficCapture/captureKafkaOffloader/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation group: 'org.projectlombok', name:'lombok', version:'1.18.26' implementation group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0' implementation group: 'org.slf4j', name:'slf4j-api', version:'2.0.7' - implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'2.1.0' + implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'1.1.9' testImplementation project(':captureProtobufs') testImplementation testFixtures(project(path: ':coreUtilities')) diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile index 3a884eb86..914ae2ca2 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile +++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile @@ -11,7 +11,7 @@ RUN mkdir /root/kafka-tools/aws WORKDIR /root/kafka-tools # Get kafka distribution and unpack to 'kafka' RUN wget -qO- https://archive.apache.org/dist/kafka/3.6.0/kafka_2.13-3.6.0.tgz | tar --transform 's!^[^/]*!kafka!' -xvz -RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v2.1.0/aws-msk-iam-auth-2.1.0-all.jar +RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v1.1.9/aws-msk-iam-auth-1.1.9-all.jar WORKDIR /root # Add Traffic Replayer jars for running KafkaPrinter from this container diff --git a/TrafficCapture/trafficReplayer/build.gradle b/TrafficCapture/trafficReplayer/build.gradle index fe81b4665..4ba285a8c 100644 --- a/TrafficCapture/trafficReplayer/build.gradle +++ b/TrafficCapture/trafficReplayer/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation group: 'software.amazon.awssdk', name: 'auth', version: '2.20.102' implementation group: 'software.amazon.awssdk', name: 'sdk-core', version: '2.20.102' implementation group: 'software.amazon.awssdk', name: 'secretsmanager', version: '2.20.127' - implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.1.0' + implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.9' implementation 'org.apache.commons:commons-compress:1.26.0' testFixturesImplementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface') From fe7aa61c26243e15562dc051e13f6c47253c819b Mon Sep 17 00:00:00 2001 From: Mikayla Thompson Date: Mon, 22 Apr 2024 11:02:33 -0600 Subject: [PATCH 2/2] update to latest good commit Signed-off-by: Mikayla Thompson --- TrafficCapture/captureKafkaOffloader/build.gradle | 2 +- .../dockerSolution/src/main/docker/migrationConsole/Dockerfile | 2 +- TrafficCapture/trafficReplayer/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TrafficCapture/captureKafkaOffloader/build.gradle b/TrafficCapture/captureKafkaOffloader/build.gradle index 82af8c0c0..142cbbf04 100644 --- a/TrafficCapture/captureKafkaOffloader/build.gradle +++ b/TrafficCapture/captureKafkaOffloader/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation group: 'org.projectlombok', name:'lombok', version:'1.18.26' implementation group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0' implementation group: 'org.slf4j', name:'slf4j-api', version:'2.0.7' - implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'1.1.9' + implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'2.0.3' testImplementation project(':captureProtobufs') testImplementation testFixtures(project(path: ':coreUtilities')) diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile index 914ae2ca2..007fc0c89 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile +++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile @@ -11,7 +11,7 @@ RUN mkdir /root/kafka-tools/aws WORKDIR /root/kafka-tools # Get kafka distribution and unpack to 'kafka' RUN wget -qO- https://archive.apache.org/dist/kafka/3.6.0/kafka_2.13-3.6.0.tgz | tar --transform 's!^[^/]*!kafka!' -xvz -RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v1.1.9/aws-msk-iam-auth-1.1.9-all.jar +RUN wget -O kafka/libs/msk-iam-auth.jar https://github.com/aws/aws-msk-iam-auth/releases/download/v2.0.3/aws-msk-iam-auth-2.0.3-all.jar WORKDIR /root # Add Traffic Replayer jars for running KafkaPrinter from this container diff --git a/TrafficCapture/trafficReplayer/build.gradle b/TrafficCapture/trafficReplayer/build.gradle index 4ba285a8c..c0e243fe7 100644 --- a/TrafficCapture/trafficReplayer/build.gradle +++ b/TrafficCapture/trafficReplayer/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation group: 'software.amazon.awssdk', name: 'auth', version: '2.20.102' implementation group: 'software.amazon.awssdk', name: 'sdk-core', version: '2.20.102' implementation group: 'software.amazon.awssdk', name: 'secretsmanager', version: '2.20.127' - implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.9' + implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.0.3' implementation 'org.apache.commons:commons-compress:1.26.0' testFixturesImplementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface')