chore: lint issues

Author: isometry

internal/controller/clustertoken_controller.go

@@ -55,12 +55,12 @@ type ClusterTokenReconciler struct {
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 func (r *ClusterTokenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
-	log := log.FromContext(ctx)
+	logger := log.FromContext(ctx)
 
 	if app == nil {
 		app, err = ghapp.NewGHApp(ctx)
 		if err != nil {
-			log.Error(err, "failed to load GitHub App credentials")
+			logger.Error(err, "failed to load GitHub App credentials")
 			return ctrl.Result{RequeueAfter: time.Minute}, err
 		}
 	}
@@ -70,26 +70,26 @@ func (r *ClusterTokenReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	options := []tm.Option{
 		tm.WithReconciler(r),
 		tm.WithGHApp(app),
-		tm.WithLogger(log),
+		tm.WithLogger(logger),
 	}
 
 	tokenSecret, err := tm.NewTokenSecret(ctx, req.NamespacedName, token, options...)
 	if err != nil {
-		log.Error(err, "failed to create ClusterToken reconciler")
+		logger.Error(err, "failed to create ClusterToken reconciler")
 		return ctrl.Result{}, err
 	}
 
 	if tokenSecret == nil {
-		log.Info("ClusterToken not found, skipping reconciliation")
+		logger.Info("ClusterToken not found, skipping reconciliation")
 		return ctrl.Result{}, nil
 	}
 
 	result, err = tokenSecret.Reconcile()
 	if err != nil {
-		log.Error(err, "failed to reconcile ClusterToken")
+		logger.Error(err, "failed to reconcile ClusterToken")
 		return result, err
 	}
-	log.Info("reconciled", "requeueAfter", result.RequeueAfter)
+	logger.Info("reconciled", "requeueAfter", result.RequeueAfter)
 	return result, nil
 }
 

internal/controller/token_controller.go

@@ -55,12 +55,12 @@ type TokenReconciler struct {
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 func (r *TokenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
-	log := log.FromContext(ctx)
+	logger := log.FromContext(ctx)
 
 	if app == nil {
 		app, err = ghapp.NewGHApp(ctx)
 		if err != nil {
-			log.Error(err, "failed to load GitHub App credentials")
+			logger.Error(err, "failed to load GitHub App credentials")
 			return ctrl.Result{RequeueAfter: time.Minute}, err
 		}
 	}
@@ -69,26 +69,26 @@ func (r *TokenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resu
 	options := []tm.Option{
 		tm.WithReconciler(r),
 		tm.WithGHApp(app),
-		tm.WithLogger(log),
+		tm.WithLogger(logger),
 	}
 
 	tokenSecret, err := tm.NewTokenSecret(ctx, req.NamespacedName, token, options...)
 	if err != nil {
-		log.Error(err, "failed to create Token reconciler")
+		logger.Error(err, "failed to create Token reconciler")
 		return ctrl.Result{}, err
 	}
 
 	if tokenSecret == nil {
-		log.Info("Token not found, skipping reconciliation")
+		logger.Info("Token not found, skipping reconciliation")
 		return ctrl.Result{}, nil
 	}
 
 	result, err = tokenSecret.Reconcile()
 	if err != nil {
-		log.Error(err, "failed to reconcile Token")
+		logger.Error(err, "failed to reconcile Token")
 		return result, err
 	}
-	log.Info("reconciled", "requeueAfter", result.RequeueAfter)
+	logger.Info("reconciled", "requeueAfter", result.RequeueAfter)
 	return result, nil
 }
 

internal/ghapp/config.go

@@ -41,7 +41,7 @@ func (c *OperatorConfig) GetKey() string {
 const TokenValidity = time.Hour
 
 func LoadConfig(ctx context.Context) (*OperatorConfig, error) {
-	log := log.FromContext(ctx)
+	logger := log.FromContext(ctx)
 
 	viper.AutomaticEnv()
 	viper.SetEnvPrefix("GTM")
@@ -60,7 +60,7 @@ func LoadConfig(ctx context.Context) (*OperatorConfig, error) {
 		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
 			return nil, fmt.Errorf("error reading configuration file: %w", err)
 		} else {
-			log.Info("no configuration file found, continuing with environment variables only")
+			logger.Info("no configuration file found, continuing with environment variables only")
 		}
 	}
 

internal/ghapp/ghapp.go

@@ -9,14 +9,14 @@ import (
 )
 
 func NewGHApp(ctx context.Context) (ghait.GHAIT, error) {
-	log := log.FromContext(ctx)
+	logger := log.FromContext(ctx)
 
 	cfg, err := LoadConfig(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("configuration: %w", err)
 	}
 
-	log.Info("loaded configuration", "config", cfg)
+	logger.Info("loaded configuration", "config", cfg)
 
 	ghapp, err := ghait.NewGHAIT(ctx, cfg)
 	if err != nil {

internal/tokenmanager/token_secret.go

@@ -43,9 +43,9 @@ func WithReconciler(reconciler tokenReconciler) Option {
 	}
 }
 
-func WithGHApp(ghait ghait.GHAIT) Option {
+func WithGHApp(g ghait.GHAIT) Option {
 	return func(s *tokenSecret) {
-		s.ghait = ghait
+		s.ghait = g
 	}
 }