Standardize variable/function naming to use "Authorization"

Author: trgeiger

cmd/operator-controller/main.go

@@ -409,16 +409,16 @@ func run() error {
 		crdupgradesafety.NewPreflight(aeClient.CustomResourceDefinitions()),
 	}
 
-	acm := applier.NewAuthClientMapper(clientRestConfigMapper, mgr.GetConfig())
+	acm := applier.NewAuthorizationClientMapper(clientRestConfigMapper, mgr.GetConfig())
 	acm.NewForConfig = func(cfg *rest.Config) (authorizationv1client.AuthorizationV1Interface, error) {
 		// *AuthorizationV1Client implements AuthorizationV1Interface
 		return authorizationv1client.NewForConfig(cfg)
 	}
 
 	helmApplier := &applier.Helm{
-		ActionClientGetter: acg,
-		Preflights:         preflights,
-		AuthClientMapper:   acm,
+		ActionClientGetter:        acg,
+		Preflights:                preflights,
+		AuthorizationClientMapper: acm,
 	}
 
 	cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())

internal/operator-controller/applier/helm.go

@@ -60,13 +60,13 @@ type RestConfigMapper func(context.Context, client.Object, *rest.Config) (*rest.
 
 type NewForConfigFunc func(*rest.Config) (authorizationv1client.AuthorizationV1Interface, error)
 
-type AuthClientMapper struct {
+type AuthorizationClientMapper struct {
 	rcm          RestConfigMapper
 	baseCfg      *rest.Config
 	NewForConfig NewForConfigFunc
 }
 
-func (acm *AuthClientMapper) GetAuthenticationClient(ctx context.Context, ext *ocv1.ClusterExtension) (authorizationv1client.AuthorizationV1Interface, error) {
+func (acm *AuthorizationClientMapper) GetAuthorizationClient(ctx context.Context, ext *ocv1.ClusterExtension) (authorizationv1client.AuthorizationV1Interface, error) {
 	authcfg, err := acm.rcm(ctx, ext, acm.baseCfg)
 	if err != nil {
 		return nil, err
@@ -76,13 +76,13 @@ func (acm *AuthClientMapper) GetAuthenticationClient(ctx context.Context, ext *o
 }
 
 type Helm struct {
-	ActionClientGetter helmclient.ActionClientGetter
-	Preflights         []Preflight
-	AuthClientMapper   AuthClientMapper
+	ActionClientGetter        helmclient.ActionClientGetter
+	Preflights                []Preflight
+	AuthorizationClientMapper AuthorizationClientMapper
 }
 
-func NewAuthClientMapper(rcm RestConfigMapper, baseCfg *rest.Config) AuthClientMapper {
-	return AuthClientMapper{
+func NewAuthorizationClientMapper(rcm RestConfigMapper, baseCfg *rest.Config) AuthorizationClientMapper {
+	return AuthorizationClientMapper{
 		rcm:     rcm,
 		baseCfg: baseCfg,
 	}
@@ -110,7 +110,7 @@ func shouldSkipPreflight(ctx context.Context, preflight Preflight, ext *ocv1.Clu
 
 func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1.ClusterExtension, objectLabels map[string]string, storageLabels map[string]string) ([]client.Object, string, error) {
 	if features.OperatorControllerFeatureGate.Enabled(features.PreflightPermissions) {
-		authclient, err := h.AuthClientMapper.GetAuthenticationClient(ctx, ext)
+		authclient, err := h.AuthorizationClientMapper.GetAuthorizationClient(ctx, ext)
 		if err != nil {
 			return nil, "", err
 		}

internal/operator-controller/applier/helm_test.go

@@ -115,13 +115,13 @@ func newPassingSSRRAuthClient() authorizationv1client.AuthorizationV1Interface {
 	}
 }
 
-// Helper builds an AuthClientMapper with the passing SSRR
-func newPassingAuthClientMapper() applier.AuthClientMapper {
+// Helper builds an AuthorizationClientMapper with the passing SSRR
+func newPassingAuthorizationClientMapper() applier.AuthorizationClientMapper {
 	fakeRestConfig := &rest.Config{Host: "fake-server"}
 	mockRCM := func(ctx context.Context, obj client.Object, cfg *rest.Config) (*rest.Config, error) {
 		return cfg, nil
 	}
-	acm := applier.NewAuthClientMapper(mockRCM, fakeRestConfig)
+	acm := applier.NewAuthorizationClientMapper(mockRCM, fakeRestConfig)
 	acm.NewForConfig = func(*rest.Config) (authorizationv1client.AuthorizationV1Interface, error) {
 		return newPassingSSRRAuthClient(), nil
 	}
@@ -131,9 +131,9 @@ func newPassingAuthClientMapper() applier.AuthClientMapper {
 // Helper builds a Helm applier with passing SSRR
 func buildHelmApplier(mockAcg *mockActionGetter, preflights []applier.Preflight) applier.Helm {
 	return applier.Helm{
-		ActionClientGetter: mockAcg,
-		AuthClientMapper:   newPassingAuthClientMapper(),
-		Preflights:         preflights,
+		ActionClientGetter:        mockAcg,
+		AuthorizationClientMapper: newPassingAuthorizationClientMapper(),
+		Preflights:                preflights,
 	}
 }