[GitHub] [apisix-ingress-controller] ch4dwick commented on issue #1082: request help: Why does 'the enabling https redirect' redirect to the https scheme with the port 9443?

2023-08-04 Thread via GitHub


ch4dwick commented on issue #1082:
URL: 
https://github.com/apache/apisix-ingress-controller/issues/1082#issuecomment-1666402266

   > Why can't you just make this plugin to work with the default 443 https 
port out of the box? It's too difficult for newcomers like me to figure out how 
to get it working correctly even if you just throw the documentation here. It 
still looks too complicated for me to figure out where the `conf/config.yaml` 
file really is in my kubernetes cluster.
   
   Just want to share this.
   
   I've been fumbling around with this all week. Apparently, the configs for 
apisix are store in the configmaps. So you do this:
   > kubectl edit configmap -n  apisix-gateway
   > kubectl edit configmap -n  apisix
   
   I find that restarting the deployment is more reliable than just reloading 
as it needs to remount the files.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] ikatlinsky commented on pull request #1889: feat: add support for host pass in upstream crd

2023-08-04 Thread via GitHub


ikatlinsky commented on PR #1889:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1889#issuecomment-1666398135

   @tao12345666333 as i can see tests on master branch are still failing 
https://github.com/ikatlinsky/apisix-ingress-controller/actions/runs/5767561884


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] foohub opened a new issue, #9972: help request:

2023-08-04 Thread via GitHub


foohub opened a new issue, #9972:
URL: https://github.com/apache/apisix/issues/9972

   ### Description
   
   I Installed Kubernetes 1.27.4 on ubuntu 20.04.6. K8s work problem-free but 
when I tried to install apisix using helm or even with yaml I recieved this 
error on running etcd pods:
   
   Events:
 Type Reason AgeFrom Message
  --     ---
 Warning  BackOff10m (x1906 over 15h)   kubelet  Back-off restarting 
failed container etcd in pod 
apisix-etcd-0_apisix(28c29c3e-e52b-41e8-a09a-c537c2a365c4)
 Warning  Unhealthy  5m14s (x796 over 15h)  kubelet  Liveness probe failed: 
command "/opt/bitnami/scripts/etcd/healthcheck.sh" timed out
 Warning  Unhealthy  14s (x2684 over 15h)   kubelet  Readiness probe 
failed: command "/opt/bitnami/scripts/etcd/healthcheck.sh" timed out
   
   Does anyone installed apisix on kuber 1.27.4 sucessfully?
   
   ### Environment
   
   - APISIX version (run `apisix:3.4.1-debian-11-r5`):
   - Operating system (5.4.0-144-generic #161-Ubuntu SMP Fri Feb 3 14:49:04 UTC 
2023 x86_64 x86_64 x86_64 GNU/Linux):
   :
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Fabriceli opened a new pull request, #9971: doc: add more details for consumer-restriction plugin

2023-08-04 Thread via GitHub


Fabriceli opened a new pull request, #9971:
URL: https://github.com/apache/apisix/pull/9971

   ### Description
   
   1. add more details about `allowed_by_methods` include 
`allowed_by_methods.user` and `allowed_by_methods.methods` in zh doc
   2. add more details about `allowed_by_methods` include 
`allowed_by_methods.user` and `allowed_by_methods.methods` in en doc
   
   Fixes # (issue)
   #9873
   
   ### Checklist
   
   - [ ] I have explained the need for this PR and the problem it solves
   - [ ] I have explained the changes or the new features added to this PR
   - [ ] I have added tests corresponding to this change
   - [ ] I have updated the documentation to reflect this change
   - [ ] I have verified that this change is backward compatible (If not, 
please discuss on the [APISIX mailing 
list](https://github.com/apache/apisix/tree/master#community) first)
   
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] zimbres commented on issue #9931: help request: Erro 500 after update to version 3.4.2

2023-08-04 Thread via GitHub


zimbres commented on issue #9931:
URL: https://github.com/apache/apisix/issues/9931#issuecomment-1665538261

   After new tests, even start fresh, need this combination to see this problem:
   
   - ApiSix version 3.4.0, 3.4.1
   - A route with TLS
   - Firefox Browser in a regular tab
   - Hit CTRL + F5 in the page


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix-website] branch master updated: docs: Fix table code samples (#1658)

2023-08-04 Thread navendu
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 42a5fef6164 docs: Fix table code samples (#1658)
42a5fef6164 is described below

commit 42a5fef616444faf22997afeb3ee587e054f3324
Author: Bobur Umurzokov 
AuthorDate: Fri Aug 4 13:59:07 2023 +0300

docs: Fix table code samples (#1658)
---
 website/docs/general/code-samples.md | 39 ++--
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/website/docs/general/code-samples.md 
b/website/docs/general/code-samples.md
index c81cc29dc3c..6d9c918c2eb 100644
--- a/website/docs/general/code-samples.md
+++ b/website/docs/general/code-samples.md
@@ -19,22 +19,23 @@ Now, feel free to dive in! Whether you're a beginner in 
need of a jumpstart or a
 
 | Title | Description | Source code | Tutorial | Category | Level | Language |
 | --- | --- | --- | --- | --- | --- | --- |
-| Hands-on lab Apache APISIX | It shows a couple of nifty features that can 
help your information system cope with the challenges introduced by APIs | 
https://github.com/Boburmirzo/apisix-workshop | 
https://boburmirzo.github.io/apisix-workshop/ | Authentication, Security, 
Serverless, Observability, Transformation | Beginner | Shell |
-| How to create a File-proxy custom plugin in Lua | Learn to develop a new 
plugin that exposes the static files through API and fetches a file from a 
specified URL. | https://github.com/Boburmirzo/apisix-file-proxy-plugin-demo | 
https://api7.ai/blog/plugin-development-with-lua-and-chatgpt | Custom plugin, 
File proxy | Intermediate | Lua, Yaml |
-| Managing AI-powered Java App with API Management | It demonstrates how to 
use OpenAI ChatGPT APIs in Spring Boot, secure and manage the traffic with 
Apache APISIX | https://github.com/Boburmirzo/apisix-java-chatgpt-openaiapi | 
https://api7.ai/blog/managing-ai-powered-java-apps | Security, Authentication, 
JWT plugin, Consumers | Intermediate | Java, Yaml |
-| Manage . NET-based APIs with Apache APISIX API Gateway | This is an example 
project focused on the usage of https://apisix.apache.org/ for applications 
developed in https://docs.microsoft.com/en-us/aspnet/core/?view=aspnetcore-6.0 
| https://github.com/Boburmirzo/apisix-dotnet-docker | 
https://dev.to/apisix/manage-net-microservices-apis-with-apache-apisix-api-gateway-2cbk
 | Security, Authentication, Rate Limiting, Caching | Beginner | C#, Yaml |
-| Chaining API requests with API Gateway | Learn how to create a custom plugin 
for https://apisix.apache.org/ API Gateway to handle client requests that 
should be called in sequence. | 
https://github.com/Boburmirzo/apisix-plugin-pipeline-request-demo | 
https://api7.ai/blog/chaining-api-requests-with-api-gateway | Custom plugin, 
Serverless, Request Chaining | Intermediate | Lua, Shell |
-| Manage OpenAI APIs with Apache APISIX | Manages the OpenAI API traffic by 
creating a route, upstream and enabling some plugins. | 
https://github.com/Boburmirzo/apisix-open-ai-api | 
https://api7.ai/blog/power-ai-capabilities-with-apache-apisix | AI, Traffic 
control, Consumer, Rate-limiting, Prometheus, API versioning, Traffic split | 
Beginner | Shell, Yaml |
-| Dynamic routing based on JWT Claim with Apache APISIX and Okta | Explore the 
benefits of adopting dynamic routing based on authentication attributes | 
https://github.com/Boburmirzo/dynamic-routing-with-apisix | 
https://api7.ai/blog/dynamic-routing-based-on-user-credentials | Dynamic 
routing, JWT, Authentication, Consumer management | Advanced | Shell, Yaml |
-| Manage serverless APIs with Apache APISIX and Azure Functions | A simple 
example of how to manage Java-based serverless APIs built with Azure functions. 
| https://github.com/Boburmirzo/apisix-manage-serverless-apis | 
https://api7.ai/blog/manage-serverless-apis-with-apache-apisix | Serverless, 
Basic auth, Rate-limiting, Traffic management | Intermediate | Java, Shell |
-| Manage API Consumers | Explains how to manage your single or multiple API 
consumers with Apache APISIX. | 
https://github.com/Boburmirzo/apisix-api-consumers-management | 
https://apisix.apache.org/docs/apisix/tutorials/manage-api-consumers/ | API 
consumers, Rate-limiting, Consumer groups | Beginner | Shell |
-| Secure APIs with Apache APISIX API Gateway | How to use 
https://apisix.apache.org/plugins for securing your 
https://spring.io/guides/tutorials/rest/s and it demonstrates how to 
effectively use them. | 
https://github.com/Boburmirzo/apisix-plugin-spring-rest-demo | 
https://dev.to/apisix/secure-spring-boot-rest-api-with-apache-apisix-api-gateway-1nmg
 | Security, Authorization, Authentication, Monitoring | Beginner | Java |
-| An API observability with Apache APISIX Plugins Example | Learn observing 
your APIs with Apache APISIX plugins | 

[GitHub] [apisix-website] navendu-pottekkat merged pull request #1658: docs: Fix table code samples

2023-08-04 Thread via GitHub


navendu-pottekkat merged PR #1658:
URL: https://github.com/apache/apisix-website/pull/1658


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] wingyiu commented on issue #5706: request help: How to route according to the configuration of nacos metadata?

2023-08-04 Thread via GitHub


wingyiu commented on issue #5706:
URL: https://github.com/apache/apisix/issues/5706#issuecomment-1665420310

   +1  route to nodes by match meta label 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-go-plugin-runner] wangdayong228 opened a new issue, #137: request help: request id 和 通过 response 取的 request id 不一样 ,是否有什么规则?

2023-08-04 Thread via GitHub


wangdayong228 opened a new issue, #137:
URL: https://github.com/apache/apisix-go-plugin-runner/issues/137

   ### Issue description
   request id 和 通过 response 取的 request id 不一样, 请问有什么规则?
   
   插件代码如下
   ```
   package plugins
   
   import (
"net/http"
   
pkgHTTP "github.com/apache/apisix-go-plugin-runner/pkg/http"
"github.com/apache/apisix-go-plugin-runner/pkg/log"
"github.com/apache/apisix-go-plugin-runner/pkg/plugin"
   )
   
   func init() {
err := plugin.RegisterPlugin({})
if err != nil {
log.Fatalf("failed to register plugin check_id: %s", err)
}
   }
   
   // Say is a demo to show how to return data directly instead of proxying
   // it to the upstream.
   type CheckId struct {
// Embed the default plugin here,
// so that we don't need to reimplement all the methods.
plugin.DefaultPlugin
   }
   
   type CheckIdConf struct {
   }
   
   func (p *CheckId) Name() string {
return "check_id"
   }
   
   func (p *CheckId) ParseConf(in []byte) (interface{}, error) {
return CheckIdConf{}, nil
   }
   
   func (p *CheckId) RequestFilter(conf interface{}, w http.ResponseWriter, r 
pkgHTTP.Request) {
log.Infof("run request filter, r.ID() %d", r.ID())
   }
   
   func (p *CheckId) ResponseFilter(conf interface{}, w pkgHTTP.Response) {
log.Infof("run response filter, w.ID() %d", w.ID())
   }
   
   ```
   
   当发送请求时控制台输出
   
   ```
   apisix_1| 2023/08/04 10:33:48 [warn] 60#60: *120 [lua] 
init.lua:953: 2023-08-04T10:33:48.456Z   INFOserver/server.go:115
Client connected (unix)
   apisix_1| 2023-08-04T10:33:48.456Z  INFOserver/server.go:115 
   Client connected (unix)
   apisix_1| , context: ngx.timer
   apisix_1| 2023/08/04 10:33:48 [warn] 60#60: *120 [lua] 
init.lua:953: 2023-08-04T10:33:48.458Z   INFOserver/server.go:131
receive rpc type: 2 data length: 216
   apisix_1| 2023-08-04T10:33:48.458Z  INFOplugin/plugin.go:120 
   run plugin check_id
   apisix_1| 2023-08-04T10:33:48.458Z  INFO
plugins/check_req_res_id.go:38  run request filter, r.ID() 4194308
   apisix_1| , context: ngx.timer
   apisix_1| 2023/08/04 10:33:48 [warn] 60#60: *120 [lua] 
init.lua:953: 2023-08-04T10:33:48.463Z   INFOserver/server.go:131
receive rpc type: 4 data length: 388
   apisix_1| , context: ngx.timer
   apisix_1| 2023/08/04 10:33:48 [warn] 60#60: *120 [lua] 
init.lua:953: 2023-08-04T10:33:48.463Z   INFOplugin/plugin.go:185
run plugin check_id
   apisix_1| 2023-08-04T10:33:48.463Z  INFO
plugins/check_req_res_id.go:42  run response filter, w.ID() 4194309
   ```
   request filter 中获取的 request id 跟 responsor filter中获取的request id 不一致,分别是 
4194308 和 4194309
   
   
   ### Environment
   
   * APISIX Go Plugin Runner's version: master 主分支
   * APISIX version: docker 3.4.0-debian
   * Go version: 1.18 
   * OS (cmd: `uname -a`): Linux 49dc336f1aee 5.10.104-linuxkit #1 SMP Thu Mar 
17 17:08:06 UTC 2022 x86_64 GNU/Linux
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-website] Boburmirzo opened a new pull request, #1658: docs: Fix table code samples

