CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

I have read the CLA Document and I hereby sign the CLA

Is app.label a json?

i.e

{
  "ip": "10.240.50.100",
  "appId": "my-app-id"
}

Codecov Report

Merging #4013 (9fcc535) into master (8484178) will increase coverage by 0.08%.
The diff coverage is 70.33%.

@@             Coverage Diff              @@
##             master    #4013      +/-   ##
============================================
+ Coverage     51.46%   51.54%   +0.08%     
- Complexity     2524     2533       +9     
============================================
  Files           484      484              
  Lines         14798    14839      +41     
  Branches       1532     1537       +5     
============================================
+ Hits           7616     7649      +33     
- Misses         6652     6658       +6     
- Partials        530      532       +2     

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3d0925f...9fcc535. Read the comment docs.

Is app.label a json?

i.e

{
  "ip": "10.240.50.100",
  "appId": "my-app-id"
}

Yes, the storage format of app.label is the same as app.ip

BTW, please also update the CHANGES.md

BTW, please also update the CHANGES.md

Thank you for your review, I have modified according to your comments.

BTW, please also update the CHANGES.md

Thank you for your review, I have modified according to your comments.

Looks great now!
One last thing about the bug mentioned, I think the correct behavior when user switches from apply to all instance to apply to some instance is to reset the selections from * to empty, just like when user creates a new rule.

Current behavior

Expected behavior

How about use config

apollo.labels.ip=xxx
apollo.labels.zone=beijing
apollo.labels.bu=pay

to represent

{
  "ip": "xxx",
  "zone": "beijing",
  "bu": "pay"
}

i.e User can write multiple lines instead of write all in one line.

One line is represent a key value pair.

In spring, the properties class is

@ConfigurationProperties(prefix = "apollo")
public class ApolloLabelsProperties {
  private Map<String, String> labels;
}

labels will load on runtime.

We can manually load it without spring.

How about use config

apollo.labels.ip=xxx
apollo.labels.zone=beijing
apollo.labels.bu=pay

to represent

{
  "ip": "xxx",
  "zone": "beijing",
  "bu": "pay"
}

i.e User can write multiple lines instead of write all in one line.

One line is represent a key value pair.

In spring, the properties class is

@ConfigurationProperties(prefix = "apollo")
public class ApolloLabelsProperties {
  private Map<String, String> labels;
}

labels will load on runtime.

We can manually load it without spring.

Sorry, the previous question was answered incorrectly, label is just a string, not json.

@Anilople

The implementation of the summer 2021 task is a little different from what we previously discussed:

1. label name is system defined instead of user defined
   • e.g. user can only config apollo.label=xx instead of some customized names like my-label=xx
2. the relationship between label and ip is OR instead of AND
   • e.g. the actual rule for the following screenshot is ip in ('1.2.3.4', '3.4.5.6') or label in ('a', 'b')
   • 

The above 2 differences might make the rules not that powerful but I think it's acceptable since it also makes the rules easy to maintain and understand. What do you think?

@Anilople

The implementation of the summer 2021 task is a little different from what we previously discussed:

1. label name is system defined instead of user defined

   • e.g. user can only config apollo.label=xx instead of some customized names like my-label=xx

2. the relationship between label and ip is OR instead of AND

   • e.g. the actual rule for the following screenshot is ip in ('1.2.3.4', '3.4.5.6') or label in ('a', 'b')
   • 

The above 2 differences might make the rules not that powerful but I think it's acceptable since it also makes the rules easy to maintain and understand. What do you think?

A single label also can implement the function which multiple custom labels have.

And it's acceptable and very easy to maintain and understand. Multiple custom labels seems a little complex.

I agree that.

LGTM

Thank you very much for your review. I am very honored to choose Apollo in the Summer-2021. I really learned a lot during this event. I hope I can contribute to Apollo in the future.