Fix some issues

crons.go

@@ -21,7 +21,6 @@ const (
 // by checking the job status to determine if the job just created pod (job starting)
 // or if the job exited
 func runSentryCronsCheckin(ctx context.Context, job *batchv1.Job, eventHandlerType EventHandlerType) error {
-
  hub := sentry.GetHubFromContext(ctx)
  if hub == nil {
  return errors.New("cannot get hub from context")
@@ -45,7 +44,6 @@ func runSentryCronsCheckin(ctx context.Context, job *batchv1.Job, eventHandlerTy
  }
 
  hub.WithScope(func(scope *sentry.Scope) {
-
  // If DSN annotation provided, we bind a new client with that DSN
  client, ok := dsnClientMapping.GetClientFromObject(ctx, &job.ObjectMeta, hub.Client().Options())
  if ok {
@@ -71,7 +69,6 @@ func runSentryCronsCheckin(ctx context.Context, job *batchv1.Job, eventHandlerTy
 
 // Sends the checkin event to sentry crons for when a job starts
 func checkinJobStarting(ctx context.Context, job *batchv1.Job, cronsMonitorData *CronsMonitorData) error {
-
  logger := zerolog.Ctx(ctx)
 
  hub := sentry.GetHubFromContext(ctx)
@@ -101,7 +98,6 @@ func checkinJobStarting(ctx context.Context, job *batchv1.Job, cronsMonitorData
 
 // Sends the checkin event to sentry crons for when a job ends
 func checkinJobEnding(ctx context.Context, job *batchv1.Job, cronsMonitorData *CronsMonitorData) error {
-
  hub := sentry.GetHubFromContext(ctx)
  if hub == nil {
  return errors.New("cannot get hub from context")

crons_monitor_data.go

@@ -34,7 +34,6 @@ type CronsMonitorData struct {
 
 // Constructor for cronsMonitorData
 func NewCronsMonitorData(monitorSlug string, schedule string, completions *int32) *CronsMonitorData {
-
  // Get required number of pods to complete
  var requiredCompletions int32
  if completions == nil {

enhancers.go

@@ -15,7 +15,6 @@ import (
 const breadcrumbLimit = 20
 
 func runEnhancers(ctx context.Context, eventObject *v1.Event, kind string, object metav1.Object, scope *sentry.Scope, sentryEvent *sentry.Event) error {
-
  involvedObject := fmt.Sprintf("%s/%s", kind, object.GetName())
  ctx, logger := getLoggerWithTag(ctx, "object", involvedObject)
  logger.Debug().Msgf("Running the enhancer")
@@ -80,7 +79,6 @@ type KindObjectPair struct {
 }
 
 func findRootOwners(ctx context.Context, kindObjPair *KindObjectPair) ([]KindObjectPair, error) {
-
  // use DFS to find the leaves of the owner references graph
  rootOwners, err := ownerRefDFS(ctx, kindObjPair)
  if err != nil {
@@ -93,12 +91,10 @@ func findRootOwners(ctx context.Context, kindObjPair *KindObjectPair) ([]KindObj
  }
 
  return rootOwners, nil
-
 }
 
 // this function finds performs DFS to find the leaves the owner references graph
 func ownerRefDFS(ctx context.Context, kindObjPair *KindObjectPair) ([]KindObjectPair, error) {
-
  parents := kindObjPair.object.GetOwnerReferences()
  // the owners slice to be returned
  rootOwners := []KindObjectPair{}
@@ -130,7 +126,6 @@ func ownerRefDFS(ctx context.Context, kindObjPair *KindObjectPair) ([]KindObject
 }
 
 func callObjectEnhancer(ctx context.Context, scope *sentry.Scope, kindObjectPair *KindObjectPair, sentryEvent *sentry.Event) error {
-
  var err error = nil
  switch kindObjectPair.kind {
  case KindPod:
@@ -215,7 +210,6 @@ func podEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object,
 }
 
 func jobEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object, sentryEvent *sentry.Event) error {
-
  jobObj, ok := object.(*batchv1.Job)
  if !ok {
  return errors.New("failed to cast object to Job object")
@@ -245,7 +239,6 @@ func jobEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object,
 }
 
 func cronjobEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object, sentryEvent *sentry.Event) error {
-
  cronjobObj, ok := object.(*batchv1.CronJob)
  if !ok {
  return errors.New("failed to cast object to CronJob object")
@@ -280,7 +273,6 @@ func cronjobEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Obj
 }
 
 func replicaSetEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object, sentryEvent *sentry.Event) error {
-
  replicasetObj, ok := object.(*appsv1.ReplicaSet)
  if !ok {
  return errors.New("failed to cast object to ReplicaSet object")
@@ -310,7 +302,6 @@ func replicaSetEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.
 }
 
 func deploymentEnhancer(ctx context.Context, scope *sentry.Scope, object metav1.Object, sentryEvent *sentry.Event) error {
-
  deploymentObj, ok := object.(*appsv1.Deployment)
  if !ok {
  return errors.New("failed to cast object to Deployment object")

enhancers_test.go

@@ -11,7 +11,6 @@ import (
 )
 
 func TestRunEnhancers(t *testing.T) {
-
  // Create empty context
  ctx := context.Background()
  // Create simple fake client

informer_cronjobs.go

@@ -12,7 +12,6 @@ import (
 )
 
 func createCronjobInformer(ctx context.Context, factory informers.SharedInformerFactory, namespace string) (cache.SharedIndexInformer, error) {
-
  logger := zerolog.Ctx(ctx)
 
  logger.Debug().Msgf("Starting cronjob informer\n")

informer_deployments.go

@@ -9,7 +9,6 @@ import (
 )
 
 func createDeploymentInformer(ctx context.Context, factory informers.SharedInformerFactory, namespace string) (cache.SharedIndexInformer, error) {
-
  logger := zerolog.Ctx(ctx)
 
  logger.Debug().Msgf("starting deployment informer\n")

informer_jobs.go

@@ -12,7 +12,6 @@ import (
 )
 
 func createJobInformer(ctx context.Context, factory informers.SharedInformerFactory, namespace string) (cache.SharedIndexInformer, error) {
-
  logger := zerolog.Ctx(ctx)
 
  logger.Debug().Msgf("starting job informer\n")
@@ -31,7 +30,6 @@ func createJobInformer(ctx context.Context, factory informers.SharedInformerFact
  }
 
  handler.UpdateFunc = func(oldObj, newObj interface{}) {
-
  oldJob := oldObj.(*batchv1.Job)
  newJob := newObj.(*batchv1.Job)
 

informer_replicasets.go

@@ -10,7 +10,6 @@ import (
 )
 
 func createReplicasetInformer(ctx context.Context, factory informers.SharedInformerFactory, namespace string) (cache.SharedIndexInformer, error) {
-
  logger := zerolog.Ctx(ctx)
 
  logger.Debug().Msgf("starting replicaset informer\n")

informers.go

@@ -18,7 +18,6 @@ var deploymentInformer cache.SharedIndexInformer
 // if we opt into cronjob, attach the job/cronjob event handlers
 // and add to the crons monitor data struct for Sentry Crons
 func startInformers(ctx context.Context, namespace string) error {
-
  clientset, err := getClientsetFromContext(ctx)
  if err != nil {
  return errors.New("failed to get clientset")

sentry_dsn_data.go

@@ -64,7 +64,6 @@ func (d *DsnClientMapping) GetClientFromMap(dsn string) (*sentry.Client, bool) {
 }
 
 func (d *DsnClientMapping) GetClientFromObject(ctx context.Context, object metav1.Object, clientOptions sentry.ClientOptions) (*sentry.Client, bool) {
-
  // If the custom DSN flag is set to false
  // then avoid searching for the custom DSN
  // or adding an alternative client and instead
@@ -99,7 +98,6 @@ func (d *DsnClientMapping) GetClientFromObject(ctx context.Context, object metav
 
 // Recursive function to find if there is a DSN annotation
 func searchDsn(ctx context.Context, obj metav1.Object) (string, error) {
-
  dsn, ok := obj.GetAnnotations()[DSNAnnotation]
  if ok {
  return dsn, nil
@@ -120,7 +118,6 @@ func searchDsn(ctx context.Context, obj metav1.Object) (string, error) {
 }
 
 func findObject(ctx context.Context, kind string, namespace string, name string) (metav1.Object, bool) {
-
  clientset, err := getClientsetFromContext(ctx)
  if err != nil {
  return nil, false
@@ -157,7 +154,6 @@ func findObject(ctx context.Context, kind string, namespace string, name string)
  obj, ok, err := deploymentInformer.GetIndexer().GetByKey(namespace + "/" + name)
  if ok && err == nil {
  deployment = obj.(*v1.Deployment)
-
  }
  }
  if deployment == nil {

watcher_events.go

@@ -147,7 +147,6 @@ func handleWatchEvent(ctx context.Context, event *watch.Event, cutoffTime metav1
  // To avoid concurrency issue
  hub = hub.Clone()
  hub.WithScope(func(scope *sentry.Scope) {
-
  // Find the object meta that the event is about
  object, ok := findObject(ctx, eventObject.InvolvedObject.Kind, eventObject.InvolvedObject.Namespace, eventObject.InvolvedObject.Name)
  if ok {

watcher_events_test.go

@@ -16,7 +16,6 @@ import (
 // and checking it causes Sentry to capture the event
 // with the correct message and Sentry tags
 func TestHandleWatchEvent(t *testing.T) {
-
  // Create empty context
  ctx := context.Background()
 

watcher_pods.go

@@ -109,7 +109,6 @@ func handlePodWatchEvent(ctx context.Context, event *watch.Event) {
  continue
  }
  hub.WithScope(func(scope *sentry.Scope) {
-
  // If DSN annotation provided, we bind a new client with that DSN
  client, ok := dsnClientMapping.GetClientFromObject(ctx, &podObject.ObjectMeta, hub.Client().Options())
  if ok {
@@ -202,8 +201,6 @@ func watchPodsInNamespaceForever(ctx context.Context, config *rest.Config, names
 
 func startPodWatchers(ctx context.Context, config *rest.Config, namespaces []string) {
  for _, namespace := range namespaces {
-
  go watchPodsInNamespaceForever(ctx, config, namespace)
-
  }
 }

watcher_pods_test.go

@@ -15,7 +15,6 @@ import (
 // and checking it causes Sentry to capture the event
 // with the correct message and Sentry tags
 func TestHandlePodWatchEvent(t *testing.T) {
-
  // Create empty context
  ctx := context.Background()