Bump Openresty to 1.15.8.1 version

.circleci/config.yml

@@ -109,12 +109,12 @@ executors:
     environment:
       S2I_VERSION: "1.1.12-2a783420"
       DOCKER_COMPOSE_VERSION: "1.16.1"
-      OPENRESTY_VERSION: "1.13.6.2-2"
+      OPENRESTY_VERSION: "1.15.8.1-0"
 
   openresty:
     working_directory: /opt/app-root/apicast
     docker:
-    - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.2-2
+    - image: quay.io/3scale/s2i-openresty-centos7:1.15.8.1-0
     - image: redis:3.2.8-alpine
     environment:
       TEST_NGINX_BINARY: openresty

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added `APICAST_PATH_ROUTING_ONLY` variable that allows to perform path-based routing without falling back to the default host-based routing [PR #1035](https://github.com/3scale/APIcast/pull/1035), [THREESCALE-1150](https://issues.jboss.org/browse/THREESCALE-1150)
 - Added the option to manage access based on method on Keycloak Policy. [THREESCALE-2236](https://issues.jboss.org/browse/THREESCALE-2236) [PR #1039](https://github.com/3scale/APIcast/pull/1039)
 - The Rate Limit policy now supports conditions defined with the "matches" operation. [PR #1051](https://github.com/3scale/APIcast/pull/1051), [THREESCALE-2590](https://issues.jboss.org/browse/THREESCALE-2590)
+- Upgrade OpenResty to 1.15.8.1 release.[PR #1049](https://github.com/3scale/APIcast/pull/1049), [THREESCALE-2200](https://issues.jboss.org/browse/THREESCALE-2200)
 
 ### Fixed
 

bin/busted.lua

@@ -1,3 +1,8 @@
+-- Clean warning on openresty 1.15.8.1, where some global variables are set
+-- using ngx.timer that triggers an invalid warning message.
+-- Code related: https://github.com/openresty/lua-nginx-module/blob/61e4d0aac8974b8fad1b5b93d0d3d694d257d328/src/ngx_http_lua_util.c#L795-L839
+getmetatable(_G).__newindex = nil
+
 if ngx ~= nil then
   ngx.exit = function()end
 end

gateway/src/apicast/executor.lua

@@ -38,7 +38,11 @@ local function build_context(executor)
 end
 
 local function shared_build_context(executor)
-    local ctx = ngx.ctx or {}
+    local ok, ctx = pcall(function() return ngx.ctx end)
+    if not ok then
+      ctx = {}
+    end
+
     local context = ctx.context
 
     if not context then

spec/resty/openssl/bio_spec.lua

@@ -24,8 +24,7 @@ describe('OpenSSL BIO', function()
 
     it('requires non empty string', function()
       local bio = _M.new()
-
-      assert.has_error(function () bio:write('') end, 'expected value, got nil')
+      assert.same(bio:write(""), 0)
     end)
   end)
 

t/management.t

@@ -277,8 +277,11 @@ init_by_lua_block {
 GET /dns/cache
 --- response_headers
 Content-Type: application/json; charset=utf-8
---- response_body
-{"127.0.0.1.xip.io":{"value":{"1":{"address":"127.0.0.1","class":1,"ttl":199,"name":"127.0.0.1.xip.io","section":1,"type":1},"ttl":199,"name":"127.0.0.1.xip.io"},"expires_in":199}}
+--- expected_response_body_like_multiple eval
+[[
+    qr/"name":"127.0.0.1.xip.io"/,
+    qr/\{"127.0.0.1.xip.io":\{"value":{"1":{"address":"127.0.0.1","class":1,"ttl":199/,
+]]
 --- no_error_log
 [error]
 

t/policies.pl

@@ -71,3 +71,39 @@
 };
 
 add_response_body_check($expect_json);
+
+# This response body helper function check is like a response_body_like but it
+# can be used with multiple values for a single request.
+#
+# An usage example can be like this:
+# --- expected_response_body_like_multiple eval
+# [
+# qr/.*/,
+# qr/[0-9]*/,
+# [
+#     qr/^a.*/,
+#     qr/Z$/
+# ]]
+#
+# Where the third request will validate that starts with a and finish with Z.
+add_response_body_check(sub {
+    my ($block, $body, $req_idx, $repeated_req_idx, $dry_run) = @_;
+
+    if (!$block->expected_response_body_like_multiple) {
+        return "";
+    }
+
+    my @asserts = @{$block->{expected_response_body_like_multiple}};
+    my $assertValues = ${asserts}[0][$req_idx];
+    if (ref(${assertValues}) eq 'ARRAY') {
+        foreach my $regexp(@{$assertValues}){
+            if (!($body =~ m/$regexp/)) {
+                fail(sprintf("Regular expression: '%s' does not match with the body: \n %s",$regexp, $body));
+            }
+        }
+    }else{
+        if (!($body =~ m/$assertValues/)) {
+            fail(sprintf("Regular expression: '%s' does not match with the body: \n %s",$assertValues, $body));
+        }
+    }
+});

t/prometheus-metrics.t

@@ -1,46 +1,7 @@
 use lib 't';
 use Test::APIcast::Blackbox 'no_plan';
 
-# This response body helper function check is like a response_body_like but it
-# can be used with multiple values for a single request. 
-
-# The reason to make this helper function is to make sure that multiple regexp
-# can be used with the same body to validate that everything is working as
-# expected.
-#
-# An usage example can be like this:
-# --- expected_response_body_like_multiple eval
-# [
-# qr/.*/,
-# qr/[0-9]*/,
-# [
-#     qr/^a.*/,
-#     qr/Z$/
-# ]]
-#
-# Where the third request will validate that starts with a and finish with Z. 
-add_response_body_check(sub {
-    my ($block, $body, $req_idx, $repeated_req_idx, $dry_run) = @_;
-
-    if (!$block->expected_response_body_like_multiple) {
-        return "";
-    }
-
-    my @asserts = @{$block->{expected_response_body_like_multiple}};
-    my $assertValues = ${asserts}[0][$req_idx];
-    if (ref(${assertValues}) eq 'ARRAY') {
-        foreach my $regexp(@{$assertValues}){
-            if (!($body =~ m/$regexp/)) {
-                fail(sprintf("Regular expression: '%s' does not match with the body: \n %s",$regexp, $body));
-            }
-        }
-    }else{
-        if (!($body =~ m/$assertValues/)) {
-            fail(sprintf("Regular expression: '%s' does not match with the body: \n %s",$assertValues, $body));
-        }
-    }
-});
-
+require("t/policies.pl");
 # The output varies between requests, so run only once
 repeat_each(1);