Fix #575: Replaced deprecated utils.Unmarshal and removed unused variables #579
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
…ed variables Signed-off-by: Shivanshu Gupta <[email protected]>
|
Yay, your first pull request! 👍 A contributor will be by to give feedback soon. In the meantime, please review the Layer5 Community Welcome Guide and sure to join the community Slack. |
|
Thank you, @ShivanshuGupta07! |
|
@ShivanshuGupta07 merge conflicts |
lekaf974
suggested changes
Sep 23, 2024
config/provider/inmem.go
Outdated
| @@ -54,7 +54,8 @@ func (l *InMem) GetKey(key string) string { | |||
| func (l *InMem) GetObject(key string, result interface{}) error { | |||
| l.mutex.Lock() | |||
| defer l.mutex.Unlock() | |||
| return utils.Unmarshal(l.store[key], result) | |||
| //return utils.Unmarshal(l.store[key], result) | |||
There was a problem hiding this comment.
Con you remove this since it is no more used
utils/kubernetes/crd.go
Outdated
| @@ -35,7 +35,8 @@ func GetAllCustomResourcesInCluster(ctx context.Context, client rest.Interface) | |||
| } | |||
| var xcrd CRD | |||
| gvks := []*schema.GroupVersionResource{} | |||
| err = utils.Unmarshal(string(crdresult), &xcrd) | |||
| //err = utils.Unmarshal(string(crdresult), &xcrd) | |||
Signed-off-by: Shivanshu Gupta <[email protected]>
MUzairS15
suggested changes
Sep 26, 2024
| @@ -35,7 +34,7 @@ func GetAllCustomResourcesInCluster(ctx context.Context, client rest.Interface) | |||
| } | |||
| var xcrd CRD | |||
| gvks := []*schema.GroupVersionResource{} | |||
| err = encoding.Unmarshal(crdresult, &xcrd) | |||
There was a problem hiding this comment.
encoding.Unmarshal is not deprecated, in fact recommended to be used.
It is the encoder recently added in Meshkit, which supports both json/yaml.
| @@ -55,7 +54,7 @@ func (l *InMem) GetKey(key string) string { | |||
| func (l *InMem) GetObject(key string, result interface{}) error { | |||
| l.mutex.Lock() | |||
| defer l.mutex.Unlock() | |||
| return encoding.Unmarshal([]byte(l.store[key]), result) | |||
|
@MUzairS15, so no changes are required now? |
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.
Description
This PR fixes #575 by replacing deprecated
utils.Unmarshalwithjson.Unmarshaland removing unused variables from the codebase.Notes for Reviewers
config/provider/inmem.goandutils/kubernetes/crd.go.utils.Unmarshaldoes not impact any other parts of the code that may rely on its specific behavior.Signed commits