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.

Sign up for GitHub

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

OpenResty 1.13.6.2 #733

Merged
merged 5 commits into from
Jun 11, 2018
+5 −7
Merged

OpenResty 1.13.6.2 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ee4ddb
[management] fix policies API
mikz Jun 7, 2018
63276af
[ci] print TAP output of prove
mikz Jun 4, 2018
9fa7fae
[rover] update lua-resty-jwt to support OpenSSL 1.1
mikz Jun 4, 2018
b2d1769
[ci] use OpenResty 1.13.6.2
mikz May 30, 2018
423c3e6
[changelog] upgraded OpenResty
mikz Jun 11, 2018
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
s2i-image: &s2i-image
image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover12
image: quay.io/3scale/s2i-openresty-centos7:1.13.6.2-1
environment:
TEST_NGINX_BINARY: openresty
LUA_BIN_PATH: /opt/app-root/bin
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
environment:
S2I_VERSION: "1.1.9a-40ad911d"
DOCKER_COMPOSE_VERSION: "1.16.1"
OPENRESTY_VERSION: "1.13.6.1-rover12"
OPENRESTY_VERSION: "1.13.6.2-1"
steps:
- <<: *setup-docker
- run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- `THREESCALE_PORTAL_ENDPOINT` and `THREESCALE_CONFIG_FILE` are not required anymore [PR #702](https://github.com/3scale/apicast/pull/702)
- The `scope` of the Rate Limit policy is `service` by default [PR #704](https://github.com/3scale/apicast/pull/704)
- Decoded JWTs are now exposed in the policies context by the APIcast policy [PR #718](https://github.com/3scale/apicast/pull/718)
- Upgraded OpenResty to 1.13.6.2, uses OpenSSL 1.1 [PR #733](https://github.com/3scale/apicast/pull/733)

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ prove: HARNESS ?= TAP::Harness
prove: PROVE_FILES ?= $(call prove-files)
prove: export TEST_NGINX_RANDOMIZE=1
prove: $(ROVER) nginx ## Test nginx
$(ROVER) exec script/prove -j$(NPROC) --harness=$(HARNESS) $(PROVE_FILES)
$(ROVER) exec script/prove --verbose -j$(NPROC) --harness=$(HARNESS) $(PROVE_FILES)

prove-docker: apicast-source
prove-docker: export IMAGE_NAME ?= apicast-test
Expand Down
2 changes: 1 addition & 1 deletion gateway/Roverfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lua-resty-env 0.4.0-1||production
lua-resty-execvp 0.1.1-1||production
lua-resty-http 0.12-0||production
lua-resty-iputils 0.3.0-1||development
lua-resty-jwt 0.1.11-0||production
lua-resty-jwt 0.2.0-0||production
lua-resty-repl 0.0.6-0||development
lua-resty-url 0.2.0-1||production
lua-term 0.7-1||testing
Expand Down
3 changes: 0 additions & 3 deletions gateway/src/apicast/management.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ local resolver_cache = require('resty.resolver.cache')
local env = require('resty.env')
local policy_manifests_loader = require('apicast.policy_manifests_loader')

local setmetatable = setmetatable

local live = { status = 'live', success = true }

local function json_response(body, status)
Expand Down Expand Up @@ -129,7 +127,6 @@ end

function _M.get_all_policy_manifests()
local manifests = policy_manifests_loader.get_all()
setmetatable(manifests, cjson.array_mt)
return json_response({ policies = manifests })
end

Expand Down