Fix lint errors

Author: everpeace

examples/cluster-inventory-api/main.go

@@ -42,7 +42,6 @@ import (
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
-
 	clusterinventoryapi "sigs.k8s.io/multicluster-runtime/providers/cluster-inventory-api"
 	"sigs.k8s.io/multicluster-runtime/providers/cluster-inventory-api/kubeconfigstrategy"
 )

providers/cluster-inventory-api/kubeconfigstrategy/credentialsprovider.go

@@ -3,13 +3,13 @@ package kubeconfigstrategy
 import (
 	"context"
 
+	"sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
+	"sigs.k8s.io/cluster-inventory-api/pkg/credentials"
+
 	"k8s.io/client-go/rest"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	"sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
-	"sigs.k8s.io/cluster-inventory-api/pkg/credentials"
 )
 
 var _ Interface = &credentialsProviderStrategy{}

providers/cluster-inventory-api/kubeconfigstrategy/interface.go

@@ -3,10 +3,10 @@ package kubeconfigstrategy
 import (
 	"context"
 
-	"k8s.io/client-go/rest"
-
 	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
 
+	"k8s.io/client-go/rest"
+
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"

providers/cluster-inventory-api/kubeconfigstrategy/secret.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
@@ -15,14 +17,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-
-	"sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
 )
 
 const (
+	// SecretLabelKeyClusterInventoryConsumer is the label key used to identify the consumer of the kubeconfig Secret.
 	SecretLabelKeyClusterInventoryConsumer = "x-k8s.io/cluster-inventory-consumer"
-	SecretLabelKeyClusterProfile           = "x-k8s.io/cluster-profile"
-	SecretDataKeyKubeConfig                = "Config" // data key in the Secret that contains the kubeconfig.
+	// SecretLabelKeyClusterProfile is the label key used to identify the ClusterProfile associated with the kubeconfig Secret.
+	SecretLabelKeyClusterProfile = "x-k8s.io/cluster-profile"
+	// SecretDataKeyKubeConfig is the key in the Secret data that contains the kubeconfig.
+	SecretDataKeyKubeConfig = "Config"
 )
 
 var _ Interface = &secretStrategy{}
@@ -31,6 +34,7 @@ type secretStrategy struct {
 	consumerName string
 }
 
+// SecretStrategyOption holds options for the Secret strategy.
 type SecretStrategyOption struct {
 	ConsumerName string
 }

providers/cluster-inventory-api/provider.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
+	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -39,9 +40,6 @@ import (
 
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 	"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
-
-	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
-
 	"sigs.k8s.io/multicluster-runtime/providers/cluster-inventory-api/kubeconfigstrategy"
 )
 
@@ -82,7 +80,7 @@ type Provider struct {
 	indexers   []index
 }
 
-func setDefaults(opts *Options, cli client.Client) {
+func setDefaults(opts *Options) {
 	if opts.NewCluster == nil {
 		opts.NewCluster = func(ctx context.Context, clp *clusterinventoryv1alpha1.ClusterProfile, cfg *rest.Config, opts ...cluster.Option) (cluster.Cluster, error) {
 			return cluster.New(cfg, opts...)
@@ -107,7 +105,7 @@ func New(opts Options) (*Provider, error) {
 		kubeconfig: map[string]*rest.Config{},
 		strategy:   strategy,
 	}
-	setDefaults(&p.opts, p.client)
+	setDefaults(&p.opts)
 	return p, nil
 }
 

providers/cluster-inventory-api/provider_test.go

@@ -25,6 +25,8 @@ import (
 	"time"
 
 	"golang.org/x/sync/errgroup"
+	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
+	"sigs.k8s.io/cluster-inventory-api/pkg/credentials"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -50,10 +52,6 @@ import (
 	mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
-
-	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
-	"sigs.k8s.io/cluster-inventory-api/pkg/credentials"
-
 	"sigs.k8s.io/multicluster-runtime/providers/cluster-inventory-api/kubeconfigstrategy"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -323,8 +321,8 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
 				})
 				Expect(cliHub.Status().Update(ctx, profileMember)).To(Succeed())
 
-				_, sa1TokenMember = mustCreateAdminSAAndToken(ctx, cliMember, "sa1", "default")
-				_ = mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
+				sa1TokenMember = mustCreateAdminSAAndToken(ctx, cliMember, "sa1", "default")
+				mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
 					ctx, cliHub, cfgMember,
 					consumerName,
 					*profileMember,
@@ -340,8 +338,8 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
 
 		It("re-engages the cluster when kubeconfig of the cluster profile changes", func(ctx context.Context) {
 			By("Update the kubeconfig for the member ClusterProfile", func() {
-				_, sa2TokenMember = mustCreateAdminSAAndToken(ctx, cliMember, "sa2", "default")
-				_ = mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
+				sa2TokenMember = mustCreateAdminSAAndToken(ctx, cliMember, "sa2", "default")
+				mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
 					ctx, cliHub, cfgMember,
 					consumerName,
 					*profileMember,
@@ -391,7 +389,7 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
 			createClusters()
 
 			By("Setting up the Provider", func() {
-				_, sa1TokenMember := mustCreateAdminSAAndToken(ctx, cliMember, "sa1", "default")
+				sa1TokenMember := mustCreateAdminSAAndToken(ctx, cliMember, "sa1", "default")
 				execPluginOutput := fmt.Sprintf(`{
 					"apiVersion": "client.authentication.k8s.io/v1beta1",
 					"kind": "ExecCredential",
@@ -482,7 +480,7 @@ func ignoreCanceled(err error) error {
 	return err
 }
 
-func mustCreateAdminSAAndToken(ctx context.Context, cli client.Client, name, namespace string) (corev1.ServiceAccount, string) {
+func mustCreateAdminSAAndToken(ctx context.Context, cli client.Client, name, namespace string) string {
 	sa := corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -518,7 +516,7 @@ func mustCreateAdminSAAndToken(ctx context.Context, cli client.Client, name, nam
 	}
 	Expect(client.IgnoreAlreadyExists(cli.Create(ctx, &adminClusterRoleBinding))).To(Succeed())
 
-	return sa, tokenRequest.Status.Token
+	return tokenRequest.Status.Token
 }
 
 func mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
@@ -528,7 +526,7 @@ func mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
 	consumerName string,
 	clusterProfile clusterinventoryv1alpha1.ClusterProfile,
 	token string,
-) corev1.Secret {
+) {
 	kubeconfigStr := fmt.Sprintf(`apiVersion: v1
 clusters:
 - cluster:
@@ -568,5 +566,4 @@ users:
 		return nil
 	})
 	Expect(err).NotTo(HaveOccurred())
-	return *kubeConfigSecret
 }

providers/cluster-inventory-api/suite_test.go

@@ -23,15 +23,15 @@ import (
 	"path/filepath"
 	"testing"
 
+	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
+
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	clusterinventoryv1alpha1 "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )