Skip to content

Commit

Permalink
Prepare the release of Otoroshi version 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieuancelin committed Mar 19, 2018
1 parent 92ba5d1 commit 43d2c06
Show file tree
Hide file tree
Showing 76 changed files with 450 additions and 203 deletions.
2 changes: 1 addition & 1 deletion clients/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Mathieu <[email protected]>"]
license = "ASL-2.0"
name = "otoroshi-cli"
readme = "readme.md"
version = "1.0.3"
version = "1.1.0"

[[bin]]
name = "otoroshicli"
Expand Down
2 changes: 1 addition & 1 deletion clients/cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ fn main() {
}.unwrap();

let app = App::new("otoroshicli")
.version("1.0.3")
.version("1.1.0")
.author("Mathieu ANCELIN <[email protected]>")
.about(
r#" ____ __________ ____ ____ _____ __ ______ ________ ____
Expand Down
5 changes: 2 additions & 3 deletions clients/demo/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ if (action === 'server') {
app.get('/*', (req, res) => res.status(200).send({ message: `Hello from ${name}`, name }));
app.listen(port, () => console.log(`serving API with name '${name}' on http://0.0.0.0:${port}`));
} else if (action === 'injector') {

const host = String(argv.host || 'api.foo.bar');
const location = String(argv.location || '127.0.0.1:8080');
const clientId = String(argv.clientId || '--');
Expand All @@ -75,8 +74,8 @@ if (action === 'server') {
return fetch(`http://${location}/`, {
method: 'GET',
headers: {
'Host': host,
'Accept': 'application/json',
Host: host,
Accept: 'application/json',
'Otoroshi-Client-Id': clientId || '--',
'Otoroshi-Client-Secret': clientSecret || '--',
},
Expand Down
2 changes: 1 addition & 1 deletion docker/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apk update \
&& apk upgrade \
&& apk add bash \
&& unzip ./otoroshi-dist.zip \
&& mv otoroshi-1.0.3 otoroshi \
&& mv otoroshi-1.1.0 otoroshi \
&& chmod +x otoroshi/bin/otoroshi \
&& mkdir otoroshi/leveldb \
&& mkdir otoroshi/imports
Expand Down
4 changes: 2 additions & 2 deletions docker/demo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COPY . /usr/otoroshi

RUN apt-get update -y \
&& apt-get install -y curl \
&& wget https://dl.bintray.com/maif/binaries/otoroshi.jar/1.0.3/otoroshi.jar \
&& wget https://dl.bintray.com/maif/binaries/linux-otoroshicli/1.0.3/otoroshicli \
&& wget https://dl.bintray.com/maif/binaries/otoroshi.jar/1.1.0/otoroshi.jar \
&& wget https://dl.bintray.com/maif/binaries/linux-otoroshicli/1.1.0/otoroshicli \
&& chmod +x otoroshicli

CMD [""]
4 changes: 2 additions & 2 deletions docs/manual/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/archi.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
12 changes: 6 additions & 6 deletions docs/manual/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -217,18 +217,18 @@ <h1><a href="#rust-cli" name="rust-cli" class="anchor"><span class="anchor-link"
<p>Otoroshi provides a command line tool to command Otoroshi instances.</p>
<h2><a href="#download" name="download" class="anchor"><span class="anchor-link"></span></a>Download</h2>
<p>First, download the Otoroshi CLI depending on your operating system :</p>
<pre class="prettyprint"><code class="language-sh">wget -q --show-progress https://dl.bintray.com/maif/binaries/linux-otoroshicli/1.0.2/otoroshicli
<pre class="prettyprint"><code class="language-sh">wget -q --show-progress https://dl.bintray.com/maif/binaries/linux-otoroshicli/1.1.0/otoroshicli
# or if you use linux
wget -q --show-progress https://dl.bintray.com/maif/binaries/mac-otoroshicli/1.0.2/otoroshicli
wget -q --show-progress https://dl.bintray.com/maif/binaries/mac-otoroshicli/1.1.0/otoroshicli
# or if you use windows
wget -q --show-progress https://dl.bintray.com/maif/binaries/win-otoroshicli/1.0.2/otoroshicli.exe
wget -q --show-progress https://dl.bintray.com/maif/binaries/win-otoroshicli/1.1.0/otoroshicli.exe
</code></pre>
<h2><a href="#usage" name="usage" class="anchor"><span class="anchor-link"></span></a>Usage</h2>
<p>The documentation is not written yet, but you can explore the cli usage using the help flag <code>-h</code></p>
<p>You can read more about it <a href="https://github.com/MAIF/otoroshi/tree/master/clients/cli">here</a>.</p>
<pre><code>$ otoroshicli -h

otoroshicli 1.0.2
otoroshicli 1.1.0
____ __________ ____ ____ _____ __ ______ ________ ____
/ __ \/_ __/ __ \/ __ \/ __ \/ ___// / / / _/ / ____/ / / _/
/ / / / / / / / / / /_/ / / / /\__ \/ /_/ // /_____/ / / / / /
Expand Down
12 changes: 11 additions & 1 deletion docs/manual/code/swagger.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
"version" : "1.0.2",
"version" : "1.1.0",
"title" : "Otoroshi Admin API",
"description" : "Admin API of the Otoroshi reverse proxy",
"contact" : {
Expand Down Expand Up @@ -2789,6 +2789,11 @@
"example" : true,
"description" : "When enabled, Otoroshi will try to exchange headers with downstream service to ensure no one else can use the service from outside"
},
"sendOtoroshiHeadersBack" : {
"type" : "boolean",
"example" : true,
"description" : "When enabled, Otoroshi will send headers to consumer like request id, client latency, overhead, etc ..."
},
"secComExcludedPatterns" : {
"type" : "array",
"items" : {
Expand Down Expand Up @@ -3171,6 +3176,11 @@
"example" : true,
"description" : "When enabled, Otoroshi will try to exchange headers with downstream service to ensure no one else can use the service from outside"
},
"sendOtoroshiHeadersBack" : {
"type" : "boolean",
"example" : true,
"description" : "When enabled, Otoroshi will send headers to consumer like request id, client latency, overhead, etc ..."
},
"secComExcludedPatterns" : {
"type" : "array",
"items" : {
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/connectors/clevercloud.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/connectors/elastic.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/connectors/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/connectors/kubernetes.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/connectors/rancher.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/deploy/clevercloud.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/deploy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/deploy/other.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/deploy/scaling.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/features.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down Expand Up @@ -127,7 +127,7 @@
<span class="home-icon"></span>Otoroshi
</a>
<div class="version-number">
1.0.2
1.1.0
</div>
</div>
<div class="nav-toc">
Expand Down
Loading

0 comments on commit 43d2c06

Please sign in to comment.