2023-08-04 Thread via GitHub


Boburmirzo opened a new pull request, #1658:
URL: https://github.com/apache/apisix-website/pull/1658

   Fixes: #[Add issue number here]
   
   Changes:
   
   Fix table code samples and put a reference to links in the table columns
   
   Screenshots of the change:
   
   
![image](https://github.com/apache/apisix-website/assets/14247607/01864d57-ff3b-4f8b-9a53-bf81816be131)
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] github-actions[bot] commented on issue #7709: help request: Host is not rewritten

2023-08-04 Thread via GitHub


github-actions[bot] commented on issue #7709:
URL: https://github.com/apache/apisix/issues/7709#issuecomment-1665358780

   This issue has been marked as stale due to 350 days of inactivity. It will 
be closed in 2 weeks if no further activity occurs. If this issue is still 
relevant, please simply write any comment. Even if closed, you can still revive 
the issue at any time or discuss it on the d...@apisix.apache.org list. Thank 
you for your contributions.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] coolboywcm commented on issue #9961: bug: http-logger reseponse body decode fail

2023-08-04 Thread via GitHub


coolboywcm commented on issue #9961:
URL: https://github.com/apache/apisix/issues/9961#issuecomment-1665340474

   > @coolboywcm APISIX doesn't tamper with the response and passes it as it 
is. Can you confirm if the response sent by your upstream directly to see if 
the this invalid response is coming from upstream?
   
   I'm  really sure it's the gzip response mode of the upstream service causing 
garbled logs, which I've reproduced in my development environment.
   **non-gzip** mode, the upstream service code is as follows:
   
   ```
   public void test_no_gzip(){
   HttpServletResponse response =  getResponse();
   response.setContentType("application/json;charset=UTF-8");
   JSONObject result = new JSONObject();
   result.put("key1","123234");
   try {
   ServletOutputStream servletOutputStream = 
response.getOutputStream();
   
servletOutputStream.write(result.toJSONString().getBytes("UTF-8"));
   servletOutputStream.close();
   } catch (IOException e) {
   e.printStackTrace();
   }
   }
   
   ```
   Received log content:
   
   
`{"response":{"status":200,"headers":{"access-control-allow-headers":"Content-Type,X-Requested-With,withCredentials","connection":"close","date":"Fri,
 04 Aug 2023 09:39:26 
GMT","access-control-allow-origin":"*","server":"APISIX\/3.1.0","content-type":"application\/json;charset=UTF-8","access-control-allow-methods":"GET,
 POST","content-length":"17"},"body":"{\"key1\":\"123234\"}","size":333}}
   `
   
   **gzip** mode, the upstream service code is as follows:
   
   ```
   public void test_gzip(){
   HttpServletResponse response =  getResponse();
   response.setHeader("Content-Encoding", "gzip");
   response.setContentType("application/json;charset=UTF-8");
   JSONObject result = new JSONObject();
   result.put("key1","123234");
   try {
   GZIPOutputStream gzipOutputStream = new 
GZIPOutputStream(response.getOutputStream());
   gzipOutputStream.write(result.toJSONString().getBytes("UTF-8"));
   gzipOutputStream.close();
   } catch (IOException e) {
   e.printStackTrace();
   }
   }
   ```
   
Received log content:   
   
   ` 
{"response":{"status":200,"headers":{"connection":"close","access-control-allow-origin":"*","server":"APISIX\/3.1.0","content-type":"application\/json;charset=UTF-8","date":"Fri,
 04 Aug 2023 09:47:27 
GMT","content-encoding":"gzip","access-control-allow-headers":"Content-Type,X-Requested-With,withCredentials","access-control-allow-methods":"GET,
 
POST","content-length":"37"},"body":"\u001f�\b\u\u\u\u\u\u\u�V�N�4T�R242626Q�\u0005\u��_�\u0011\u\u\u","size":377}}`


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] cyrnicolase opened a new issue, #9970: help request: How to solve "accept4() failed (24: Too many open files)"

