golinter fixes

Author: mallardduck

pkg/helm-project-operator/codegen/main.go

@@ -1,9 +1,10 @@
 package main
 
 import (
+	"os"
+
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/crd"
-	"os"
 
 	"github.com/sirupsen/logrus"
 

pkg/helm-project-operator/controllers/common/runtime.go

@@ -1,10 +1,11 @@
 package common
 
 import (
-	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
 	"os"
 	"path/filepath"
 
+	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
+
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )

pkg/helm-project-operator/controllers/controllers.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/hardened"
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/namespace"
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/project"
 	helmproject "github.com/rancher/prometheus-federator/pkg/helm-project-operator/generated/controllers/helm.cattle.io"
 	helmprojectcontroller "github.com/rancher/prometheus-federator/pkg/helm-project-operator/generated/controllers/helm.cattle.io/v1alpha1"
-	"time"
 
 	"github.com/k3s-io/helm-controller/pkg/controllers/chart"
 	k3shelm "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io"

pkg/helm-project-operator/controllers/hardened/controller.go

@@ -2,6 +2,7 @@ package hardened
 
 import (
 	"context"
+
 	common2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 
 	"github.com/rancher/wrangler/pkg/apply"

pkg/helm-project-operator/controllers/hardened/resolvers.go

@@ -2,6 +2,7 @@ package hardened
 
 import (
 	"context"
+
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 
 	"github.com/rancher/wrangler/pkg/relatedresource"

pkg/helm-project-operator/controllers/namespace/controller.go

@@ -3,6 +3,7 @@ package namespace
 import (
 	"context"
 	"fmt"
+
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/applier"
 	common2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 	helmprojectcontroller "github.com/rancher/prometheus-federator/pkg/helm-project-operator/generated/controllers/helm.cattle.io/v1alpha1"

pkg/helm-project-operator/controllers/namespace/getter.go

@@ -2,9 +2,10 @@ package namespace
 
 import (
 	"fmt"
-	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
 	"sort"
 
+	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
+
 	corecontroller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/helm-project-operator/controllers/namespace/resources.go

@@ -2,9 +2,10 @@ package namespace
 
 import (
 	"fmt"
-	common2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 	"strings"
 
+	common2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/helm-project-operator/controllers/project/cleanup.go

@@ -2,6 +2,7 @@ package project
 
 import (
 	"fmt"
+
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 
 	"github.com/sirupsen/logrus"

pkg/helm-project-operator/controllers/project/controller.go

@@ -3,6 +3,7 @@ package project
 import (
 	"context"
 	"fmt"
+
 	v1alpha2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/apis/helm.cattle.io/v1alpha1"
 	common2 "github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
 	"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/namespace"