pkg/components: Refactor to reduce duplicate code #1845
Conversation
kubevirt-bot
added
the
release-note-none
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kubevirt-bot
added
the
dco-signoff: yes
| var rules []rbacv1.PolicyRule | ||
|
|
||
| rules = append(rules, | ||
| newPolicyRule([]string{""}, []string{"events"}, []string{"update"}), |
There was a problem hiding this comment.
wdyt about this ?
easier to read imo please
newPolicyRule(
[]string{""},
[]string{"events"},
[]string{"update"}
),
There was a problem hiding this comment.
ouch sonar is not happy from that
i guess we dont have a choice
There was a problem hiding this comment.
tried: duplicity went up 18%
perhaps we could use new line only on lines that are too long?
There was a problem hiding this comment.
either that, or just revert to the initial please (better imo)
whatever you prefer
thanks
|
beside cosmetics there are no changes right ? |
It's only a refactor. No logic changed. |
kubevirt-bot
added
the
needs-rebase
pkg/components/components.go
Outdated
| var rules []rbacv1.PolicyRule | ||
|
|
||
| rules = append(rules, | ||
| newPolicyRule([]string{"apps"}, []string{"daemonsets"}, []string{"get", "create", "update", "delete"}), | ||
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"get", "create", "update"}), | ||
| newPolicyRule([]string{"apps"}, []string{"deployments"}, []string{"delete"}), | ||
| newPolicyRule([]string{""}, []string{"namespaces"}, []string{"update", "get", "patch"}), | ||
| newPolicyRule([]string{""}, []string{"serviceaccounts"}, []string{"get", "create", "update", "delete"}), | ||
| newPolicyRule([]string{"monitoring.coreos.com"}, []string{"prometheusrules", "servicemonitors"}, []string{"get", "create", "update", "delete"}), | ||
| newPolicyRule([]string{"rbac.authorization.k8s.io"}, []string{"roles", "rolebindings"}, []string{"get", "create", "update", "delete"}), | ||
| newPolicyRule([]string{"policy"}, []string{"poddisruptionbudgets"}, []string{"get", "delete"}), | ||
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"patch"}), | ||
| newPolicyRule([]string{"coordination.k8s.io"}, []string{"leases"}, []string{"get", "list", "watch", "create", "update", "patch", "delete"}), | ||
| newPolicyRule([]string{"cert-manager.io"}, []string{"certificates", "issuers"}, []string{"get", "create", "update", "delete"}), | ||
| ) |
There was a problem hiding this comment.
why using append? append is pricey. I think you can initialize the slice with the required data; e.g.
| var rules []rbacv1.PolicyRule | |
| rules = append(rules, | |
| newPolicyRule([]string{"apps"}, []string{"daemonsets"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"get", "create", "update"}), | |
| newPolicyRule([]string{"apps"}, []string{"deployments"}, []string{"delete"}), | |
| newPolicyRule([]string{""}, []string{"namespaces"}, []string{"update", "get", "patch"}), | |
| newPolicyRule([]string{""}, []string{"serviceaccounts"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"monitoring.coreos.com"}, []string{"prometheusrules", "servicemonitors"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"rbac.authorization.k8s.io"}, []string{"roles", "rolebindings"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"policy"}, []string{"poddisruptionbudgets"}, []string{"get", "delete"}), | |
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"patch"}), | |
| newPolicyRule([]string{"coordination.k8s.io"}, []string{"leases"}, []string{"get", "list", "watch", "create", "update", "patch", "delete"}), | |
| newPolicyRule([]string{"cert-manager.io"}, []string{"certificates", "issuers"}, []string{"get", "create", "update", "delete"}), | |
| ) | |
| rules := []rbacv1.PolicyRule{ | |
| newPolicyRule([]string{"apps"}, []string{"daemonsets"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"get", "create", "update"}), | |
| newPolicyRule([]string{"apps"}, []string{"deployments"}, []string{"delete"}), | |
| newPolicyRule([]string{""}, []string{"namespaces"}, []string{"update", "get", "patch"}), | |
| newPolicyRule([]string{""}, []string{"serviceaccounts"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"monitoring.coreos.com"}, []string{"prometheusrules", "servicemonitors"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"rbac.authorization.k8s.io"}, []string{"roles", "rolebindings"}, []string{"get", "create", "update", "delete"}), | |
| newPolicyRule([]string{"policy"}, []string{"poddisruptionbudgets"}, []string{"get", "delete"}), | |
| newPolicyRule([]string{""}, []string{"configmaps"}, []string{"patch"}), | |
| newPolicyRule([]string{"coordination.k8s.io"}, []string{"leases"}, []string{"get", "list", "watch", "create", "update", "patch", "delete"}), | |
| newPolicyRule([]string{"cert-manager.io"}, []string{"certificates", "issuers"}, []string{"get", "create", "update", "delete"}), | |
| } |
pkg/components/components.go
Outdated
| } | ||
| return role | ||
| } | ||
|
|
||
| func GetClusterRole(allowMultus bool) *rbacv1.ClusterRole { | ||
| var rules []rbacv1.PolicyRule |
pkg/components/components.go
Outdated
| var rules []rbacv1.PolicyRule | ||
|
|
||
| rules = append(rules, |
RamLavi
force-pushed
the
refactor_components
branch
from
5d31b26
to
6896c42
Compare
kubevirt-bot
removed
the
needs-rebase
RamLavi
force-pushed
the
refactor_components
branch
from
6896c42
to
968a49b
Compare
|
/hold |
kubevirt-bot
added
the
do-not-merge/hold
if any are left out, tests should find it, or we are missing tests, or those arent needed anymore |
|
you didnt rebase correctly, please check it Those need to be included please: |
thanks! |
This is done in order to eliminate sonarCloud issue. Signed-off-by: Ram Lavi <[email protected]>
RamLavi
force-pushed
the
refactor_components
branch
from
968a49b
to
cc6fe21
Compare
|
|
@RamLavi: The following tests failed, say
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
What this PR does / why we need it:
currently sonarCloud reports a lot of code is duplicate on pkg/components (37.6%).
Refactoring the code to reduce duplicate to 0% and make thing more clear (all policies are visible in one screen, no endless scrolling).
Special notes for your reviewer:
Release note: