diff --git a/pkg/controller/apply/apply.go b/pkg/controller/apply/apply.go index dad1417..c5349a4 100644 --- a/pkg/controller/apply/apply.go +++ b/pkg/controller/apply/apply.go @@ -129,7 +129,7 @@ func (a *applier) Apply(ctx context.Context, obj ctrlclient.Object, opts ...Opti f(applyOpts) } - // added to preserve backward compatability with other code + // added to preserve backward compatibility with other code if !applyOpts.UseUpdate { applyOpts.UseUpdate = isApplyUpdate(obj) } diff --git a/pkg/controller/util/patch.go b/pkg/controller/util/patch.go index 08ce949..dcab125 100644 --- a/pkg/controller/util/patch.go +++ b/pkg/controller/util/patch.go @@ -28,7 +28,7 @@ func isKnowMergePatchGroup(gvk schema.GroupVersionKind) bool { return false } -// IsStrategicMergePatch returns true if gvk is present in the registerd scheme +// IsStrategicMergePatch returns true if gvk is present in the registered scheme func IsStrategicMergePatch(gvk schema.GroupVersionKind) bool { return scheme.Scheme.Recognizes(gvk) && !isKnowMergePatchGroup(gvk) } @@ -59,7 +59,7 @@ func CreateStrategicMergePatch(gvk schema.GroupVersionKind, original, current, m return ret, err } -// ApplyStrategicMergePatch applies strategic merge patch on orginal +// ApplyStrategicMergePatch applies strategic merge patch on original func ApplyStrategicMergePatch(gvk schema.GroupVersionKind, original, patch []byte) ([]byte, error) { obj, err := scheme.Scheme.New(gvk) if err != nil { diff --git a/pkg/gateway/httpbody.go b/pkg/gateway/httpbody.go index 7b5e689..dd5fce9 100644 --- a/pkg/gateway/httpbody.go +++ b/pkg/gateway/httpbody.go @@ -20,7 +20,7 @@ func NewHTTPBodyMarshaler() runtime.Marshaler { } } -// ContentType implementation to keep backwards compatability with marshal interface +// ContentType implementation to keep backwards compatibility with marshal interface func (h *httpBodyMarshaler) ContentType(v interface{}) string { return h.ContentTypeFromMessage(nil) } diff --git a/pkg/sentry/authz/authz.go b/pkg/sentry/authz/authz.go index 2c2b087..e67fac6 100644 --- a/pkg/sentry/authz/authz.go +++ b/pkg/sentry/authz/authz.go @@ -559,7 +559,7 @@ func GetAuthorization(ctx context.Context, req *sentryrpc.GetUserAuthorizationRe return nil, err } - rp := sentry.GetKubeConfigPermissionPrivilage(permission) + rp := sentry.GetKubeConfigPermissionPrivilege(permission) if rp > rolePrevilage { rolePrevilage = rp highestRole = permission @@ -574,7 +574,7 @@ func GetAuthorization(ctx context.Context, req *sentryrpc.GetUserAuthorizationRe } for _, permission := range permissions { - rp := sentry.GetKubeConfigPermissionPrivilage(permission) + rp := sentry.GetKubeConfigPermissionPrivilege(permission) if rp > rolePrevilage { rolePrevilage = rp highestRole = permission @@ -787,7 +787,7 @@ func verifyClusterKubectlSettings(ctx context.Context, bs service.BootstrapServi } if cnAttr.SessionType == "" || cnAttr.SessionType == kubeconfig.TerminalShell { - // backward combatibility treat "" as terminal session for old kubeconfigs + // backward compatibility treat "" as terminal session for old kubeconfigs if kc.DisableCLIKubectl { _log.Infow("kubectl cli is not authorized for ", "cnAttr", cnAttr) return fmt.Errorf("kubectl cli is not authorized") //deny @@ -815,7 +815,7 @@ func verifyKubectlSettings(cnAttr kubeconfig.CNAttributes, ks *sentry.Kubeconfig } if cnAttr.SessionType == "" || cnAttr.SessionType == kubeconfig.TerminalShell { - // backward combatibility treat "" as terminal session for old kubeconfigs + // backward compatibility treat "" as terminal session for old kubeconfigs if ks.DisableCLIKubectl { _log.Infow("kubectl cli is not authorized for ", "cnAttr", cnAttr, " by ", level, "config") return fmt.Errorf("kubectl cli is not authorized" + " by " + level + "config") //deny diff --git a/pkg/sentry/kubeconfig/kubeconfig.go b/pkg/sentry/kubeconfig/kubeconfig.go index 81e101a..f3c3196 100644 --- a/pkg/sentry/kubeconfig/kubeconfig.go +++ b/pkg/sentry/kubeconfig/kubeconfig.go @@ -177,7 +177,7 @@ func GetConfigForUser(ctx context.Context, bs service.BootstrapService, aps serv org, err := os.GetByName(ctx, opts.Organization) if err != nil { _log.Errorw("error getting organization data", "error", err.Error()) - return nil, fmt.Errorf("failed to retrieve organziation %s", err.Error()) + return nil, fmt.Errorf("failed to retrieve organization %s", err.Error()) } oid = uuid.MustParse(org.Metadata.Id) opts.Organization = oid.String() diff --git a/pkg/service/metro_test.go b/pkg/service/metro_test.go index 5f01f21..180d42e 100644 --- a/pkg/service/metro_test.go +++ b/pkg/service/metro_test.go @@ -106,7 +106,7 @@ func TestMetroDeleteNonExist(t *testing.T) { } _, err := ps.Delete(context.Background(), metro) if err == nil { - t.Fatal("deleted non existant metro") + t.Fatal("deleted non existent metro") } } diff --git a/proto/types/sentry/constants.go b/proto/types/sentry/constants.go index dc70c37..c69a2f0 100644 --- a/proto/types/sentry/constants.go +++ b/proto/types/sentry/constants.go @@ -46,8 +46,8 @@ func GetKubeConfigPermissionIsRead(permission string) bool { return false } -// GetKubeConfigPermissionPrivilage privilage order -func GetKubeConfigPermissionPrivilage(permission string) int { +// GetKubeConfigPermissionprivilege privilege order +func GetKubeConfigPermissionPrivilege(permission string) int { switch permission { case KubeconfigReadPermission: return 0 diff --git a/server/relaypeerservice.go b/server/relaypeerservice.go index 0b95b08..b5223ed 100644 --- a/server/relaypeerservice.go +++ b/server/relaypeerservice.go @@ -25,14 +25,14 @@ import ( // - Each relay object has a survey send chnl. Use this chnl to send survey requests. // - Each relay obect has a probe chnl. Use this chnl to send probe response -//used for survey broadcasting +// used for survey broadcasting type surveyBroadCastRequest struct { clustersni string relayuuid string // relay requsting the survey ou string } -//used to maintain list of connected relays +// used to maintain list of connected relays type relayObject struct { timeStamp int64 refCnt uint8 @@ -42,7 +42,7 @@ type relayObject struct { surveyRequestChnl chan sentryrpc.PeerSurveyRequest } -//relayPeerService relay peer service +// relayPeerService relay peer service type relayPeerService struct { cert []byte // rpc server certifciate key []byte // rpc server key @@ -138,7 +138,7 @@ func RunRelaySurveyHandler(stop <-chan struct{}, svc interface{}) { } } -//process the survey request. +// process the survey request. func (s *relayPeerService) handleSurveyReq(req surveyBroadCastRequest) { // Get All relay objects // Send survey request to all. @@ -253,7 +253,7 @@ func (s *relayPeerService) handleSurveyReq(req surveyBroadCastRequest) { } -//maintains the timestamp of relays heart beat +// maintains the timestamp of relays heart beat func (s *relayPeerService) updateRelayIfExist(relayuuid, ou string) bool { s.relayMutex.RLock() defer s.relayMutex.RUnlock() @@ -332,7 +332,7 @@ func (s *relayPeerService) handleHelloRequest(relayuuid, relayip, ou string) { s.insertRelayObject(robj, relayuuid, ou) } -//getServiceIP .. +// getServiceIP .. func getServiceIP() string { name, err := os.Hostname() if err == nil { @@ -344,7 +344,7 @@ func getServiceIP() string { return "" } -//RelayPeerHelloRPC handles PeerHelloMsg +// RelayPeerHelloRPC handles PeerHelloMsg func (s *relayPeerService) RelayPeerHelloRPC(stream sentryrpc.RelayPeerService_RelayPeerHelloRPCServer) error { _log.Infow("RelayPeerHelloRPC stream") name, err := grpc.GetClientName(stream.Context()) @@ -382,7 +382,7 @@ func (s *relayPeerService) RelayPeerHelloRPC(stream sentryrpc.RelayPeerService_R } } -//relayPeerProbeSender send routine to handle sending probe messges +// relayPeerProbeSender send routine to handle sending probe messges func (s *relayPeerService) relayPeerProbeSender(ctx context.Context, stream sentryrpc.RelayPeerService_RelayPeerProbeRPCServer, relayuuid string, robj *relayObject) { for { select { @@ -399,7 +399,7 @@ func (s *relayPeerService) relayPeerProbeSender(ctx context.Context, stream sent } } -//try to fill the response form cache +// try to fill the response form cache func (s *relayPeerService) tryResponseFromCache(relayuuid, clustersni, ou string) bool { var relayids []string var connInfo []*sentryrpc.RelayClusterConnectionInfo @@ -445,7 +445,7 @@ func (s *relayPeerService) tryResponseFromCache(relayuuid, clustersni, ou string return false } -//RelayPeerProbeRPC handles PeerHelloMsg +// RelayPeerProbeRPC handles PeerHelloMsg func (s *relayPeerService) RelayPeerProbeRPC(stream sentryrpc.RelayPeerService_RelayPeerProbeRPCServer) error { var initSend bool @@ -495,7 +495,7 @@ func (s *relayPeerService) RelayPeerProbeRPC(stream sentryrpc.RelayPeerService_R continue } - // find respone either from cache or via survey + // find response either from cache or via survey go func() { if clustersni != "" && relayuuid != "" { if !s.tryResponseFromCache(relayuuid, clustersni, ou) { @@ -514,7 +514,7 @@ func (s *relayPeerService) RelayPeerProbeRPC(stream sentryrpc.RelayPeerService_R } -//relayPeerSurveySender send routine to handle sending probe messges +// relayPeerSurveySender send routine to handle sending probe messges func (s *relayPeerService) relayPeerSurveySender(ctx context.Context, stream sentryrpc.RelayPeerService_RelayPeerSurveyRPCServer, relayuuid string, robj *relayObject) { _log.Debugw("started relayPeerSurveySender") for { @@ -533,7 +533,7 @@ func (s *relayPeerService) relayPeerSurveySender(ctx context.Context, stream sen } } -//RelayPeerSurveyRPC handles relay survey rpc +// RelayPeerSurveyRPC handles relay survey rpc func (s *relayPeerService) RelayPeerSurveyRPC(stream sentryrpc.RelayPeerService_RelayPeerSurveyRPCServer) error { var initSend bool