Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename test plugins & docker test environment #476

Merged
merged 2 commits into from
Oct 10, 2019
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
2 changes: 1 addition & 1 deletion docs/developer-guide/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ A plugin project can be started by using one of examples in `examples` submodule
* main/java/com/hotels/styx/ExamplePluginFactory.java - A class that implements
PluginFactory interface, responsible for instantiating the plugin.

Some additional examples can be found in `system-tests/example-styx-plugin` directory in a project repository.
Some additional examples can be found in `system-tests/styx-test-plugin` directory in a project repository.
There are examples of plugins providing simple examples of how to:
* perform a before action on a request - `loadtest.plugins.AsyncRequestContentDecoderPluginFactory`,
* perform an action response object - `loadtest.plugins.AsyncResponseContentDecoderPluginFactory`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ styxcore latest 9b65640de45b 31 minutes ago 343MB
Bootstrap the network:

```bash
$ docker-compose -f system-tests/docker-toxiproxy/docker-compose.yml up
$ docker-compose -f system-tests/docker-test-env/docker-compose.yml up
```


Expand All @@ -53,7 +53,7 @@ $ curl http://localhost:8474/proxies | jq
Applying toxics:

```bash
$ curl -v -X POST -H "Content-Type: application/json" -d @system-tests/docker-toxiproxy/toxiproxy/origin-latency.json http://localhost:8474/proxies/httpd-01/toxics
$ curl -v -X POST -H "Content-Type: application/json" -d @system-tests/docker-test-env/toxiproxy/origin-latency.json http://localhost:8474/proxies/httpd-01/toxics
```

Removing toxics:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -45,11 +45,11 @@ public static Path createTemporarySharedDirectoryForJars() throws IOException {
}

static Path examplePluginJarLocation() throws IOException {
return jarLocation("example-styx-plugin");
return jarLocation("styx-test-plugin");
}

static Path exampleDependencyJarLocation() throws IOException {
return jarLocation("example-styx-plugin-dependencies");
return jarLocation("styx-test-plugin-dependencies");
}

// module must be adjacent to e2e-suite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class PluginsPipelineSpec : FeatureSpec() {
val tempPluginsDir = createTempDir(suffix = "-${this.javaClass.simpleName}")
tempPluginsDir.deleteOnExit()

val plugin = jarLocation("example-styx-plugin")
val dependency = jarLocation("example-styx-plugin-dependencies")
val plugin = jarLocation("styx-test-plugin")
val dependency = jarLocation("styx-test-plugin-dependencies")

Files.copy(plugin, tempPluginsDir.resolve(plugin.fileName.toString()).toPath())
Files.copy(dependency, tempPluginsDir.resolve(dependency.fileName.toString()).toPath())
Expand Down
4 changes: 2 additions & 2 deletions system-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<name>Styx - System Tests</name>

<modules>
<module>example-styx-plugin-dependencies</module>
<module>example-styx-plugin</module>
<module>styx-test-plugin-dependencies</module>
<module>styx-test-plugin</module>
<module>e2e-testsupport</module>
<module>e2e-suite</module>
<module>example-backend-provider</module>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2018 Expedia Inc.
Copyright (C) 2013-2019 Expedia Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down