Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ jobs:
if: always()
run: |
sudo docker images
echo bitnamilegacy/kafka:latest version:
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnamilegacy/kafka:latest
echo apache/kafka:latest version:
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" apache/kafka:latest
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import io.openliberty.guides.models.SystemLoad;
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
Expand All @@ -73,8 +73,8 @@ public class InventoryServiceIT {
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

private static ConfluentKafkaContainer kafkaContainer =
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
private static KafkaContainer kafkaContainer =
new KafkaContainer("apache/kafka:latest")
.withListener("kafka:19092")
.withNetwork(network);

Expand Down
2 changes: 1 addition & 1 deletion finish/scripts/buildImages.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@ECHO Starting Scripts
@ECHO OFF

start /b docker pull bitnamilegacy/kafka:latest
start /b docker pull apache/kafka:latest

start /b docker build -q -t system:1.0-SNAPSHOT system\.
start /b docker build -q -t inventory:1.0-SNAPSHOT inventory\.
2 changes: 1 addition & 1 deletion finish/scripts/buildImages.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

echo Pull kafka images
docker pull -q bitnamilegacy/kafka:latest
docker pull -q apache/kafka:latest

echo Building images
docker build -t system:1.0-SNAPSHOT system/. &
Expand Down
16 changes: 8 additions & 8 deletions finish/scripts/startContainers.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
--hostname=kafka ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest

start /b docker run -d ^
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
Expand Down
28 changes: 14 additions & 14 deletions finish/scripts/startContainers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
--hostname=kafka \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
--hostname=kafka \
--network=$NETWORK \
--name=kafka \
--rm \
apache/kafka:latest

sleep 15

Expand All @@ -29,7 +29,7 @@ docker run -d \
--name=system \
--rm \
system:1.0-SNAPSHOT &

docker run -d \
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=$KAFKA_SERVER \
-e WLP_LOGGING_CONSOLE_LOGLEVEL=info \
Expand All @@ -38,5 +38,5 @@ docker run -d \
--name=inventory \
--rm \
inventory:1.0-SNAPSHOT &

wait
18 changes: 9 additions & 9 deletions finish/scripts/startKafka.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 ^
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
-p 9094:9094 ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest
18 changes: 9 additions & 9 deletions finish/scripts/startKafka.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ NETWORK=reactive-app
docker network create $NETWORK

docker run -d \
-e ALLOW_PLAINTEXT_LISTENER=yes \
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_CFG_NODE_ID=0 \
-e KAFKA_CFG_PROCESS_ROLES=controller,broker \
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_NODE_ID=0 \
-e KAFKA_PROCESS_ROLES=controller,broker \
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,LOCAL://:9094 \
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,LOCAL://localhost:9094 \
-e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,LOCAL:PLAINTEXT \
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 \
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER \
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
-p 9094:9094 \
--network=$NETWORK \
--name=kafka \
--rm \
bitnamilegacy/kafka:latest &
apache/kafka:latest &

wait
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;
import org.testcontainers.kafka.KafkaContainer;

import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
Expand Down Expand Up @@ -69,8 +69,8 @@ public class SystemServiceIT {
new ImageFromDockerfile("system:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

private static ConfluentKafkaContainer kafkaContainer =
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
private static KafkaContainer kafkaContainer =
new KafkaContainer("apache/kafka:latest")
.withListener("kafka:19092")
.withNetwork(network);

Expand Down
2 changes: 1 addition & 1 deletion scripts/testApp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euxo pipefail
./mvnw -ntp -pl system verify
./mvnw -ntp -pl inventory verify

docker pull -q "bitnamilegacy/kafka:latest"
docker pull -q "apache/kafka:latest"

./scripts/buildImages.sh
./scripts/startContainers.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,50 @@
// end::copyright[]
package it.io.openliberty.guides.inventory;

import java.util.Collections;
import java.util.List;
import java.time.Duration;
import java.math.BigDecimal;
import java.nio.file.Paths;
import java.util.Properties;
import java.net.Socket;

import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriBuilder;
import jakarta.ws.rs.client.ClientBuilder;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.testcontainers.containers.Network;
import java.math.BigDecimal;
import java.net.Socket;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
import java.util.Properties;

import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.ConsumerConfig;

import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.kafka.ConfluentKafkaContainer;

import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.kafka.KafkaContainer;

import io.openliberty.guides.models.SystemLoad;
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriBuilder;

@Testcontainers
public class InventoryServiceIT {
Expand All @@ -78,8 +73,8 @@ public class InventoryServiceIT {
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
.withDockerfile(Paths.get("./Dockerfile"));

private static ConfluentKafkaContainer kafkaContainer =
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
private static KafkaContainer kafkaContainer =
new KafkaContainer("apache/kafka:latest")
.withListener("kafka:19092")
.withNetwork(network);

Expand Down Expand Up @@ -207,7 +202,8 @@ public void testCpuUsage() throws InterruptedException {
Response response = client.getSystems();
List<Properties> systems =
response.readEntity(new GenericType<List<Properties>>() { });
assertEquals(200, response.getStatus(), "Response should be 200");
assertEquals(200, response.getStatus(),
"Response should be 200");
assertEquals(systems.size(), 1);
for (Properties system : systems) {
assertEquals(sl.hostname, system.get("hostname"),
Expand Down
2 changes: 1 addition & 1 deletion start/scripts/buildImages.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@ECHO Starting Scripts
@ECHO OFF

start /b docker pull bitnamilegacy/kafka:latest
start /b docker pull apache/kafka:latest

start /b docker build -q -t system:1.0-SNAPSHOT system\.
start /b docker build -q -t inventory:1.0-SNAPSHOT inventory\.
2 changes: 1 addition & 1 deletion start/scripts/buildImages.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

echo Pull kafka images
docker pull -q bitnamilegacy/kafka:latest
docker pull -q apache/kafka:latest

echo Building images
docker build -t system:1.0-SNAPSHOT system/. &
Expand Down
16 changes: 8 additions & 8 deletions start/scripts/startContainers.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ set NETWORK=reactive-app
docker network create %NETWORK%

docker run -d ^
-e ALLOW_PLAINTEXT_LISTENER=yes ^
-e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CFG_NODE_ID=0 ^
-e KAFKA_CFG_PROCESS_ROLES=controller,broker ^
-e KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_NODE_ID=0 ^
-e KAFKA_PROCESS_ROLES=controller,broker ^
-e KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093 ^
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 ^
-e KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 ^
-e KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER ^
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ^
--hostname=kafka ^
--network=%NETWORK% ^
--name=kafka ^
--rm ^
bitnamilegacy/kafka:latest
apache/kafka:latest

start /b docker run -d ^
-e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
Expand Down
Loading