SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Stub Runner, fixes #64

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-23 16:53:36 +02:00
parent 6b83f5d86a
commit 5c34b170f4
14 changed files with 229 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -1,11 +0,0 @@
sudo: false
cache:
directories:
- $HOME/.m2
language: java
jdk: # TODO: should work with java 1.7
- oraclejdk8
install:
- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true
script:
- './mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true'

18
docs/src/main/asciidoc/spring-cloud-cli.adoc
View File

@@ -21,7 +21,7 @@ of services just `spring cloud`. To choose the services to deploy,
just list them on the command line, e.g.
----
$ spring cloud eureka configserver h2 kafka zipkin
$ spring cloud eureka configserver h2 kafka stubrunner zipkin
----
Summary of supported deployables:
@@ -50,6 +50,9 @@ Summary of supported deployables:
|zipkin | Zipkin Server | http://localhost:9411
| Zipkin Server with UI for visualizing traces. Stores span data in memory and accepts them via HTTP POST of JSON data.
|stubrunner | Stub Runner Boot | http://localhost:8750
| Downloads WireMock stubs, starts WireMock and feeds the started servers with stored stubs. Pass `stubrunner.ids` to pass stub coordinates and then go to `http://localhost:8750/stubs`.
|===
Each of these apps can be configured using a local YAML file with the same name (in the current
@@ -69,6 +72,17 @@ spring:
uri: file://${user.home}/dev/demo/config-repo
----
E.g. in Stub Runner app you could fetch stubs from your local `.m2` in the following way.
.stubrunner.yml
[source,yaml,indent=0]
----
stubrunner:
workOffline: true
ids:
- com.example:beer-api-producer:+:9876
----
=== Adding Additional Applications
Additional applications can be added to `./config/cloud.yml` (not
@@ -94,7 +108,7 @@ when you list the apps:
[source]
----
$ spring cloud --list
source sink configserver dataflow eureka h2 hystrixdashboard kafka zipkin
source sink configserver dataflow eureka h2 hystrixdashboard kafka stubrunner zipkin
----
(notice the additional apps at the start of the list).

6
spring-cloud-cli-integration-tests/samples/stubrunner.groovy Normal file
View File

@@ -0,0 +1,6 @@
package org.test
@EnableStubRunnerServer
class Example {
}

7
spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java
View File

@@ -76,4 +76,11 @@ public class SampleIntegrationTests {
output.contains("[/routes || /routes.json],methods=[GET]"));
}
@Test
public void stubRunnerSample() throws Exception {
String output = this.cli.run("stubrunner.groovy");
assertTrue("Wrong output: " + output,
output.contains("[/stubs],produces=[application/json]"));
}
}

48
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StubRunnerCompilerAutoConfiguration.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* Copyright 2013-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.cli.compiler;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.boot.cli.compiler.DependencyCustomizer;
/**
* @author Marcin Grzejszczak
*
*/
public class StubRunnerCompilerAutoConfiguration extends CompilerAutoConfiguration {
@Override
public boolean matches(ClassNode classNode) {
return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableStubRunnerServer");
}
@Override
public void applyDependencies(DependencyCustomizer dependencies) {
dependencies
.ifAnyMissingClasses("org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer")
.add("spring-cloud-starter-contract-stub-runner");
}
@Override
public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
imports.addImports("org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer");
}
}

1
spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
View File

@@ -8,4 +8,5 @@ org.springframework.cloud.cli.compiler.OAuth2LoadBalancedCompilerAutoConfigurati
org.springframework.cloud.cli.compiler.RibbonClientCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StreamKafkaCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StreamRabbitCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StubRunnerCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration

1
spring-cloud-launcher/pom.xml
View File

@@ -30,6 +30,7 @@
<module>spring-cloud-launcher-h2</module>
<module>spring-cloud-launcher-hystrixdashboard</module>
<module>spring-cloud-launcher-kafka</module>
<module>spring-cloud-launcher-stubrunner</module>
<module>spring-cloud-launcher-zipkin</module>
</modules>

15
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml
View File

@@ -79,6 +79,16 @@ spring:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
application-properties:
management.security.enabled: false
stubrunner:
coordinates: ${dt.pre}stubrunner:${dt.ver}
port: 8750
message: To see the registered stubs open http://localhost:8750/stubs
order: 0
properties:
spring.cloud.deployer.memory: ${dt.mem}
spring.cloud.deployer.local.javaOpts: ${dt.opts}
application-properties:
management.security.enabled: false
zipkin:
coordinates: ${dt.pre}zipkin:${dt.ver}
port: 9411
@@ -121,6 +131,11 @@ spring:
spring.cloud.deployer.thin.profile: rabbit
application-properties:
spring.cloud.bus.enabled: true
stubrunner:
properties:
spring.cloud.deployer.thin.profile: rabbit
application-properties:
spring.cloud.bus.enabled: true
zipkin:
properties:
spring.cloud.deployer.thin.profile: rabbit

43
spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.launcher</groupId>
<artifactId>spring-cloud-launcher-stubrunner</artifactId>
<packaging>jar</packaging>
<name>spring-cloud-launcher-stubrunner</name>
<description>Spring Cloud Launcher Stub Runner</description>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

32
spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/java/org/springframework/cloud/launcher/stubrunner/StubRunnerApplication.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Copyright 2013-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.launcher.stubrunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer;
/**
* @author Marcin Grzejszczak
*/
@EnableStubRunnerServer
@SpringBootApplication
public class StubRunnerApplication {
public static void main(String[] args) {
SpringApplication.run(StubRunnerApplication.class, args);
}
}

2
spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/META-INF/thin-rabbit.properties Normal file
View File

@@ -0,0 +1,2 @@
exclusions.spring-cloud-starter-bus-kafka: org.springframework.cloud:spring-cloud-starter-bus-kafka
dependencies.spring-cloud-starter-bus-amqp: org.springframework.cloud:spring-cloud-starter-bus-amqp

11
spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/application.yml Normal file
View File

@@ -0,0 +1,11 @@
spring:
application:
name: stubrunner
server:
port: 8750
info:
artifactId: "@project.artifactId@"
description: "@project.description@"
version: "@project.version@"

30
spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/launcher/application.yml Normal file
View File

@@ -0,0 +1,30 @@
info:
description: Spring Cloud Launcher
eureka:
client:
instance-info-replication-interval-seconds: 5
initial-instance-info-replication-interval-seconds: 5
serviceUrl:
defaultZone: http://localhost:8761/eureka/
endpoints:
restart:
enabled: true
ribbon:
ConnectTimeout: 3000
ReadTimeout: 60000
h2.datasource.url: jdbc:h2:tcp://localhost:9096/./target/test
#spring:
# datasource:
# url: ${h2.datasource.url}
logging:
level:
kafka: WARN
org.apache.zookeeper: WARN
org.apache.zookeeper.ClientCnxn: ERROR
org.apache.kafka: WARN
org.I0Itec: WARN

17
spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/test/java/org/springframework/cloud/launcher/stubrunner/DeployerApplicationTests.java Normal file
View File

@@ -0,0 +1,17 @@
package org.springframework.cloud.launcher.stubrunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class DeployerApplicationTests {
@Test
public void contextLoads() {
}
}