Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update app import URIs to use the latest
 - dataflow.spring.io redirects
 - Remove unused app registration usages
 - update for local, CF and K8s environment properties for Kafka/RabbitMQ binders

Resolves #205

Address review comments
  • Loading branch information
ilayaperumalg committed Jun 18, 2019
1 parent 82e35b9 commit 520b628
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 33 deletions.
Expand Up @@ -33,9 +33,6 @@

public abstract class AbstractDataflowTests {

private final static String STREAM_APPS_URI = "https://repo.spring.io/libs-release-local/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/Celsius.SR3/spring-cloud-stream-app-descriptor-Celsius.SR3.stream-apps-rabbit-maven";
private final static String TASK_APPS_URI = "https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/Elston.RELEASE/spring-cloud-task-app-descriptor-Elston.RELEASE.task-apps-maven";

protected static void start(DockerComposeInfo dockerComposeInfo, String id) {
dockerComposeInfo.id(id).start();
}
Expand Down Expand Up @@ -75,21 +72,6 @@ protected static void assertSkipperServerRunning(DockerComposeInfo dockerCompose
AssertUtils.assertSkipperServerRunning(url);
}

protected static List<String> registerApps(DockerComposeInfo dockerComposeInfo, String id, String container) {
DockerPort port = dockerComposeInfo.id(id).getRule().containers().container(container).port(9393);
String url = "http://" + port.getIp() + ":" + port.getExternalPort() + "/apps";
RestTemplate template = new RestTemplate();

MultiValueMap<String, Object> values = new LinkedMultiValueMap<>();
values.add("uri", STREAM_APPS_URI);
template.postForLocation(url, values);
values = new LinkedMultiValueMap<>();
values.add("uri", TASK_APPS_URI);
template.postForLocation(url, values);

return registeredApps(dockerComposeInfo, id, container);
}

protected static List<String> registeredApps(DockerComposeInfo dockerComposeInfo, String id, String container) {
DockerPort port = dockerComposeInfo.id(id).getRule().containers().container(container).port(9393);
String url = "http://" + port.getIp() + ":" + port.getExternalPort() + "/apps";
Expand Down
6 changes: 6 additions & 0 deletions cloudfoundry/binder/rabbit/config.sh
@@ -1,3 +1,9 @@
#!/usr/bin/env bash

load_file "$PWD/env.properties"
if [[ $STREAM_APPS_VERSION == *"latest"* ]]; then
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/rabbitmq-maven-latest
fi
if [[ $TASKS_VERSION == *"latest"* ]]; then
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/task-maven-latest
fi
4 changes: 2 additions & 2 deletions cloudfoundry/binder/rabbit/env.properties
@@ -1,2 +1,2 @@
STREAM_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/$STREAM_APPS_VERSION/spring-cloud-stream-app-descriptor-$STREAM_APPS_VERSION.stream-apps-rabbit-maven
TASK_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/$TASKS_VERSION/spring-cloud-task-app-descriptor-$TASKS_VERSION.task-apps-maven
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/$STREAM_APPS_VERSION-stream-applications-rabbit-maven
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/$TASKS_VERSION-task-applications-maven
6 changes: 6 additions & 0 deletions kubernetes-common/binder/kafka/config.sh
Expand Up @@ -3,3 +3,9 @@
set -o errexit

load_file "$PWD/env.properties"
if [[ $STREAM_APPS_VERSION == *"latest"* ]]; then
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/kafka-docker-latest
fi
if [[ $TASKS_VERSION == *"latest"* ]]; then
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/task-docker-latest
fi
4 changes: 2 additions & 2 deletions kubernetes-common/binder/kafka/env.properties
@@ -1,2 +1,2 @@
STREAM_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/$STREAM_APPS_VERSION/spring-cloud-stream-app-descriptor-$STREAM_APPS_VERSION.stream-apps-$STREAM_APPS_KAFKA_ARTIFACT_NAME-docker
TASK_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/$TASKS_VERSION/spring-cloud-task-app-descriptor-$TASKS_VERSION.task-apps-docker
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/$STREAM_APPS_VERSION-stream-applications-kafka-docker
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/$TASKS_VERSION-task-applications-docker
7 changes: 6 additions & 1 deletion kubernetes-common/binder/rabbit/create.sh
Expand Up @@ -3,5 +3,10 @@
set -o errexit

load_file "$PWD/env.properties"

if [[ $STREAM_APPS_VERSION == *"latest"* ]]; then
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/rabbitmq-docker-latest
fi
if [[ $TASKS_VERSION == *"latest"* ]]; then
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/task-docker-latest
fi
kubectl create -f rabbitmq.yml --namespace $KUBERNETES_NAMESPACE
4 changes: 2 additions & 2 deletions kubernetes-common/binder/rabbit/env.properties
@@ -1,2 +1,2 @@
STREAM_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/$STREAM_APPS_VERSION/spring-cloud-stream-app-descriptor-$STREAM_APPS_VERSION.stream-apps-rabbit-docker
TASK_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/$TASKS_VERSION/spring-cloud-task-app-descriptor-$TASKS_VERSION.task-apps-docker
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/$STREAM_APPS_VERSION-stream-applications-rabbit-docker
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/$TASKS_VERSION-task-applications-docker
7 changes: 6 additions & 1 deletion local/binder/kafka/config.sh
Expand Up @@ -3,5 +3,10 @@
source ../../common.sh

load_file "$PWD/env.properties"

if [[ $STREAM_APPS_VERSION == *"latest"* ]]; then
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/kafka-maven-latest
fi
if [[ $TASKS_VERSION == *"latest"* ]]; then
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/task-maven-latest
fi
APPLICATION_ARGS="$APPLICATION_ARGS --spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.binder.brokers=$SERVICE_HOST --spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.binder.zkNodes=$SERVICE_HOST"
4 changes: 2 additions & 2 deletions local/binder/kafka/env.properties
@@ -1,2 +1,2 @@
STREAM_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/$STREAM_APPS_VERSION/spring-cloud-stream-app-descriptor-$STREAM_APPS_VERSION.stream-apps-$STREAM_APPS_KAFKA_ARTIFACT_NAME-maven
TASK_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/$TASKS_VERSION/spring-cloud-task-app-descriptor-$TASKS_VERSION.task-apps-maven
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/$STREAM_APPS_VERSION-stream-applications-kafka-maven
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/$TASKS_VERSION-task-applications-maven
7 changes: 6 additions & 1 deletion local/binder/rabbit/config.sh
Expand Up @@ -3,5 +3,10 @@
source ../../common.sh

load_file "$PWD/env.properties"

if [[ $STREAM_APPS_VERSION == *"latest"* ]]; then
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/rabbitmq-maven-latest
fi
if [[ $TASKS_VERSION == *"latest"* ]]; then
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/task-maven-latest
fi
APPLICATION_ARGS="$APPLICATION_ARGS --spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.host=$SERVICE_HOST"
4 changes: 2 additions & 2 deletions local/binder/rabbit/env.properties
@@ -1,2 +1,2 @@
STREAM_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/$STREAM_APPS_VERSION/spring-cloud-stream-app-descriptor-$STREAM_APPS_VERSION.stream-apps-rabbit-maven
TASK_REGISTRATION_RESOURCE=https://repo.spring.io/libs-release/org/springframework/cloud/task/app/spring-cloud-task-app-descriptor/$TASKS_VERSION/spring-cloud-task-app-descriptor-$TASKS_VERSION.task-apps-maven
STREAM_REGISTRATION_RESOURCE=https://dataflow.spring.io/$STREAM_APPS_VERSION-stream-applications-rabbit-maven
TASK_REGISTRATION_RESOURCE=https://dataflow.spring.io/$TASKS_VERSION-task-applications-maven
4 changes: 2 additions & 2 deletions run.sh
Expand Up @@ -333,8 +333,8 @@ done
# ======================================= DEFAULTS ============================================
[[ -z "${PLATFORM}" ]] && PLATFORM=local
[[ -z "${BINDER}" ]] && BINDER=rabbit
[[ -z "${STREAM_APPS_VERSION}" ]] && STREAM_APPS_VERSION=Celsius.SR3
[[ -z "${TASKS_VERSION}" ]] && TASKS_VERSION=Elston.RELEASE
[[ -z "${STREAM_APPS_VERSION}" ]] && STREAM_APPS_VERSION=latest
[[ -z "${TASKS_VERSION}" ]] && TASKS_VERSION=latest
WAIT_TIME="${WAIT_TIME:-5}"
RETRIES="${RETRIES:-60}"
JAVA_PATH_TO_BIN="${JAVA_HOME}/bin/"
Expand Down

0 comments on commit 520b628

Please sign in to comment.