Set label filter to nil when it's empty string #70
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -664,7 +664,15 @@ func deduplicateFilters(filters []acpv1.Selector) []acpv1.Selector { | |||
| } | |||
| } | |||
| if !findDuplicate { | |||
| result = append(result, filters[i]) | |||
| labelFilter := filters[i].LabelFilter | |||
There was a problem hiding this comment.
I don't think we should do the conversion while deduplicating the selectors, we need to do it more straightforwardly.
There was a problem hiding this comment.
And what about the label for the sentinel?
| @@ -106,9 +106,9 @@ type RefreshMonitoring struct { | |||
|
|
|||
| // Defines the keyValues to be watched. | |||
| type Sentinel struct { | |||
| Key string `json:"key"` | |||
| Key *string `json:"key"` | |||
There was a problem hiding this comment.
Key should not be nullable.
| return results | ||
| } | ||
|
|
||
| func processEmptyLabelFilter(filters []acpv1.Selector) []acpv1.Selector { |
There was a problem hiding this comment.
How about rename to "normalizeLableFilter"?
| @@ -643,6 +644,40 @@ func GetFeatureFlagFilters(acpSpec acpv1.AzureAppConfigurationProviderSpec) []ac | |||
| return featureFlagFilters | |||
| } | |||
|
|
|||
| func getSentinels(sentinels []acpv1.Sentinel) []acpv1.Sentinel { | |||
There was a problem hiding this comment.
How about rename to "normalizeSentinels" ?
| @@ -88,15 +88,15 @@ func (s *EtagSettingsClient) GetSettings(ctx context.Context, client *azappconfi | |||
| } | |||
|
|
|||
| func (s *SentinelSettingsClient) GetSettings(ctx context.Context, client *azappconfig.Client) (*SettingsResponse, error) { | |||
| sentinelSetting, err := client.GetSetting(ctx, s.sentinel.Key, &azappconfig.GetSettingOptions{Label: &s.sentinel.Label, OnlyIfChanged: s.etag}) | |||
| sentinelSetting, err := client.GetSetting(ctx, s.sentinel.Key, &azappconfig.GetSettingOptions{Label: s.sentinel.Label, OnlyIfChanged: s.etag}) | |||
There was a problem hiding this comment.
We need to do the same as SelectorSettingsClient, if label is nil, set it to \x00
RichardChen820
approved these changes
Oct 10, 2024
linglingye001
added a commit
that referenced
this pull request
Nov 8, 2024
* set label filter to nil when it is empty string * process empty label of sentinels * update * update * resolve comments * update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.