From 5128a026d29ebf6e842bb2049c6e62dbbcf2455d Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:37:06 -0400 Subject: [PATCH 1/9] Edit enviroment --- compare/kafka_comparator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compare/kafka_comparator.py b/compare/kafka_comparator.py index 7bd762f..865ba04 100644 --- a/compare/kafka_comparator.py +++ b/compare/kafka_comparator.py @@ -4,9 +4,9 @@ import httpx import time -KAFKA_BROKER = os.environ['KAFKA_BROKER'] -API_MAIN_URL = os.environ['API_MAIN_URL'] -API_BRANCH_URL = os.environ['API_BRANCH_URL'] +KAFKA_BROKER = os.getenv('KAFKA_BROKER') +API_MAIN_URL = os.environ('API_MAIN_URL') +API_BRANCH_URL = os.environ('API_BRANCH_URL') TOPIC = 'test-topic' producer = Producer({'bootstrap.servers': KAFKA_BROKER}) From 8b2e853f1d6d8425e2d4cca5f8794e65f26c673f Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:44:47 -0400 Subject: [PATCH 2/9] Edit enviroment --- compare/kafka_comparator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compare/kafka_comparator.py b/compare/kafka_comparator.py index 865ba04..7bd762f 100644 --- a/compare/kafka_comparator.py +++ b/compare/kafka_comparator.py @@ -4,9 +4,9 @@ import httpx import time -KAFKA_BROKER = os.getenv('KAFKA_BROKER') -API_MAIN_URL = os.environ('API_MAIN_URL') -API_BRANCH_URL = os.environ('API_BRANCH_URL') +KAFKA_BROKER = os.environ['KAFKA_BROKER'] +API_MAIN_URL = os.environ['API_MAIN_URL'] +API_BRANCH_URL = os.environ['API_BRANCH_URL'] TOPIC = 'test-topic' producer = Producer({'bootstrap.servers': KAFKA_BROKER}) From 209d6382c326d04a582874ba78a91a708f90f628 Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:51:36 -0400 Subject: [PATCH 3/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index 3e5912e..b7fc76e 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -11,13 +11,21 @@ jobs: image: confluentinc/cp-zookeeper:latest ports: - 2181:2181 + environment: + ZOOKEEPER_SERVER_ID: 1 + ZOOKEEPER_CLIENT_PORT: 2181 + ZOOKEEPER_TICK_TIME: 2000 + kafka: image: confluentinc/cp-kafka:latest ports: - 9092:9092 env: - KAFKA_ADVERTISED_HOST_NAME: localhost + KAFKA_BROKER_ID: 1 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092 + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 steps: - name: Checkout PR branch From c363c3c3e071e7906f6409464558565c1884a149 Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:53:21 -0400 Subject: [PATCH 4/9] Edit kafka container --- compare/kafka_comparator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compare/kafka_comparator.py b/compare/kafka_comparator.py index 7bd762f..bf4ae57 100644 --- a/compare/kafka_comparator.py +++ b/compare/kafka_comparator.py @@ -37,4 +37,5 @@ def send_test_message(payload): print("Branch:", branch_resp) exit(1) else: - print("Respostas iguais.") \ No newline at end of file + print("Respostas iguais.") + print("TESTEEE") \ No newline at end of file From 87592b4683c51e09d76ab5e065da46a0aad4c88f Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:53:48 -0400 Subject: [PATCH 5/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index b7fc76e..c3226d7 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -1,7 +1,7 @@ name: Compare API Responses via Kafka on: - pull_request: + pull_request jobs: compare: From d3c681bb2429837057d50715c46fd4177aee6049 Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 11:54:23 -0400 Subject: [PATCH 6/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index c3226d7..c86f631 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -1,7 +1,7 @@ name: Compare API Responses via Kafka on: - pull_request + pull_request: jobs: compare: @@ -11,7 +11,7 @@ jobs: image: confluentinc/cp-zookeeper:latest ports: - 2181:2181 - environment: + env: ZOOKEEPER_SERVER_ID: 1 ZOOKEEPER_CLIENT_PORT: 2181 ZOOKEEPER_TICK_TIME: 2000 From ec6246f26622a46b24eb5aec83bbb193ea93bf20 Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 12:00:08 -0400 Subject: [PATCH 7/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index c86f631..447b6cb 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -8,6 +8,7 @@ jobs: runs-on: ubuntu-latest services: zookeeper: + container_name: zookeeper image: confluentinc/cp-zookeeper:latest ports: - 2181:2181 @@ -17,6 +18,7 @@ jobs: ZOOKEEPER_TICK_TIME: 2000 kafka: + container_name: broker-kafka image: confluentinc/cp-kafka:latest ports: - 9092:9092 @@ -55,6 +57,6 @@ jobs: - name: Run Kafka test comparator run: python pr_branch/compare/kafka_comparator.py env: - KAFKA_BROKER: localhost:9092 - API_MAIN_URL: http://localhost:8001 # ajuste a porta se necessário - API_BRANCH_URL: http://localhost:8002 # ajuste a porta se \ No newline at end of file + KAFKA_BROKER: broker-kafka:9092 + API_MAIN_URL: http://api-main:8001 # ajuste a porta se necessário + API_BRANCH_URL: http://api-pr:8002 # ajuste a porta se \ No newline at end of file From d35ed07db9e943a6a8fab4b0bbdd135ef2a54f31 Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 12:02:08 -0400 Subject: [PATCH 8/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index 447b6cb..2983e98 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -8,7 +8,6 @@ jobs: runs-on: ubuntu-latest services: zookeeper: - container_name: zookeeper image: confluentinc/cp-zookeeper:latest ports: - 2181:2181 @@ -18,7 +17,6 @@ jobs: ZOOKEEPER_TICK_TIME: 2000 kafka: - container_name: broker-kafka image: confluentinc/cp-kafka:latest ports: - 9092:9092 @@ -57,6 +55,6 @@ jobs: - name: Run Kafka test comparator run: python pr_branch/compare/kafka_comparator.py env: - KAFKA_BROKER: broker-kafka:9092 + KAFKA_BROKER: kafka:9092 API_MAIN_URL: http://api-main:8001 # ajuste a porta se necessário API_BRANCH_URL: http://api-pr:8002 # ajuste a porta se \ No newline at end of file From ad9180533b9796a96a37443690b72f39f15c9a4d Mon Sep 17 00:00:00 2001 From: eulucaslim Date: Sat, 14 Jun 2025 12:06:46 -0400 Subject: [PATCH 9/9] Edit kafka container --- .github/workflows/compare-branchs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-branchs.yml b/.github/workflows/compare-branchs.yml index 2983e98..016b1f7 100644 --- a/.github/workflows/compare-branchs.yml +++ b/.github/workflows/compare-branchs.yml @@ -55,6 +55,6 @@ jobs: - name: Run Kafka test comparator run: python pr_branch/compare/kafka_comparator.py env: - KAFKA_BROKER: kafka:9092 + KAFKA_BROKER: 0.0.0.0:9092 API_MAIN_URL: http://api-main:8001 # ajuste a porta se necessário API_BRANCH_URL: http://api-pr:8002 # ajuste a porta se \ No newline at end of file