-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature: podLabels and podAnnotations #36
Merged
MegaByte875
merged 2 commits into
vesoft-inc:master
from
veezhang:feature-podLabels-podAnnotations
Jun 28, 2021
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /* | ||
| Copyright 2021 Vesoft Inc. | ||
|
|
||
| Licensed 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 v1alpha1 | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
| ) | ||
|
|
||
| func Test_mergeStringMaps(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| overwrite bool | ||
| ms []map[string]string | ||
| expectMap map[string]string | ||
| }{ | ||
| { | ||
| name: "nil", | ||
| overwrite: false, | ||
| ms: nil, | ||
| expectMap: map[string]string{}, | ||
| }, { | ||
| name: "nil maps", | ||
| overwrite: false, | ||
| ms: []map[string]string{nil, nil, nil}, | ||
| expectMap: map[string]string{}, | ||
| }, { | ||
| name: "empty maps", | ||
| overwrite: false, | ||
| ms: []map[string]string{{}, {}, {}}, | ||
| expectMap: map[string]string{}, | ||
| }, { | ||
| name: "nil/empty maps", | ||
| overwrite: false, | ||
| ms: []map[string]string{nil, {}, nil, {}, {}, nil}, | ||
| expectMap: map[string]string{}, | ||
| }, { | ||
| name: "not overwrite", | ||
| overwrite: false, | ||
| ms: []map[string]string{ | ||
| nil, { | ||
| "k1": "v1", | ||
| "k2": "v2", | ||
| }, {}, nil, { | ||
| "k1": "v11", | ||
| "k3": "v3", | ||
| }, nil, {}, | ||
| }, | ||
| expectMap: map[string]string{ | ||
| "k1": "v1", | ||
| "k2": "v2", | ||
| "k3": "v3", | ||
| }, | ||
| }, { | ||
| name: "overwrite", | ||
| overwrite: true, | ||
| ms: []map[string]string{ | ||
| {}, { | ||
| "k1": "v1", | ||
| "k2": "v2", | ||
| }, nil, {}, { | ||
| "k1": "v11", | ||
| "k3": "v3", | ||
| }, {}, nil, | ||
| }, | ||
| expectMap: map[string]string{ | ||
| "k1": "v11", | ||
| "k2": "v2", | ||
| "k3": "v3", | ||
| }, | ||
| }, | ||
| } | ||
| for i, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| got := mergeStringMaps(tc.overwrite, tc.ms...) | ||
| if !reflect.DeepEqual(tc.expectMap, got) { | ||
| t.Errorf("%d: Expected: \n%#v\n but actual: \n%#v\n", | ||
| i, tc.expectMap, got) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func Test_isStringMapExist(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| m map[string]string | ||
| key string | ||
| expectExist bool | ||
| }{ | ||
| { | ||
| name: "nil", | ||
| m: nil, | ||
| key: "k", | ||
| expectExist: false, | ||
| }, { | ||
| name: "empty", | ||
| m: map[string]string{}, | ||
| key: "k", | ||
| expectExist: false, | ||
| }, { | ||
| name: "not exist", | ||
| m: map[string]string{"k": ""}, | ||
| key: "not exist", | ||
| expectExist: false, | ||
| }, { | ||
| name: "exist", | ||
| m: map[string]string{"k": ""}, | ||
| key: "k", | ||
| expectExist: true, | ||
| }, | ||
| } | ||
| for i, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| got := isStringMapExist(tc.m, tc.key) | ||
| if !reflect.DeepEqual(tc.expectExist, got) { | ||
| t.Errorf("%d: Expected: \n%#v\n but actual: \n%#v\n", | ||
| i, tc.expectExist, got) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
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
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
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Binary file not shown.
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
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
Binary file not shown.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a utility function, move it to pkg/util/maputil more better, what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the future, it may come out separately to create a golang mod or repo, so consider making him less dependent.
Or we will provide a golang pkg in the future that does not depend on Nebula Operator?
Or as you said, move it to
pkg/util/maputil?What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need make a plan to refactor this part, you can commit another pr to complete it.