From 520b6282e1db9c1c6d411da82bec8b3e44447d2c Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Mon, 10 Jun 2019 16:54:17 +0530 Subject: [PATCH] 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 --- .../tests/AbstractDataflowTests.java | 18 ------------------ cloudfoundry/binder/rabbit/config.sh | 6 ++++++ cloudfoundry/binder/rabbit/env.properties | 4 ++-- kubernetes-common/binder/kafka/config.sh | 6 ++++++ kubernetes-common/binder/kafka/env.properties | 4 ++-- kubernetes-common/binder/rabbit/create.sh | 7 ++++++- kubernetes-common/binder/rabbit/env.properties | 4 ++-- local/binder/kafka/config.sh | 7 ++++++- local/binder/kafka/env.properties | 4 ++-- local/binder/rabbit/config.sh | 7 ++++++- local/binder/rabbit/env.properties | 4 ++-- run.sh | 4 ++-- 12 files changed, 42 insertions(+), 33 deletions(-) diff --git a/acceptance-tests/spring-cloud-dataflow-acceptance-tests/src/test/java/org/springframework/cloud/dataflow/acceptance/tests/AbstractDataflowTests.java b/acceptance-tests/spring-cloud-dataflow-acceptance-tests/src/test/java/org/springframework/cloud/dataflow/acceptance/tests/AbstractDataflowTests.java index 490ca687..cd4f51f8 100644 --- a/acceptance-tests/spring-cloud-dataflow-acceptance-tests/src/test/java/org/springframework/cloud/dataflow/acceptance/tests/AbstractDataflowTests.java +++ b/acceptance-tests/spring-cloud-dataflow-acceptance-tests/src/test/java/org/springframework/cloud/dataflow/acceptance/tests/AbstractDataflowTests.java @@ -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(); } @@ -75,21 +72,6 @@ protected static void assertSkipperServerRunning(DockerComposeInfo dockerCompose AssertUtils.assertSkipperServerRunning(url); } - protected static List 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 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 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"; diff --git a/cloudfoundry/binder/rabbit/config.sh b/cloudfoundry/binder/rabbit/config.sh index b65f0f93..ba01df98 100644 --- a/cloudfoundry/binder/rabbit/config.sh +++ b/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 diff --git a/cloudfoundry/binder/rabbit/env.properties b/cloudfoundry/binder/rabbit/env.properties index f5c0d762..1a4a261d 100644 --- a/cloudfoundry/binder/rabbit/env.properties +++ b/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 diff --git a/kubernetes-common/binder/kafka/config.sh b/kubernetes-common/binder/kafka/config.sh index 7a97ff5d..7e070723 100644 --- a/kubernetes-common/binder/kafka/config.sh +++ b/kubernetes-common/binder/kafka/config.sh @@ -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 diff --git a/kubernetes-common/binder/kafka/env.properties b/kubernetes-common/binder/kafka/env.properties index 3191370b..306ac54e 100644 --- a/kubernetes-common/binder/kafka/env.properties +++ b/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 diff --git a/kubernetes-common/binder/rabbit/create.sh b/kubernetes-common/binder/rabbit/create.sh index c537b29d..fc90a53e 100644 --- a/kubernetes-common/binder/rabbit/create.sh +++ b/kubernetes-common/binder/rabbit/create.sh @@ -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 diff --git a/kubernetes-common/binder/rabbit/env.properties b/kubernetes-common/binder/rabbit/env.properties index 006480f0..95e6ea1f 100644 --- a/kubernetes-common/binder/rabbit/env.properties +++ b/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 diff --git a/local/binder/kafka/config.sh b/local/binder/kafka/config.sh index 28b6dab9..62271c20 100644 --- a/local/binder/kafka/config.sh +++ b/local/binder/kafka/config.sh @@ -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" diff --git a/local/binder/kafka/env.properties b/local/binder/kafka/env.properties index a81d19e6..3f3fcaa2 100644 --- a/local/binder/kafka/env.properties +++ b/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 diff --git a/local/binder/rabbit/config.sh b/local/binder/rabbit/config.sh index 5df2633b..fb072d78 100644 --- a/local/binder/rabbit/config.sh +++ b/local/binder/rabbit/config.sh @@ -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" diff --git a/local/binder/rabbit/env.properties b/local/binder/rabbit/env.properties index f5c0d762..1a4a261d 100644 --- a/local/binder/rabbit/env.properties +++ b/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 diff --git a/run.sh b/run.sh index 0fc49e42..709e84d8 100755 --- a/run.sh +++ b/run.sh @@ -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/"