From 12bfab30bff84c38d8790746e56714e7c3e793ef Mon Sep 17 00:00:00 2001 From: Omar Khasawneh Date: Tue, 10 Oct 2023 11:37:47 -0500 Subject: [PATCH] Fix classpath for capture proxy after renaming Signed-off-by: Omar Khasawneh --- .../dockerSolution/src/main/docker/docker-compose.yml | 4 ++-- TrafficCapture/trafficCaptureProxyServer/build.gradle | 2 +- .../src/main/docker/docker-compose.yml | 2 +- deployment/copilot/capture-proxy-es/manifest.yml | 2 +- deployment/copilot/capture-proxy/manifest.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml b/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml index 9fd80d7c1..4ea0eafa9 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml +++ b/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml @@ -13,7 +13,7 @@ services: environment: - http.port=19200 # Run processes for elasticsearch and capture proxy, and exit if either one ends - command: /bin/sh -c '/usr/local/bin/docker-entrypoint.sh eswrapper & /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.Main --kafkaConnection kafka:9092 --destinationUri https://localhost:19200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml & wait -n 1' + command: /bin/sh -c '/usr/local/bin/docker-entrypoint.sh eswrapper & /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy --kafkaConnection kafka:9092 --destinationUri https://localhost:19200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml & wait -n 1' depends_on: - kafka @@ -24,7 +24,7 @@ services: # - migrations # ports: # - "9200:9200" -# command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.Main --kafkaConnection kafka:9092 --destinationUri https://elasticsearch:9200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml +# command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy --kafkaConnection kafka:9092 --destinationUri https://elasticsearch:9200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml # depends_on: # - kafka # - elasticsearch diff --git a/TrafficCapture/trafficCaptureProxyServer/build.gradle b/TrafficCapture/trafficCaptureProxyServer/build.gradle index 9efb13dfd..c16f2c863 100644 --- a/TrafficCapture/trafficCaptureProxyServer/build.gradle +++ b/TrafficCapture/trafficCaptureProxyServer/build.gradle @@ -53,5 +53,5 @@ tasks.withType(Zip){ application { // Define the main class for the application. - mainClass = 'org.opensearch.migrations.trafficcapture.proxyserver.Main' + mainClass = 'org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy' } diff --git a/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/docker-compose.yml b/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/docker-compose.yml index ff86ec9bc..1357112bc 100644 --- a/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/docker-compose.yml +++ b/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/docker-compose.yml @@ -13,7 +13,7 @@ services: - testing ports: - "9201:9201" - command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.Main --destinationUri http://webserver:80 --listenPort 9201 --noCapture --destinationConnectionPoolSize 0 --numThreads 1 + command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy --destinationUri http://webserver:80 --listenPort 9201 --noCapture --destinationConnectionPoolSize 0 --numThreads 1 depends_on: - webserver diff --git a/deployment/copilot/capture-proxy-es/manifest.yml b/deployment/copilot/capture-proxy-es/manifest.yml index ee1f5af57..3558f44ad 100644 --- a/deployment/copilot/capture-proxy-es/manifest.yml +++ b/deployment/copilot/capture-proxy-es/manifest.yml @@ -28,7 +28,7 @@ image: # Port exposed through your container to route traffic to it. port: 9200 -command: /bin/sh -c '/usr/local/bin/docker-entrypoint.sh eswrapper & /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.Main --kafkaConnection ${MIGRATION_KAFKA_BROKER_ENDPOINTS} --enableMSKAuth --destinationUri https://localhost:19200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml & wait -n 1' +command: /bin/sh -c '/usr/local/bin/docker-entrypoint.sh eswrapper & /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy --kafkaConnection ${MIGRATION_KAFKA_BROKER_ENDPOINTS} --enableMSKAuth --destinationUri https://localhost:19200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml & wait -n 1' cpu: 1024 # Number of CPU units for the task. memory: 4096 # Amount of memory in MiB used by the task. diff --git a/deployment/copilot/capture-proxy/manifest.yml b/deployment/copilot/capture-proxy/manifest.yml index 2ac80b5ad..14418df2e 100644 --- a/deployment/copilot/capture-proxy/manifest.yml +++ b/deployment/copilot/capture-proxy/manifest.yml @@ -20,7 +20,7 @@ image: # Port exposed through your container to route traffic to it. port: 9200 -command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.Main --kafkaConnection ${MIGRATION_KAFKA_BROKER_ENDPOINTS} --enableMSKAuth --destinationUri https://elasticsearch:9200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml +command: /runJavaWithClasspath.sh org.opensearch.migrations.trafficcapture.proxyserver.CaptureProxy --kafkaConnection ${MIGRATION_KAFKA_BROKER_ENDPOINTS} --enableMSKAuth --destinationUri https://elasticsearch:9200 --insecureDestination --listenPort 9200 --sslConfigFile /usr/share/elasticsearch/config/proxy_tls.yml cpu: 512 # Number of CPU units for the task. memory: 2048 # Amount of memory in MiB used by the task.