2023-08-04 Thread via GitHub


cyrnicolase opened a new issue, #9970:
URL: https://github.com/apache/apisix/issues/9970

   ### Description
   
   I got lots of nginx error log. "accept4() failed (24: Too many open files)" 
. i don't know what's wrong.
   
   ### Environment
   
   - APISIX version : 3.3.0
   - Operating system : Linux apisix-197 3.10.0-1160.90.1.el7.x86_64 #1 SMP Thu 
May 4 15:21:22 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
   - OpenResty / Nginx version : openresty/1.21.4.1
   - etcd version: 3.5.0
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] skimdz86 commented on issue #9307: feat: support for the Timing-Allow-Origin header in CORS plugin

2023-08-04 Thread via GitHub


skimdz86 commented on issue #9307:
URL: https://github.com/apache/apisix/issues/9307#issuecomment-1665317889

   > > Ok, I'll update the documentation in the next few days, thanks
   > 
   > do you have update for document ?
   
   Hi, actually I already updated the documentation in this commit 
https://github.com/apache/apisix/pull/9365/commits/bb98891c6454c8236dfda6fb833feac36df56bc6
   
   Please let me know if everything is ok!
   
   Thank


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] DGolubets commented on issue #9965: help request: how to configure rate limiting per consumer per route

2023-08-04 Thread via GitHub


DGolubets commented on issue #9965:
URL: https://github.com/apache/apisix/issues/9965#issuecomment-1665274633

   I've found the Workflow plugin, which seems to allow me to do what I want, 
though it only supports `limit-count`. I think it would be really cool if it 
supported all the plugins, allowing for complex logic.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix] branch master updated: chore: remove some useless code about kubernetes and tars stream discovery (#9926)

2023-08-04 Thread monkeydluffy
This is an automated email from the ASF dual-hosted git repository.

monkeydluffy 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 6278ae018 chore: remove some useless code about kubernetes and tars 
stream discovery (#9926)
6278ae018 is described below

commit 6278ae01839167d943e676ea9b54b3ea4c5cb8d7
Author: Ashing Zheng 
AuthorDate: Fri Aug 4 16:56:06 2023 +0800

chore: remove some useless code about kubernetes and tars stream discovery 
(#9926)
---
 apisix/discovery/kubernetes/init.lua   | 7 +--
 apisix/discovery/tars/init.lua | 8 +---
 docs/en/latest/discovery/kubernetes.md | 6 --
 docs/zh/latest/discovery/kubernetes.md | 6 --
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/apisix/discovery/kubernetes/init.lua 
b/apisix/discovery/kubernetes/init.lua
index 3f5f275d9..d16d4f4fc 100644
--- a/apisix/discovery/kubernetes/init.lua
+++ b/apisix/discovery/kubernetes/init.lua
@@ -26,7 +26,7 @@ local error = error
 local pcall = pcall
 local setmetatable = setmetatable
 local is_http = ngx.config.subsystem == "http"
-local support_process, process = pcall(require, "ngx.process")
+local process = require("ngx.process")
 local core = require("apisix.core")
 local util = require("apisix.cli.util")
 local local_conf = require("apisix.core.config_local").local_conf()
@@ -520,11 +520,6 @@ end
 
 
 function _M.init_worker()
-if not support_process then
-core.log.error("kubernetes discovery not support in subsystem: ", 
ngx.config.subsystem,
-   ", please check if your openresty version >= 1.19.9.1 
or not")
-return
-end
 local discovery_conf = local_conf.discovery.kubernetes
 core.log.info("kubernetes discovery conf: ", 
core.json.delay_encode(discovery_conf))
 if #discovery_conf == 0 then
diff --git a/apisix/discovery/tars/init.lua b/apisix/discovery/tars/init.lua
index 14f658dce..17bb2758b 100644
--- a/apisix/discovery/tars/init.lua
+++ b/apisix/discovery/tars/init.lua
@@ -23,7 +23,7 @@ local local_conf = 
require("apisix.core.config_local").local_conf()
 local core = require("apisix.core")
 local mysql = require("resty.mysql")
 local is_http = ngx.config.subsystem == "http"
-local support_process, process = pcall(require, "ngx.process")
+local process = require("ngx.process")
 
 local endpoint_dict
 
@@ -343,12 +343,6 @@ local function get_endpoint_dict()
 end
 
 function _M.init_worker()
-if not support_process then
-core.log.error("tars discovery not support in subsystem: ", 
ngx.config.subsystem,
-   ", please check if your openresty version >= 1.19.9.1 
or not")
-return
-end
-
 endpoint_dict = get_endpoint_dict()
 if not endpoint_dict then
 error("failed to get lua_shared_dict: tars, please check your APISIX 
version")
diff --git a/docs/en/latest/discovery/kubernetes.md 
b/docs/en/latest/discovery/kubernetes.md
index 0735471b8..fb11aac67 100644
--- a/docs/en/latest/discovery/kubernetes.md
+++ b/docs/en/latest/discovery/kubernetes.md
@@ -34,12 +34,6 @@ The [_Kubernetes_](https://kubernetes.io/) service discovery 
[_List-Watch_](http
 
 Discovery also provides a node query interface in accordance with the [_APISIX 
Discovery Specification_](../discovery.md).
 
-:::note
-
-use kubernetes discovery in L4 require OpenResty version >= 1.19.9.1
-
-:::
-
 ## How To Use
 
 Kubernetes service discovery both support single-cluster and multi-cluster 
modes, applicable to the case where the service is distributed in single or 
multiple Kubernetes clusters.
diff --git a/docs/zh/latest/discovery/kubernetes.md 
b/docs/zh/latest/discovery/kubernetes.md
index 0c390b785..c4b751889 100644
--- a/docs/zh/latest/discovery/kubernetes.md
+++ b/docs/zh/latest/discovery/kubernetes.md
@@ -34,12 +34,6 @@ Kubernetes 服务发现以 
[_List-Watch_](https://kubernetes.io/docs/reference/u
 
 同时遵循 [_APISIX Discovery 规范_](../discovery.md) 提供了节点查询接口。
 
-:::note
-
-在四层中使用 Kubernetes 服务发现要求 OpenResty 版本大于等于 1.19.9.1
-
-:::
-
 ## Kubernetes 服务发现的使用
 
 目前 Kubernetes 服务发现支持单集群和多集群模式,分别适用于待发现的服务分布在单个或多个 Kubernetes 的场景。



[GitHub] [apisix] monkeyDluffy6017 merged pull request #9926: chore: remove check of OpenResty in code because APISIX can not start when using an old version of OpenResty

2023-08-04 Thread via GitHub


monkeyDluffy6017 merged PR #9926:
URL: https://github.com/apache/apisix/pull/9926


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix] branch master updated: feat: support pulling env vars from yaml keys (#9855)

2023-08-04 Thread monkeydluffy
This is an automated email from the ASF dual-hosted git repository.

monkeydluffy 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 d80fc3bc9 feat: support pulling env vars from yaml keys (#9855)
d80fc3bc9 is described below

commit d80fc3bc97158617287a406c269f1bce2d67ab64
Author: Abhishek Choudhary 
AuthorDate: Fri Aug 4 14:40:32 2023 +0545

feat: support pulling env vars from yaml keys (#9855)
---
 apisix/cli/file.lua | 81 +
 docs/en/latest/admin-api.md | 13 
 docs/zh/latest/admin-api.md | 13 
 t/cli/test_standalone.sh| 29 +++-
 4 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/apisix/cli/file.lua b/apisix/cli/file.lua
index af071a840..149c4e913 100644
--- a/apisix/cli/file.lua
+++ b/apisix/cli/file.lua
@@ -54,8 +54,59 @@ local function tab_is_array(t)
 end
 
 
+local function var_sub(val)
+local err
+local var_used = false
+-- we use '${{var}}' because '$var' and '${var}' are taken
+-- by Nginx
+local new_val = val:gsub("%$%{%{%s*([%w_]+[%:%=]?.-)%s*%}%}", function(var)
+local i, j = var:find("%:%=")
+local default
+if i and j then
+default = var:sub(i + 2, #var)
+default = default:gsub('^%s*(.-)%s*$', '%1')
+var = var:sub(1, i - 1)
+end
+
+local v = getenv(var) or default
+if v then
+if not exported_vars then
+exported_vars = {}
+end
+
+exported_vars[var] = v
+var_used = true
+return v
+end
+
+err = "failed to handle configuration: " ..
+  "can't find environment variable " .. var
+return ""
+end)
+return new_val, var_used, err
+end
+
+
 local function resolve_conf_var(conf)
+local new_keys = {}
 for key, val in pairs(conf) do
+-- avoid re-iterating the table for already iterated key
+if new_keys[key] then
+goto continue
+end
+-- substitute environment variables from conf keys
+if type(key) == "string" then
+local new_key, _, err = var_sub(key)
+if err then
+return nil, err
+end
+if new_key ~= key then
+new_keys[new_key] = "dummy" -- we only care about checking the 
key
+conf.key = nil
+conf[new_key] = val
+key = new_key
+end
+end
 if type(val) == "table" then
 local ok, err = resolve_conf_var(val)
 if not ok then
@@ -63,34 +114,7 @@ local function resolve_conf_var(conf)
 end
 
 elseif type(val) == "string" then
-local err
-local var_used = false
--- we use '${{var}}' because '$var' and '${var}' are taken
--- by Nginx
-local new_val = val:gsub("%$%{%{%s*([%w_]+[%:%=]?.-)%s*%}%}", 
function(var)
-local i, j = var:find("%:%=")
-local default
-if i and j then
-default = var:sub(i + 2, #var)
-default = default:gsub('^%s*(.-)%s*$', '%1')
-var = var:sub(1, i - 1)
-end
-
-local v = getenv(var) or default
-if v then
-if not exported_vars then
-exported_vars = {}
-end
-
-exported_vars[var] = v
-var_used = true
-return v
-end
-
-err = "failed to handle configuration: " ..
-  "can't find environment variable " .. var
-return ""
-end)
+local new_val, var_used, err = var_sub(val)
 
 if err then
 return nil, err
@@ -108,6 +132,7 @@ local function resolve_conf_var(conf)
 
 conf[key] = new_val
 end
+::continue::
 end
 
 return true
diff --git a/docs/en/latest/admin-api.md b/docs/en/latest/admin-api.md
index 3071a3e00..787a61e98 100644
--- a/docs/en/latest/admin-api.md
+++ b/docs/en/latest/admin-api.md
@@ -103,6 +103,19 @@ deployment:
 
 This will find the environment variable `ADMIN_KEY` first, and if it does not 
exist, it will use `edd1c9f034335f136f87ad84b625c8f1` as the default value.
 
+You can also specify environment variables in yaml keys. This is specifically 
useful in the `standalone` [mode](./deployment-modes.md#standalone) where you 
can specify the upstream nodes as follows:
+
+```yaml title="./conf/apisix.yaml"
+routes:
+  -
+uri: "/test"
+upstream:
+  nodes:
+"${{HOST_IP}}:${{PORT}}": 1
+  type: roundrobin
+#END
+```
+
 ### Force Delete
 
 By default, the Admin API checks for references 

[GitHub] [apisix] monkeyDluffy6017 merged pull request #9855: feat: support pulling env vars from yaml keys

2023-08-04 Thread via GitHub


monkeyDluffy6017 merged PR #9855:
URL: https://github.com/apache/apisix/pull/9855


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Revolyssup commented on issue #9961: bug: http-logger reseponse body decode fail

2023-08-04 Thread via GitHub


Revolyssup commented on issue #9961:
URL: https://github.com/apache/apisix/issues/9961#issuecomment-1665257175

   @coolboywcm APISIX doesn't tamper with the response and passes it as it is. 
Can you confirm if the response sent by your upstream directly to see if the 
this invalid response is coming from upstream?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Revolyssup commented on issue #9965: help request: how to configure rate limiting per consumer per route

2023-08-04 Thread via GitHub


Revolyssup commented on issue #9965:
URL: https://github.com/apache/apisix/issues/9965#issuecomment-1665234742

   > Hey,
   > 
   > > Please join #apisix channel after joining the ASF slack workspace: 
https://join.slack.com/t/the-asf/shared_invite/zt-1z1cth9wx-2CMIattLWRW5R5ytuNHIgA
   > 
   > Thanks for the invite
   > 
   > No, my requirement is different, it's more like what I found a bit down 
the thread there: https://the-asf.slack.com/archives/CUC5MN17A/p1676970398154249
   > 
   > > hi @DGolubets have you try this feature in req-limit plugin ?
   > > 
![image](https://user-images.githubusercontent.com/2706161/258307631-e9a3e289-def6-4d40-90d3-50ab44c880d1.png)
   > > https://apisix.apache.org/docs/apisix/plugins/limit-req/
   > 
   > The problem with keys is that you can only specify the variable name, not 
the value.
   > 
   > Essentialy what I want is:
   > 
   > ```
   > ConsumerA -> Route1 -> 10 rps
   > ConsumerA -> Route2 -> 20 rps
   > ConsumerB -> Route1 -> 5 rps
   > ConsumerB -> Route1 -> 5 rps
   > ConsumerB -> Route2 -> unlimited
   > ConsumerC -> unlimited
   > ```
   
   Currently rate limit plugin doesn't support per consumer per route, this can 
be a feature request.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] kayx23 opened a new pull request, #9969: docs: add in-memory caching example for `proxy-cache`

2023-08-04 Thread via GitHub


kayx23 opened a new pull request, #9969:
URL: https://github.com/apache/apisix/pull/9969

   ### Description
   
   Added docs as per https://github.com/apache/apisix/issues/9957
   
   ### Checklist
   
   - [x] I have explained the need for this PR and the problem it solves
   - [x] I have explained the changes or the new features added to this PR
   - [ ] I have added tests corresponding to this change
   - [x] I have updated the documentation to reflect this change
   - [ ] I have verified that this change is backward compatible (If not, 
please discuss on the [APISIX mailing 
list](https://github.com/apache/apisix/tree/master#community) first)
   
   ### Test
   
   ```bash
   $ curl http://127.0.0.1:9180/apisix/admin/routes/1 \
   -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
   {
   "uri": "/ip",
   "plugins": {
   "proxy-cache": {
   "cache_strategy": "memory",
   "cache_zone": "memory_cache",
   "cache_ttl": 10
   }
   },
   "upstream": {
   "nodes": {
   "httpbin.org": 1
   },
   "type": "roundrobin"
   }
   }'
   
   
{"key":"/apisix/routes/1","value":{"id":"1","update_time":1691137580,"strip_path_prefix":false,"status":1,"upstream":{"nodes":{"httpbin.org":1},"type":"roundrobin","hash_on":"vars","pass_host":"pass","scheme":"http"},"priority":0,"create_time":1690796578,"uri":"/ip","plugins":{"proxy-cache":{"cache_ttl":10,"cache_strategy":"memory","cache_zone":"memory_cache","cache_control":false,"hide_cache_headers":false,"cache_key":["$host","$request_uri"],"cache_method":["GET","HEAD"],"cache_http_status":[200,301,404]
   ```
   
   ```bash
$ curl -i http://127.0.0.1:9080/ip
   
   HTTP/1.1 200 OK
   Apisix-Cache-Status: MISS
   Date: Fri, 04 Aug 2023 08:26:49 GMT
   ...
   
   {
 "origin": "192.168.112.1, 34.xxx.xxx.xxx"
   }
   ```
   
   ```bash
   $ curl -i http://127.0.0.1:9080/ip
   
   HTTP/1.1 200 OK
   Apisix-Cache-Status: HIT
   Age: 5
   Date: Fri, 04 Aug 2023 08:26:49 GMT
   ...
   
   {
 "origin": "192.168.112.1, 34.xxx.xxx.xxx"
   }
   ```


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] monkeyDluffy6017 closed issue #9959: bug: stringx.strip using wrong index if # > 200

2023-08-04 Thread via GitHub


monkeyDluffy6017 closed issue #9959: bug: stringx.strip using wrong index if # 
> 200
URL: https://github.com/apache/apisix/issues/9959


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix] branch master updated: fix: update penlignt to 1.13.1 (#9966)

2023-08-04 Thread monkeydluffy
This is an automated email from the ASF dual-hosted git repository.

monkeydluffy 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 15802aa8d fix: update penlignt to 1.13.1 (#9966)
15802aa8d is described below

commit 15802aa8da645602ce4c084fe6b368bcd5c7f2f5
Author: HaiYan 
AuthorDate: Fri Aug 4 16:31:27 2023 +0800

fix: update penlignt to 1.13.1 (#9966)
---
 rockspec/apisix-master-0.rockspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rockspec/apisix-master-0.rockspec 
b/rockspec/apisix-master-0.rockspec
index c0abef20c..c5c4443d3 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -66,7 +66,7 @@ dependencies = {
 "luasocket = 3.1.0-1",
 "luasec = 0.9-1",
 "lua-resty-consul = 0.3-2",
-"penlight = 1.9.2-1",
+"penlight = 1.13.1",
 "ext-plugin-proto = 0.6.0",
 "casbin = 1.41.5",
 "inspect == 3.1.1",



[GitHub] [apisix] monkeyDluffy6017 merged pull request #9966: fix: update penlight to 1.13.1

2023-08-04 Thread via GitHub


monkeyDluffy6017 merged PR #9966:
URL: https://github.com/apache/apisix/pull/9966


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] gjing1st opened a new issue, #9968: docs: 所有文档

2023-08-04 Thread via GitHub


gjing1st opened a new issue, #9968:
URL: https://github.com/apache/apisix/issues/9968

   ### Current State
   
   
目前文档基本都是英文编写。即使切换为中文,仍然有大量的英文。而且文档写的实在是不敢恭维。即难以找到想要的文档,而且就算找到了也是简单的一笔代过。好比说我要看https部分,1.5版本还有个文档,3版本后根本找不到。找个ip如何配置https更是找不到。如果要看国密https,那完犊子,全网都找不到方法或者插件要怎么搞。
   
   再牛逼的产品,如果文档是一坨屎,别人不会用也白瞎。APISIX功能搞那么多完全没必要,先把主要的搞好。然后把文档写清楚,别人才会来用。
   之前温老师说一个月发一版,我觉着完全没必要非得一个月一版本,追求多少位贡献值。一个月一版,现在这么多人,都不知道增加了哪些功能,文档完全跟不上。
   
现在APISIX已经那么多功能了,先把文档写好,国内用户原本可以很多的,看论坛就知道了,很多人都放弃了APISIX,说它是个半成品。做好核心,维护好核心功能生态,再发展其他的。
   
建议看看人家KubeShpere产品版本和文档说明。别说什么apache顶级项目,最快孵化,没什么用,文档就是一坨屎。现在人家Kong都进化的这么好了,你文档都写不好,让别人咋用,为什么要用你APISIX。
   
   ### Desired State
   
   希望好好完善文档,别在那追求一个月一版本了!!!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] coolboywcm commented on issue #9961: bug: http-logger reseponse body decode fail

2023-08-04 Thread via GitHub


coolboywcm commented on issue #9961:
URL: https://github.com/apache/apisix/issues/9961#issuecomment-1665139768

   > > > @coolboywcm This is not a bug but a feature request. Currently the 
logger doesn't decompress the compressed body and logs the body as it is.
   > > 
   > > 
   > > I tried to decompress and convert the response-body of http-logger into 
a byte stream, but it failed. During the process of converting the gzip content 
into a string forcibly by http-logger, the original data has been damaged.
   > 
   > For repro purposes, can you show the code how you were decompressing the 
body?
   
   In the above reply, I provided the code and the result


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] monkeyDluffy6017 commented on pull request #9660: feat: add dubbo protocols support for xrpc

2023-08-04 Thread via GitHub


monkeyDluffy6017 commented on PR #9660:
URL: https://github.com/apache/apisix/pull/9660#issuecomment-1665137259

   @nic-chen thanks! I'll check it later


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix-ingress-controller] branch master updated: chore: clean up apisix v1 (#1916)

2023-08-04 Thread gallardot
This is an automated email from the ASF dual-hosted git repository.

gallardot pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new b7329b04 chore: clean up apisix v1 (#1916)
b7329b04 is described below

commit b7329b04719a74948cfa6e35aafa509822c7a1b5
Author: Jintao Zhang 
AuthorDate: Fri Aug 4 15:26:51 2023 +0800

chore: clean up apisix v1 (#1916)

Signed-off-by: Jintao Zhang 
---
 pkg/kube/apisix/apis/config/v1/doc.go  |  18 -
 pkg/kube/apisix/apis/config/v1/types.go| 333 --
 .../apisix/apis/config/v1/zz_generated.deepcopy.go | 718 -
 .../apisix/apis/config/v1/zz_generated.register.go |  73 ---
 4 files changed, 1142 deletions(-)

diff --git a/pkg/kube/apisix/apis/config/v1/doc.go 
b/pkg/kube/apisix/apis/config/v1/doc.go
deleted file mode 100644
index 3e5e5ff8..
--- a/pkg/kube/apisix/apis/config/v1/doc.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// +k8s:deepcopy-gen=package
-
-// +groupName=apisix.apache.org
-package v1
diff --git a/pkg/kube/apisix/apis/config/v1/types.go 
b/pkg/kube/apisix/apis/config/v1/types.go
deleted file mode 100644
index 4cfcf4e1..
--- a/pkg/kube/apisix/apis/config/v1/types.go
+++ /dev/null
@@ -1,333 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package v1
-
-import (
-   "encoding/json"
-   "time"
-
-   metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-   v2 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2"
-)
-
-// +genclient
-// +genclient:noStatus
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// ApisixRoute is used to define the route rules and upstreams for Apache 
APISIX.
-// The definition closes the Kubernetes Ingress resource.
-// +kubebuilder:resource:shortName=ar
-// +kubebuilder:pruning:PreserveUnknownFields
-type ApisixRoute struct {
-   metav1.TypeMeta   `json:",inline" yaml:",inline"`
-   metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-   Spec  *ApisixRouteSpec `json:"spec,omitempty" 
yaml:"spec,omitempty"`
-}
-
-// ApisixRouteSpec is the spec definition for ApisixRouteSpec.
-type ApisixRouteSpec struct {
-   Rules []Rule `json:"rules,omitempty" yaml:"rules,omitempty"`
-}
-
-// Rule represents a single route rule in ApisixRoute.
-type Rule struct {
-   Host string `json:"host,omitempty" yaml:"host,omitempty"`
-   Http Http   `json:"http,omitempty" yaml:"http,omitempty"`
-}
-
-// Http represents all route rules in HTTP scope.
-type Http struct {
-   Paths []Path `json:"paths,omitempty" yaml:"paths,omitempty"`
-}
-
-// Path defines an URI based route rule.
-type Path struct {
-   Pathstring   `json:"path,omitempty" yaml:"path,omitempty"`
-   Backend Backend  `json:"backend,omitempty" 
yaml:"backend,omitempty"`
-   Timeout *UpstreamTimeout `json:"timeout,omitempty" 
yaml:"timeout,omitempty"`
-   Plugins []Plugin `json:"plugins,omitempty" 
yaml:"plugins,omitempty"`
-}
-
-// Backend defines an upstream, it should be an existing Kubernetes Service.
-// Note the Service should be in the same namespace with ApisixRoute resource,
-// i.e. cross namespacing is not allowed.
-type Backend struct {
-   ServiceName string 

[GitHub] [apisix-ingress-controller] Gallardot merged pull request #1916: chore: clean up apisix v1

2023-08-04 Thread via GitHub


Gallardot merged PR #1916:
URL: https://github.com/apache/apisix-ingress-controller/pull/1916


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] DGolubets commented on issue #9965: help request: how to configure rate limiting per consumer per route

2023-08-04 Thread via GitHub


DGolubets commented on issue #9965:
URL: https://github.com/apache/apisix/issues/9965#issuecomment-1665134397

   Hey,
   
   > Please join #apisix channel after joining the ASF slack workspace: 
https://join.slack.com/t/the-asf/shared_invite/zt-1z1cth9wx-2CMIattLWRW5R5ytuNHIgA
   
   Thanks for the invite
   
   No, my requirement is different, it's more like what I found a bit down the 
thread there: https://the-asf.slack.com/archives/CUC5MN17A/p1676970398154249
   
   > hi @DGolubets have you try this feature in req-limit plugin ?
   > 
   > 
![image](https://user-images.githubusercontent.com/2706161/258307631-e9a3e289-def6-4d40-90d3-50ab44c880d1.png)
   > 
   > https://apisix.apache.org/docs/apisix/plugins/limit-req/
   
   The problem with keys is that you can only specify the variable name, not 
the value.
   
   Essentialy what I want is: 
   ```
   ConsumerA -> Route1 -> 10 rps
   ConsumerA -> Route2 -> 20 rps
   ConsumerB -> Route1 -> 5 rps
   ConsumerB -> Route1 -> 5 rps
   ConsumerB -> Route2 -> unlimited
   ConsumerC -> unlimited
   ```
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] coolboywcm commented on issue #9961: bug: http-logger reseponse body decode fail

2023-08-04 Thread via GitHub


coolboywcm commented on issue #9961:
URL: https://github.com/apache/apisix/issues/9961#issuecomment-1665119637

   > 
   "uri": "http://xxx.xx.xx.xx:80/apisix/addLog;
   
   controller method  addLog  is as follows
   
   ```
   import com.alibaba.fastjson.JSONArray;
   import com.alibaba.fastjson.JSONObject;
   
   public void addLog() throws IOException {
   String encoding = this.getRequest().getCharacterEncoding();
   
System.out.println("1encoding=>" + 
encoding);
   if (encoding == null) {
   encoding = StandardCharsets.UTF_8.name(); 
   }
   
System.out.println("2encoding=>" + 
encoding);
   StringBuilder stringBuilder = new StringBuilder();
   BufferedReader reader = new BufferedReader(new 
InputStreamReader(this.getRequest().getInputStream(), encoding));
   String line;
   while ((line = reader.readLine()) != null) {
   stringBuilder.append(line);
   }
 
System.out.println("00stringBuilder.toString()>"
 + stringBuilder.toString());
   String jsonString = stringBuilder.toString();
   JSONObject logJson = 
JSONArray.parseArray(jsonString).getJSONObject(0);
   jsonString = logJson.toJSONString();
   
System.out.println("3jsonString>"
 + jsonString);
   String resp_body = 
logJson.getJSONObject("response").getString("body");
   
System.out.println("addLog=>111resp_body:" + 
resp_body);
   resp_body = decompress(resp_body.getBytes(encoding);
   
System.out.println("addLog=>222resp_body:" + 
resp_body);
   }
   ```
   method  decompress  is as follows
   
   ```
   import java.util.zip.GZIPInputStream;
   import java.util.zip.GZIPOutputStream;
   public static String decompress(byte[] compressedData) throws IOException {
   try (ByteArrayInputStream bis = new 
ByteArrayInputStream(compressedData);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
GZIPInputStream gzipIS = new GZIPInputStream(bis)) {
   
   byte[] buffer = new byte[1024];
   int len;
   while ((len = gzipIS.read(buffer)) > 0) {
   bos.write(buffer, 0, len);
   }
   return bos.toString("UTF-8");
   }
   }
   ```
   
   console print result:
   
   ```
   1encoding=>UTF-8
   2encoding=>UTF-8
   
00stringBuilder.toString()>[{"response":{"status":200,"headers":{"connection":"close","access-control-allow-origin":"*","server":"APISIX\/3.1.0","content-type":"application\/json;charset=UTF-8","content-encoding":"gzip","date":"Fri,
 04 Aug 2023 06:52:28 
GMT","access-control-allow-headers":"Content-Type,X-Requested-With,withCredentials","access-control-allow-methods":"GET,
 
POST","content-length":"37"},"body":"\u001f�\b\u\u\u\u\u\u\u�V�N�4T�R242626Q�\u0005\u��_�\u0011\u\u\u","size":377}}]
   
3jsonString>{"response":{"status":200,"headers":{"connection":"close","access-control-allow-origin":"*","server":"APISIX\/3.1.0","content-type":"application\/json;charset=UTF-8","content-encoding":"gzip","date":"Fri,
 04 Aug 2023 06:52:28 
GMT","access-control-allow-headers":"Content-Type,X-Requested-With,withCredentials","access-control-allow-methods":"GET,
 
POST","content-length":"37"},"body":"\u001f�\b\u\u\u\u\u\u\u�V�N�4T�R242626Q�\u0005\u��_�\u0011\u\u\u","size":377}}
   
addLog=>111resp_body:\u001F�\b\u\u\u\u\u\u\u�V�N�4T�R242626Q�\u0005\u��_�\u0011\u\u\u
   java.util.zip.ZipException: Not in GZIP format
   at java.util.zip.GZIPInputStream.readHeader(GZIPInputStream.java:165)
   at java.util.zip.GZIPInputStream.(GZIPInputStream.java:79)
   at java.util.zip.GZIPInputStream.(GZIPInputStream.java:91)
   at com.ApiSixController.decompress(ApiSixController.java:332)
   
   ```


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Sn0rt commented on issue #9915: feat: As a user, I want to protect the sensitive information of `config.yaml` , so that move the data to the Vault

2023-08-04 Thread via GitHub


Sn0rt commented on issue #9915:
URL: https://github.com/apache/apisix/issues/9915#issuecomment-1665115655

   > > Indeed, I've seen that etcd's underlying library only supports pass the 
path of file.
   > > Then I think the tasks of the current issues can be divided into 
multiple stages to achieve.
   > > 
   > > 1. Submit the part except etcd first.
   > > 2. Discuss the path of etcd tls in one issue after another. (There are 
not many tls configurations in practice, and I think the priority of this task 
is a bit low.
   > 
   > Ok, I will add more tests and finish in these days :).
   
   thx your help. and we need create a new issues for track the etcd tls 
feature.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] rodman10 commented on issue #9915: feat: As a user, I want to protect the sensitive information of `config.yaml` , so that move the data to the Vault

2023-08-04 Thread via GitHub


rodman10 commented on issue #9915:
URL: https://github.com/apache/apisix/issues/9915#issuecomment-1665114079

   > Indeed, I've seen that etcd's underlying library only supports pass the 
path of file.
   > 
   > Then I think the tasks of the current issues can be divided into multiple 
stages to achieve.
   > 
   > 1. Submit the part except etcd first.
   > 2. Discuss the path of etcd tls in one issue after another. (There are not 
many tls configurations in practice, and I think the priority of this task is a 
bit low.
   
   Ok, I will add more tests and finish in these days :).


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] monkeyDluffy6017 commented on a diff in pull request #9927: chore(ci): automate management of unresponded issues

2023-08-04 Thread via GitHub


monkeyDluffy6017 commented on code in PR #9927:
URL: https://github.com/apache/apisix/pull/9927#discussion_r1284051933


##
.github/workflows/update-labels.yml:
##
@@ -0,0 +1,22 @@
+name: Update label when user responds
+permissions:
+  issues: write
+
+on:
+  issue_comment:
+types: [created]
+
+jobs:
+  run-check:
+runs-on: ubuntu-latest
+steps:
+  - name: update labels when user responds
+uses: andymckay/labeler@master
+if: ${{ github.event.comment.user.login == 
github.event.issue.user.login && contains(github.event.issue.labels.*.name, 
'wait for update') && !contains(github.event.issue.labels.*.name, 'user 
responded') }}
+with:
+  add-labels: 'user responded'
+  remove-labels: 'wait for update'
+if: ${{ github.event.comment.user.login == 
github.event.issue.user.login && contains(github.event.issue.labels.*.name, 'no 
response') && contains(github.event.issue.labels.*.name, 'wait for update') && 
!contains(github.event.issue.labels.*.name, 'user responded') }}

Review Comment:
   Why do you add this condition `contains(github.event.issue.labels.*.name, 
'no response') && contains(github.event.issue.labels.*.name, 'wait for update')`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix-ingress-controller] branch dependabot/go_modules/test/e2e/google.golang.org/grpc-1.53.0 updated (f624f835 -> 3579f18a)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/test/e2e/google.golang.org/grpc-1.53.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


omit f624f835 chore(deps): bump google.golang.org/grpc in /test/e2e
 add c40b664d ci: cron ci must use the logical AND condition (#1850)
 add 8e3104b3 docs: Add QA about exposing gateway as loadbalancer (#1907)
 add 3f45ca99 ci: auto certs and upgrade APISIX to 3.4.1 version (#1911)
 add 3fa789df chore: remove support for Ingress in the extensions/v1beta1 
API version (#1840)
 add 37e9201c chore: Upgrade Go tool chain version 1.19 to version 1.20  
(#1788)
 add f2ae01a7 chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4 
(#1917)
 new 3579f18a chore(deps): bump google.golang.org/grpc in /test/e2e

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f624f835)
\
 N -- N -- N   
refs/heads/dependabot/go_modules/test/e2e/google.golang.org/grpc-1.53.0 
(3579f18a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/e2e-test-ci-v2-cron-dev.yml  |   8 +-
 .github/workflows/e2e-test-ci-v2-cron.yml  |   4 +-
 .github/workflows/e2e-test-ci.yml  |   4 +-
 .github/workflows/goimports-reviser.yml|   2 +-
 .github/workflows/golangci-lint.yml|   4 +-
 .github/workflows/k8s-timer-ci.yml |   4 +-
 .github/workflows/lint-checker.yml |   2 +-
 .github/workflows/unit-test-ci.yml |   2 +-
 .github/workflows/verify-codegen.yml   |   2 +-
 Dockerfile |   2 +-
 Makefile   |   4 +-
 cmd/ingress/ingress.go |   7 -
 docs/en/latest/FAQ.md  |  15 ++
 docs/en/latest/contribute.md   |   2 +-
 go.mod |  37 ++--
 go.sum |  69 ---
 pkg/config/config.go   |   2 +-
 pkg/kube/ingress.go|  65 +-
 pkg/providers/controller.go|  15 +-
 pkg/providers/ingress/ingress.go   |  45 +
 pkg/providers/ingress/ingress_test.go  |  40 
 pkg/providers/ingress/translation/translator.go| 151 --
 pkg/providers/utils/ingress_status.go  |  43 
 pkg/providers/utils/ingress_status_test.go |  72 ---
 pkg/utils/{s2b_new.go => s2b.go}   |   0
 pkg/utils/s2b_old.go   |  39 
 test/e2e/go.mod|  35 ++--
 test/e2e/go.sum|  67 ---
 test/e2e/scaffold/ssl.go   |  96 -
 test/e2e/suite-annotations/authorization.go|  92 -
 test/e2e/suite-annotations/cors.go |  85 
 test/e2e/suite-annotations/csrf.go |  54 -
 test/e2e/suite-annotations/forward_auth.go |  43 +---
 test/e2e/suite-annotations/http_method.go  |  70 ---
 test/e2e/suite-annotations/iprestriction.go|  58 --
 test/e2e/suite-annotations/plugin_conifg.go|  29 ---
 test/e2e/suite-annotations/redirect.go | 115 +--
 test/e2e/suite-annotations/response_rewrite.go |  99 -
 test/e2e/suite-annotations/rewrite.go  |  59 --
 test/e2e/suite-annotations/svc_namespace.go|  78 
 test/e2e/suite-annotations/upstreamprotocol.go |  33 ---
 test/e2e/suite-annotations/websocket.go|  84 
 test/e2e/suite-chore/consistency.go|  54 -
 test/e2e/suite-features/external-service.go|   3 +-
 .../suite-ingress-resource/ingress.go  | 152 +-
 .../suite-ingress/suite-ingress-resource/ssl.go| 221 +
 46 files changed, 278 insertions(+), 1889 deletions(-)
 rename pkg/utils/{s2b_new.go => s2b.go} (100%)
 delete mode 100644 pkg/utils/s2b_old.go



[apisix-ingress-controller] 01/01: chore(deps): bump google.golang.org/grpc in /test/e2e

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch 
dependabot/go_modules/test/e2e/google.golang.org/grpc-1.53.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git

commit 3579f18ac562c66a57d8a6dc940b9b7045e7fc19
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Aug 4 06:52:56 2023 +

chore(deps): bump google.golang.org/grpc in /test/e2e

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.42.0 
to 1.53.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.42.0...v1.53.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 test/e2e/go.mod |  4 ++--
 test/e2e/go.sum | 13 -
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
index 445e695f..6f8cdfcb 100644
--- a/test/e2e/go.mod
+++ b/test/e2e/go.mod
@@ -119,8 +119,8 @@ require (
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.11.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
-   google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // 
indirect
-   google.golang.org/grpc v1.42.0 // indirect
+   google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // 
indirect
+   google.golang.org/grpc v1.53.0 // indirect
google.golang.org/grpc/examples v0.0.0-2029181224-d542bfcee46d // 
indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
diff --git a/test/e2e/go.sum b/test/e2e/go.sum
index 329aadb1..d3ab9bc6 100644
--- a/test/e2e/go.sum
+++ b/test/e2e/go.sum
@@ -24,7 +24,6 @@ github.com/bytedance/sonic v1.9.1 
h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s
 github.com/bytedance/sonic v1.9.1/go.mod 
h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod 
h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod 
h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod 
h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 
h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod 
h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod 
h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
@@ -36,11 +35,7 @@ github.com/chzyer/test 
v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/client9/misspell v0.3.4/go.mod 
h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod 
h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod 
h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod 
h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod 
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod 
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod 
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod 
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod 
h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 
h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod 
h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -59,7 +54,6 @@ github.com/envoyproxy/go-control-plane 
v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod 
h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane 
v0.9.9-0.20201210154907-fd9021fe5dad/go.mod 
h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane 
v0.9.9-0.20210512163311-63b5d3c536b0/go.mod 
h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane 
v0.9.10-0.20210907150352-cf90f659a021/go.mod 
h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod 
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.12.0+incompatible 
h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
 github.com/fatih/color v1.9.0/go.mod 
h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
@@ -459,8 +453,9 @@ google.golang.org/genproto 
v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 

[apisix-ingress-controller] branch dependabot/go_modules/test/e2e/github.com/eclipse/paho.mqtt.golang-1.4.3 updated (e3c84adc -> c65d35f2)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/test/e2e/github.com/eclipse/paho.mqtt.golang-1.4.3
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 discard e3c84adc chore(deps): bump github.com/eclipse/paho.mqtt.golang in 
/test/e2e
 add f2ae01a7 chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4 
(#1917)
 add c65d35f2 chore(deps): bump github.com/eclipse/paho.mqtt.golang in 
/test/e2e

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e3c84adc)
\
 N -- N -- N   
refs/heads/dependabot/go_modules/test/e2e/github.com/eclipse/paho.mqtt.golang-1.4.3
 (c65d35f2)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 go.mod  | 35 +++--
 go.sum  | 69 +++--
 test/e2e/go.mod | 33 ++-
 test/e2e/go.sum | 67 +--
 4 files changed, 108 insertions(+), 96 deletions(-)



[apisix-ingress-controller] branch dependabot/go_modules/test/e2e/testbackend/google.golang.org/grpc-1.53.0 updated (9d23b569 -> 1c368520)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/test/e2e/testbackend/google.golang.org/grpc-1.53.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


omit 9d23b569 chore(deps): bump google.golang.org/grpc in 
/test/e2e/testbackend
 add c40b664d ci: cron ci must use the logical AND condition (#1850)
 add 8e3104b3 docs: Add QA about exposing gateway as loadbalancer (#1907)
 add 3f45ca99 ci: auto certs and upgrade APISIX to 3.4.1 version (#1911)
 add 3fa789df chore: remove support for Ingress in the extensions/v1beta1 
API version (#1840)
 add 37e9201c chore: Upgrade Go tool chain version 1.19 to version 1.20  
(#1788)
 add f2ae01a7 chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4 
(#1917)
 add 1c368520 chore(deps): bump google.golang.org/grpc in 
/test/e2e/testbackend

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9d23b569)
\
 N -- N -- N   
refs/heads/dependabot/go_modules/test/e2e/testbackend/google.golang.org/grpc-1.53.0
 (1c368520)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e-test-ci-v2-cron-dev.yml  |   8 +-
 .github/workflows/e2e-test-ci-v2-cron.yml  |   4 +-
 .github/workflows/e2e-test-ci.yml  |   4 +-
 .github/workflows/goimports-reviser.yml|   2 +-
 .github/workflows/golangci-lint.yml|   4 +-
 .github/workflows/k8s-timer-ci.yml |   4 +-
 .github/workflows/lint-checker.yml |   2 +-
 .github/workflows/unit-test-ci.yml |   2 +-
 .github/workflows/verify-codegen.yml   |   2 +-
 Dockerfile |   2 +-
 Makefile   |   4 +-
 cmd/ingress/ingress.go |   7 -
 docs/en/latest/FAQ.md  |  15 ++
 docs/en/latest/contribute.md   |   2 +-
 go.mod |  37 ++--
 go.sum |  69 ---
 pkg/config/config.go   |   2 +-
 pkg/kube/ingress.go|  65 +-
 pkg/providers/controller.go|  15 +-
 pkg/providers/ingress/ingress.go   |  45 +
 pkg/providers/ingress/ingress_test.go  |  40 
 pkg/providers/ingress/translation/translator.go| 151 --
 pkg/providers/utils/ingress_status.go  |  43 
 pkg/providers/utils/ingress_status_test.go |  72 ---
 pkg/utils/{s2b_new.go => s2b.go}   |   0
 pkg/utils/s2b_old.go   |  39 
 test/e2e/go.mod|  35 ++--
 test/e2e/go.sum|  67 ---
 test/e2e/scaffold/ssl.go   |  96 -
 test/e2e/suite-annotations/authorization.go|  92 -
 test/e2e/suite-annotations/cors.go |  85 
 test/e2e/suite-annotations/csrf.go |  54 -
 test/e2e/suite-annotations/forward_auth.go |  43 +---
 test/e2e/suite-annotations/http_method.go  |  70 ---
 test/e2e/suite-annotations/iprestriction.go|  58 --
 test/e2e/suite-annotations/plugin_conifg.go|  29 ---
 test/e2e/suite-annotations/redirect.go | 115 +--
 test/e2e/suite-annotations/response_rewrite.go |  99 -
 test/e2e/suite-annotations/rewrite.go  |  59 --
 test/e2e/suite-annotations/svc_namespace.go|  78 
 test/e2e/suite-annotations/upstreamprotocol.go |  33 ---
 test/e2e/suite-annotations/websocket.go|  84 
 test/e2e/suite-chore/consistency.go|  54 -
 test/e2e/suite-features/external-service.go|   3 +-
 .../suite-ingress-resource/ingress.go  | 152 +-
 .../suite-ingress/suite-ingress-resource/ssl.go| 221 +
 46 files changed, 278 insertions(+), 1889 deletions(-)
 rename pkg/utils/{s2b_new.go => s2b.go} (100%)
 delete mode 100644 pkg/utils/s2b_old.go



[apisix-ingress-controller] branch dependabot/go_modules/k8s.io/apimachinery-0.27.4 deleted (was 9d4d32bb)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/k8s.io/apimachinery-0.27.4
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was 9d4d32bb chore(deps): bump k8s.io/apimachinery from 0.27.1 to 0.27.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[apisix-ingress-controller] branch dependabot/go_modules/k8s.io/code-generator-0.27.4 deleted (was 84221101)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/k8s.io/code-generator-0.27.4
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was 84221101 chore(deps): bump k8s.io/code-generator from 0.27.1 to 0.27.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[apisix-ingress-controller] branch dependabot/go_modules/k8s.io/client-go-0.27.4 deleted (was c385b31c)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/k8s.io/client-go-0.27.4
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was c385b31c chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[apisix-ingress-controller] branch dependabot/go_modules/test/e2e/k8s.io/apimachinery-0.27.4 deleted (was 573edba7)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/go_modules/test/e2e/k8s.io/apimachinery-0.27.4
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was 573edba7 chore(deps): bump k8s.io/apimachinery from 0.27.3 to 0.27.4 
in /test/e2e

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[apisix-ingress-controller] branch dependabot/go_modules/k8s.io/api-0.27.4 deleted (was e11246b8)

2023-08-04 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/go_modules/k8s.io/api-0.27.4
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was e11246b8 chore(deps): bump k8s.io/api from 0.27.1 to 0.27.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[GitHub] [apisix-ingress-controller] dependabot[bot] commented on pull request #1900: chore(deps): bump k8s.io/apimachinery from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


dependabot[bot] commented on PR #1900:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1900#issuecomment-1665099440

   OK, I won't notify you again about this release, but will get in touch when 
a new version is available. If you'd rather skip all updates until the next 
major or minor version, let me know by commenting `@dependabot ignore this 
major version` or `@dependabot ignore this minor version`. You can also ignore 
all major, minor, or patch releases for a dependency by adding an [`ignore` 
condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore)
 with the desired `update_types` to your config file.
   
   If you change your mind, just re-open this PR and I'll resolve any conflicts 
on it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] dependabot[bot] commented on pull request #1901: chore(deps): bump k8s.io/apimachinery from 0.27.3 to 0.27.4 in /test/e2e

2023-08-04 Thread via GitHub


dependabot[bot] commented on PR #1901:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1901#issuecomment-1665099449

   OK, I won't notify you again about this release, but will get in touch when 
a new version is available. If you'd rather skip all updates until the next 
major or minor version, let me know by commenting `@dependabot ignore this 
major version` or `@dependabot ignore this minor version`. You can also ignore 
all major, minor, or patch releases for a dependency by adding an [`ignore` 
condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore)
 with the desired `update_types` to your config file.
   
   If you change your mind, just re-open this PR and I'll resolve any conflicts 
on it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] dependabot[bot] commented on pull request #1898: chore(deps): bump k8s.io/api from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


dependabot[bot] commented on PR #1898:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1898#issuecomment-1665099419

   OK, I won't notify you again about this release, but will get in touch when 
a new version is available. If you'd rather skip all updates until the next 
major or minor version, let me know by commenting `@dependabot ignore this 
major version` or `@dependabot ignore this minor version`. You can also ignore 
all major, minor, or patch releases for a dependency by adding an [`ignore` 
condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore)
 with the desired `update_types` to your config file.
   
   If you change your mind, just re-open this PR and I'll resolve any conflicts 
on it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot closed pull request #1901: chore(deps): bump k8s.io/apimachinery from 0.27.3 to 0.27.4 in /test/e2e

2023-08-04 Thread via GitHub


Gallardot closed pull request #1901: chore(deps): bump k8s.io/apimachinery from 
0.27.3 to 0.27.4 in /test/e2e
URL: https://github.com/apache/apisix-ingress-controller/pull/1901


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[apisix-ingress-controller] branch master updated (37e9201c -> f2ae01a7)

2023-08-04 Thread gallardot
This is an automated email from the ASF dual-hosted git repository.

gallardot pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 37e9201c chore: Upgrade Go tool chain version 1.19 to version 1.20  
(#1788)
 add f2ae01a7 chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4 
(#1917)

No new revisions were added by this update.

Summary of changes:
 go.mod  | 35 +++--
 go.sum  | 69 +++--
 test/e2e/go.mod | 33 ++-
 test/e2e/go.sum | 67 +--
 4 files changed, 108 insertions(+), 96 deletions(-)



[GitHub] [apisix-ingress-controller] dependabot[bot] commented on pull request #1899: chore(deps): bump k8s.io/code-generator from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


dependabot[bot] commented on PR #1899:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1899#issuecomment-1665099426

   OK, I won't notify you again about this release, but will get in touch when 
a new version is available. If you'd rather skip all updates until the next 
major or minor version, let me know by commenting `@dependabot ignore this 
major version` or `@dependabot ignore this minor version`. You can also ignore 
all major, minor, or patch releases for a dependency by adding an [`ignore` 
condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore)
 with the desired `update_types` to your config file.
   
   If you change your mind, just re-open this PR and I'll resolve any conflicts 
on it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] dependabot[bot] commented on pull request #1897: chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


dependabot[bot] commented on PR #1897:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1897#issuecomment-1665099413

   OK, I won't notify you again about this release, but will get in touch when 
a new version is available. If you'd rather skip all updates until the next 
major or minor version, let me know by commenting `@dependabot ignore this 
major version` or `@dependabot ignore this minor version`. You can also ignore 
all major, minor, or patch releases for a dependency by adding an [`ignore` 
condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore)
 with the desired `update_types` to your config file.
   
   If you change your mind, just re-open this PR and I'll resolve any conflicts 
on it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot closed pull request #1899: chore(deps): bump k8s.io/code-generator from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


Gallardot closed pull request #1899: chore(deps): bump k8s.io/code-generator 
from 0.27.1 to 0.27.4
URL: https://github.com/apache/apisix-ingress-controller/pull/1899


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot closed pull request #1900: chore(deps): bump k8s.io/apimachinery from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


Gallardot closed pull request #1900: chore(deps): bump k8s.io/apimachinery from 
0.27.1 to 0.27.4
URL: https://github.com/apache/apisix-ingress-controller/pull/1900


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot closed pull request #1897: chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


Gallardot closed pull request #1897: chore(deps): bump k8s.io/client-go from 
0.27.1 to 0.27.4
URL: https://github.com/apache/apisix-ingress-controller/pull/1897


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot closed pull request #1898: chore(deps): bump k8s.io/api from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


Gallardot closed pull request #1898: chore(deps): bump k8s.io/api from 0.27.1 
to 0.27.4
URL: https://github.com/apache/apisix-ingress-controller/pull/1898


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Gallardot merged pull request #1917: chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.4

2023-08-04 Thread via GitHub


Gallardot merged PR #1917:
URL: https://github.com/apache/apisix-ingress-controller/pull/1917


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] monkeyDluffy6017 commented on a diff in pull request #9967: fix: can't sync etcd data if key has special character

2023-08-04 Thread via GitHub


monkeyDluffy6017 commented on code in PR #9967:
URL: https://github.com/apache/apisix/pull/9967#discussion_r1283947575


##
apisix/core/config_etcd.lua:
##
@@ -392,7 +392,7 @@ local function http_waitdir(self, etcd_cli, key, 
modified_index, timeout)
 if tonumber(res.result.header.revision) > self.prev_index then
 local res2
 for _, evt in ipairs(res.result.events) do
-if evt.kv.key:find(key) == 1 then
+if evt.kv.key:find(key, 1, true) == 1 then

Review Comment:
   Use `core_str.find` instead



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Revolyssup commented on issue #9667: help request: opentelemetry plugin with grpc server upstream can't send trace

2023-08-04 Thread via GitHub


Revolyssup commented on issue #9667:
URL: https://github.com/apache/apisix/issues/9667#issuecomment-1665092479

   fixed here - https://github.com/apache/apisix/pull/9606


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix] Revolyssup closed issue #9667: help request: opentelemetry plugin with grpc server upstream can't send trace

2023-08-04 Thread via GitHub


Revolyssup closed issue #9667: help request: opentelemetry plugin with grpc 
server upstream can't send trace
URL: https://github.com/apache/apisix/issues/9667


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



[GitHub] [apisix-ingress-controller] Revolyssup commented on pull request #1876: feat: allow configuring timeout and retries for upstream with ingress

2023-08-04 Thread via GitHub


Revolyssup commented on PR #1876:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/1876#issuecomment-1665078806

   @tao12345666333 How do you  suggest I simulate backend for testing retries 
and timeouts? For retries, I configured an http server on port 8080 that 
responds with 200 on 3rd attempt and the I set the retry to 3, but tests seem 
to fail. Do you have a better approach?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org