fix: check upstream reference in traffic-split plugin when delete upstream by jiangfucheng · Pull Request #9044 · apache/apisix

jiangfucheng · 2023-03-09T14:34:50Z

Description

Fixes #5339

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 first)

…tream

apisix/admin/upstreams.lua

t/admin/upstream5.t

apisix/admin/upstreams.lua

jiangfucheng · 2023-03-11T10:03:33Z

apisix/admin/upstreams.lua

+    local global_rules = router.global_rules
+    if global_rules and global_rules.values
+        and #global_rules.values > 0 then
+
+        for _, global_rule in config_util.iterate_values(global_rules.values) do
+            if global_rule and global_rule.value
+                and global_rule.value.plugins
+                and up_id_in_plugins(global_rule.value.plugins, id) then
+
                return 400, {error_msg = "can not delete this upstream,"
-                                         .. " service [" .. service.value.id
+                                         .. " plugin in global_rule ["
+                                         .. global_rule.value.id
                                         .. "] is still using it now"}
            end


Perhaps we could refactor this code in a later pull request. We can move the router.global_rules to a separate file named global_rule.lua and use the new global_rules() method to replace the current router.global_rules field. This will ensure consistency with the style of other components. However, I am not very familiar with APISIX's code at present, so I am unsure if this is feasible.

You can give it a try.

jiangfucheng · 2023-03-12T07:44:47Z

@spacewander Fixed all, thanks for reivew.

spacewander · 2023-03-14T01:49:56Z

apisix/admin/upstreams.lua

+        for _, resource in ipairs(resources) do
+            if type(resource) == "table" and resource.value then
+                if up_id_in_plugins(resource.value.plugins, up_id) then
+


Can we remove the extra blank line?

Fixed. Do you have any good tools for automated detection of code formatting errors? I use vscode as my IDE, but haven't found a suitable plugin to do this.

spacewander · 2023-03-14T01:52:35Z

apisix/admin/upstreams.lua

+    local global_rules = router.global_rules
+    if global_rules and global_rules.values
+        and #global_rules.values > 0 then
+
+        for _, global_rule in config_util.iterate_values(global_rules.values) do
+            if global_rule and global_rule.value
+                and global_rule.value.plugins
+                and up_id_in_plugins(global_rule.value.plugins, id) then
+
                return 400, {error_msg = "can not delete this upstream,"
-                                         .. " service [" .. service.value.id
+                                         .. " plugin in global_rule ["
+                                         .. global_rule.value.id
                                         .. "] is still using it now"}
            end


You can give it a try.

spacewander · 2023-03-14T01:55:13Z

apisix/admin/upstreams.lua

+                                         only_check_plugin, resources_name)
+
+    if resources and resources_ver then
+        for _, resource in ipairs(resources) do


Why don't we use config_util.iterate_values?

My mistake, I didn't have a deep enough understanding of the logic here before.

apisix/admin/upstreams.lua

spacewander · 2023-03-16T01:24:17Z

apisix/consumer_group.lua

    end
 end

+function _M.consumer_groups()


Please use two blanks between functions

spacewander · 2023-03-16T01:27:23Z

apisix/admin/upstreams.lua

+local function check_resources_reference(resources, resources_ver, up_id,
+                                         only_check_plugin, resources_name)
+
+    if resources and resources_ver then


Where do we use the resources_ver? It seems checking resources is enough.

jiangfucheng · 2023-03-24T08:25:04Z

@soulbird Hi, could help me reivew this PR?

jiangfucheng · 2023-04-04T09:32:28Z

@monkeyDluffy6017 Hi, this PR still not be merged, could help me merge it?

* upstream/master: (25 commits) fix: upgrade lua-resty-ldap to 0.2.2 (apache#9254) feat(cli): support bypassing Admin API Auth by configuration (apache#9147) fix(ci): write version into xds first (apache#9274) fix: skip warning log when apisix.data_encryption.enable is false (apache#9057) docs: add-api7-information (apache#9260) docs: Fixed typo (apache#9244) docs: clarify what is client.ca in client-to-apisix-mtls.md (apache#9221) docs: Corrected typos and grammatical errors (apache#9216) docs: updated ssl sni parameter requirement in admin-api.md (apache#9176) fix: check upstream reference in traffic-split plugin when delete upstream (apache#9044) docs: Update proxy-rewrite headers.add docs (apache#9220) feat: suppot header injection for fault-injection plugin (apache#9039) fix: upgrade lua-resty-etcd to 1.10.4 (apache#9235) docs: fix incorrect semantic.yml link (apache#9231) feat: Upstream status report (apache#9151) fix: host_hdr should not be false (apache#9150) docs: remove APISIX base instruction (apache#9117) fix(cli): prevent non-`127.0.0.0/24` to access admin api with empty admin_key (apache#9146) docs: fix 404 link (apache#9160) fix(cors): consider using `allow_origins_by_regex` only when it is not `nil` (apache#9028) ...

…tream (apache#9044)

jiangfucheng added 10 commits February 28, 2023 13:15

fix: check upstream reference in traffic-split plugin when delete ups…

7b28914

…tream

fix

e19c7b8

fix

6bf8cfc

fix

d1367f5

fix

398f824

fix

f16d05a

fix

b0ed42f

fix

a6f8083

fix

689bf96

fix

9160274

jiangfucheng changed the title ~~fix: check upstream reference in traffic-split plugin when delete upstream~~ fix: check upstream reference in traffic-split plugin when delete upstream Mar 9, 2023

jiangfucheng force-pushed the fix_5339 branch from 7d5ab9a to c4596c7 Compare March 9, 2023 15:11

spacewander reviewed Mar 10, 2023

View reviewed changes

jiangfucheng force-pushed the fix_5339 branch from 3db17df to 0dcf52f Compare March 11, 2023 09:39

jiangfucheng commented Mar 11, 2023

View reviewed changes

spacewander reviewed Mar 14, 2023

View reviewed changes

jiangfucheng force-pushed the fix_5339 branch 2 times, most recently from 4ec4c55 to 867ed12 Compare March 14, 2023 14:24

spacewander reviewed Mar 16, 2023

View reviewed changes

jiangfucheng force-pushed the fix_5339 branch from ade9f3e to 7b28914 Compare March 19, 2023 08:49

spacewander approved these changes Mar 20, 2023

View reviewed changes

soulbird approved these changes Mar 24, 2023

View reviewed changes

monkeyDluffy6017 merged commit dff1c76 into apache:master Apr 6, 2023

AlinsRan pushed a commit to AlinsRan/apisix that referenced this pull request Jun 25, 2023

fix: check upstream reference in traffic-split plugin when delete ups…

2a727b4

…tream (apache#9044)

jiangfucheng mentioned this pull request Jul 5, 2023

refactor: move global_rules to separate file #9784

Merged

5 tasks

Conversation

jiangfucheng commented Mar 9, 2023

Description

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jiangfucheng commented Mar 12, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jiangfucheng commented Mar 24, 2023

Uh oh!

jiangfucheng commented Apr 4, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants