Rename and remove commented code

Author: tkashem

pkg/controller/install/deployment.go

@@ -80,7 +80,9 @@ func (c DeploymentInitializerFuncChain) Apply(deployment *appsv1.Deployment) (er
 	return
 }
 
-type DeploymentInitializerFuncBuilder func(owner ownerutil.Owner) DeploymentInitializerFunc
+// DeploymentInitializerBuilderFunc returns a DeploymentInitializerFunc based on
+// the given context.
+type DeploymentInitializerBuilderFunc func(owner ownerutil.Owner) DeploymentInitializerFunc
 
 func NewStrategyDeploymentInstaller(strategyClient wrappers.InstallStrategyDeploymentInterface, templateAnnotations map[string]string, owner ownerutil.Owner, previousStrategy Strategy, initializers DeploymentInitializerFuncChain) StrategyInstaller {
 	return &StrategyDeploymentInstaller{

pkg/controller/install/resolver.go

@@ -29,7 +29,7 @@ type StrategyResolverInterface interface {
 }
 
 type StrategyResolver struct {
-	ProxyInjectorBuilder DeploymentInitializerFuncBuilder
+	ProxyInjectorBuilderFunc DeploymentInitializerBuilderFunc
 }
 
 func (r *StrategyResolver) UnmarshalStrategy(s v1alpha1.NamedInstallStrategy) (strategy Strategy, err error) {
@@ -51,8 +51,8 @@ func (r *StrategyResolver) InstallerForStrategy(strategyName string, opClient op
 		strategyClient := wrappers.NewInstallStrategyDeploymentClient(opClient, opLister, owner.GetNamespace())
 
 		initializers := []DeploymentInitializerFunc{}
-		if r.ProxyInjectorBuilder != nil {
-			initializers = append(initializers, r.ProxyInjectorBuilder(owner))
+		if r.ProxyInjectorBuilderFunc != nil {
+			initializers = append(initializers, r.ProxyInjectorBuilderFunc(owner))
 		}
 
 		return NewStrategyDeploymentInstaller(strategyClient, annotations, owner, previousStrategy, initializers)

pkg/controller/operators/olm/envvar/initializer.go

@@ -63,7 +63,7 @@ func (d *DeploymentInitializer) initialize(ownerCSV ownerutil.Owner, deployment
 	merged = append(podConfigEnvVar, proxyEnvVar...)
 
 	if len(merged) == 0 {
-		d.logger.Debugf("no env var to inject into csv=%s", ownerCSV.GetName())
+		d.logger.WithField("csv", ownerCSV.GetName()).Debug("no env var to inject into csv")
 	}
 
 	podSpec := deployment.Spec.Template.Spec

pkg/controller/operators/olm/operator.go

@@ -407,7 +407,6 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		return nil, err
 	}
 
-
 	// setup proxy env var injection policies
 	discovery := config.operatorClient.KubernetesInterface().Discovery()
 	proxyAPIExists, err := proxy.IsAPIAvailable(discovery)
@@ -416,7 +415,7 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		return nil, err
 	}
 
-	proxyQuerierInUse := proxy.DefaultQuerier()
+	proxyQuerierInUse := proxy.NoopQuerier()
 	if proxyAPIExists {
 		op.logger.Info("OpenShift Proxy API  available - setting up watch for Proxy type")
 
@@ -443,7 +442,7 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 
 	proxyEnvInjector := envvar.NewDeploymentInitializer(op.logger, proxyQuerierInUse, op.lister)
 	op.resolver = &install.StrategyResolver{
-		ProxyInjectorBuilder: proxyEnvInjector.GetDeploymentInitializer,
+		ProxyInjectorBuilderFunc: proxyEnvInjector.GetDeploymentInitializer,
 	}
 
 	return op, nil

pkg/lib/proxy/querier.go

@@ -4,9 +4,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-// DefaultQuerier does...
-func DefaultQuerier() Querier {
-	return &defaultQuerier{}
+// NoopQuerier returns an instance of noopQuerier. It's used for upstream where
+// we don't have any cluster proxy configuration.
+func NoopQuerier() Querier {
+	return &noopQuerier{}
 }
 
 // Querier is an interface that wraps the QueryProxyConfig method.
@@ -16,11 +17,11 @@ type Querier interface {
 	QueryProxyConfig() (proxy []corev1.EnvVar, err error)
 }
 
-type defaultQuerier struct {
+type noopQuerier struct {
 }
 
 // QueryProxyConfig returns no env variable(s), err is set to nil to indicate
 // that the cluster has no global proxy configuration.
-func (*defaultQuerier) QueryProxyConfig() (proxy []corev1.EnvVar, err error) {
+func (*noopQuerier) QueryProxyConfig() (proxy []corev1.EnvVar, err error) {
 	return
 }

test/e2e/subscription_e2e_test.go

@@ -1120,11 +1120,9 @@ func TestCreateNewSubscriptionWithPodConfig(t *testing.T) {
 
 	newConfigClient := func(t *testing.T) configv1client.ConfigV1Interface {
 		config, err := clientcmd.BuildConfigFromFlags("", *kubeConfigPath)
-		// require.NoErrorf(t, err, "could not create rest config: %s", err.Error())
 		require.NoError(t, err,)
 
 		client, err := configv1client.NewForConfig(config)
-		// require.NoErrorf(t, err, "error creating OpenShift Config client: %s", err.Error())
 		require.NoError(t, err)
 
 		return client