Skip to content
This repository was archived by the owner on Nov 14, 2024. It is now read-only.

chore: use regex for importas rules #22

Merged
merged 1 commit into from
Sep 16, 2021
Merged

chore: use regex for importas rules #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 6 additions & 48 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,60 +49,18 @@ linters-settings:

importas:
no-unaliased: true
# These primarily come from clientset.go in k8s.io/client-go. Even the
# official Kubernetes codebase has conflicts, though.
alias:
- pkg: k8s.io/api/core/(v[\w\d]+)
alias: core$1
- pkg: k8s.io/api/authorization/(v[\w\d]+)
alias: authorization$1
- pkg: k8s.io/api/(\w+)/(v[\w\d]+)
alias: ${1}${2}

- pkg: k8s.io/apimachinery/pkg/apis/meta/(v[\w\d]+)
alias: meta$1
alias: meta${1}

- pkg: k8s.io/client-go/kubernetes/typed/admissionregistration/(v[\w\d]+)
alias: admissionregistration$1
- pkg: k8s.io/client-go/kubernetes/typed/apps/(v[\w\d]+)
alias: apps$1
- pkg: k8s.io/client-go/kubernetes/typed/authentication/(v[\w\d]+)
alias: authentication$1
- pkg: k8s.io/client-go/kubernetes/typed/authorization/(v[\w\d]+)
alias: authorizationclient$1
- pkg: k8s.io/client-go/kubernetes/typed/autoscaling/(v[\w\d]+)
alias: autoscaling$1
- pkg: k8s.io/client-go/kubernetes/typed/batch/(v[\w\d]+)
alias: batch$1
- pkg: k8s.io/client-go/kubernetes/typed/certificates/(v[\w\d]+)
alias: certificates$1
- pkg: k8s.io/client-go/kubernetes/typed/coordination/(v[\w\d]+)
alias: coordination$1
- pkg: k8s.io/client-go/kubernetes/typed/discovery/(v[\w\d]+)
alias: discovery$1
- pkg: k8s.io/client-go/kubernetes/typed/events/(v[\w\d]+)
alias: events$1
- pkg: k8s.io/client-go/kubernetes/typed/extensions/(v[\w\d]+)
alias: extensions$1
- pkg: k8s.io/client-go/kubernetes/typed/flowcontrol/(v[\w\d]+)
alias: flowcontrol$1
- pkg: k8s.io/client-go/kubernetes/typed/apiserverinternal/(v[\w\d]+)
alias: internal$1
- pkg: k8s.io/client-go/kubernetes/typed/networking/(v[\w\d]+)
alias: networking$1
- pkg: k8s.io/client-go/kubernetes/typed/node/(v[\w\d]+)
alias: node$1
- pkg: k8s.io/client-go/kubernetes/typed/policy/(v[\w\d]+)
alias: policy$1
- pkg: k8s.io/client-go/kubernetes/typed/rbac/(v[\w\d]+)
alias: rbac$1
- pkg: k8s.io/client-go/kubernetes/typed/scheduling/(v[\w\d]+)
alias: scheduling$1
- pkg: k8s.io/client-go/kubernetes/typed/storage/(v[\w\d]+)
alias: storage$1
- pkg: k8s.io/client-go/kubernetes/typed/core/(v[\w\d]+)
alias: typedcore$1
- pkg: k8s.io/client-go/kubernetes/typed/(\w+)/(v[\w\d]+)
alias: ${1}${2}client

- pkg: k8s.io/metrics/pkg/apis/metrics/(v[\w\d]+)
alias: metrics$1
alias: metrics${1}

revive:
# see https://github.com/mgechev/revive#available-rules for details.
Expand Down
4 changes: 2 additions & 2 deletions internal/checks/kube/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
authorizationv1 "k8s.io/api/authorization/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
authorizationclientv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"
rbacutil "k8s.io/kubectl/pkg/util/rbac"
"k8s.io/kubectl/pkg/util/slice"
)
Expand Down Expand Up @@ -194,7 +194,7 @@ func (k *KubernetesChecker) checkRBACFallback(ctx context.Context) []*api.CheckR
return results
}

func (k *KubernetesChecker) checkOneRBACSSAR(ctx context.Context, authClient authorizationclientv1.AuthorizationV1Interface, req *ResourceRequirement, reqVerbs ResourceVerbs) error {
func (k *KubernetesChecker) checkOneRBACSSAR(ctx context.Context, authClient authorizationv1client.AuthorizationV1Interface, req *ResourceRequirement, reqVerbs ResourceVerbs) error {
have := make([]string, 0, len(reqVerbs))
for _, verb := range reqVerbs {
sar := &authorizationv1.SelfSubjectAccessReview{
Expand Down