[apisix] branch master updated: feat: support skywalking 8.7 (#5139)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d7dfdd  feat: support skywalking 8.7 (#5139)
7d7dfdd is described below

commit 7d7dfdd22e977c53f384a96905f52d366b785a41
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Mon Sep 27 21:07:31 2021 +0800

    feat: support skywalking 8.7 (#5139)
---
 ci/install-ext-services-via-docker.sh |  2 +-
 rockspec/apisix-master-0.rockspec     |  2 +-
 t/plugin/skywalking.t                 | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ci/install-ext-services-via-docker.sh b/ci/install-ext-services-via-docker.sh
index 612d0b7..14aa9ee 100755
--- a/ci/install-ext-services-via-docker.sh
+++ b/ci/install-ext-services-via-docker.sh
@@ -33,7 +33,7 @@ docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh --create --z
 docker exec -i kafka-server2 /opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
 
 # start skywalking
-docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 12800:12800 apache/skywalking-oap-server:8.3.0-es6
+docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 12800:12800 apache/skywalking-oap-server:8.7.0-es6
 # start consul servers
 docker run --rm --name consul_1 -d -p 8500:8500 consul:1.7 consul agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info -data-dir=/consul/data
 docker run --rm --name consul_2 -d -p 8600:8500 consul:1.7 consul agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info -data-dir=/consul/data
diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
index 008f326..d81a2de 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -55,7 +55,7 @@ dependencies = {
     "lua-resty-ipmatcher = 0.6.1",
     "lua-resty-kafka = 0.07",
     "lua-resty-logger-socket = 2.0-0",
-    "skywalking-nginx-lua = 0.4-1",
+    "skywalking-nginx-lua = 0.5.0",
     "base64 = 1.5-2",
     "binaryheap = 0.4",
     "dkjson = 2.5-2",
diff --git a/t/plugin/skywalking.t b/t/plugin/skywalking.t
index 5c5f03f..f9ef219 100644
--- a/t/plugin/skywalking.t
+++ b/t/plugin/skywalking.t
@@ -474,3 +474,25 @@ qr/skywalking run \w+/
 skywalking run start
 skywalking run finish
 skywalking run prepareForReport
+
+
+
+=== TEST 13: delete global rule
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/global_rules/1', ngx.HTTP_DELETE)
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]