From 970435c3d13aacf401c468e28b4adaacf26dee73 Mon Sep 17 00:00:00 2001 From: Mohammed Affan Date: Sat, 13 Jan 2024 12:26:54 +0530 Subject: [PATCH] Add linting for unused parameters Signed-off-by: Mohammed Affan --- .golangci.yml | 1 + operator/pkg/controlplane/apiserver/apiserver.go | 2 +- operator/pkg/controlplane/search/search.go | 2 +- operator/pkg/controlplane/webhook/webhook.go | 2 +- .../hpareplicassyncer/hpa_replicas_syncer_predicate.go | 2 +- .../multiclusterservice/endpointslice_collect_controller.go | 4 ++-- pkg/controllers/status/cluster_status_controller_test.go | 4 ++-- pkg/controllers/status/work_status_controller_test.go | 2 +- pkg/karmadactl/promote/promote.go | 4 ++-- pkg/metricsadapter/provider/externalmetrics.go | 2 +- pkg/webhook/multiclusterservice/validating.go | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 386ba8561d97..88454358df21 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -85,6 +85,7 @@ linters-settings: - name: unreachable-code - name: var-naming - name: redefines-builtin-id + - name: unused-parameter staticcheck: checks: - all diff --git a/operator/pkg/controlplane/apiserver/apiserver.go b/operator/pkg/controlplane/apiserver/apiserver.go index 63bd6f7e51e9..7610b8cb3cb4 100644 --- a/operator/pkg/controlplane/apiserver/apiserver.go +++ b/operator/pkg/controlplane/apiserver/apiserver.go @@ -49,7 +49,7 @@ func EnsureKarmadaAggregatedAPIServer(client clientset.Interface, cfg *operatorv return createKarmadaAggregatedAPIServerService(client, name, namespace) } -func installKarmadaAPIServer(client clientset.Interface, cfg *operatorv1alpha1.KarmadaAPIServer, name, namespace string, featureGates map[string]bool) error { +func installKarmadaAPIServer(client clientset.Interface, cfg *operatorv1alpha1.KarmadaAPIServer, name, namespace string, _ map[string]bool) error { apiserverDeploymentBytes, err := util.ParseTemplate(KarmadaApiserverDeployment, struct { DeploymentName, Namespace, Image, EtcdClientService string ServiceSubnet, KarmadaCertsSecret, EtcdCertsSecret string diff --git a/operator/pkg/controlplane/search/search.go b/operator/pkg/controlplane/search/search.go index 4c3115a8724b..91da192a3ba2 100644 --- a/operator/pkg/controlplane/search/search.go +++ b/operator/pkg/controlplane/search/search.go @@ -41,7 +41,7 @@ func EnsureKarmadaSearch(client clientset.Interface, cfg *operatorv1alpha1.Karma return createKarmadaSearchService(client, name, namespace) } -func installKarmadaSearch(client clientset.Interface, cfg *operatorv1alpha1.KarmadaSearch, name, namespace string, featureGates map[string]bool) error { +func installKarmadaSearch(client clientset.Interface, cfg *operatorv1alpha1.KarmadaSearch, name, namespace string, _ map[string]bool) error { searchDeploymentSetBytes, err := util.ParseTemplate(KarmadaSearchDeployment, struct { DeploymentName, Namespace, Image, KarmadaCertsSecret string KubeconfigSecret, EtcdClientService string diff --git a/operator/pkg/controlplane/webhook/webhook.go b/operator/pkg/controlplane/webhook/webhook.go index 14cef70ff83c..5e899011fb15 100644 --- a/operator/pkg/controlplane/webhook/webhook.go +++ b/operator/pkg/controlplane/webhook/webhook.go @@ -40,7 +40,7 @@ func EnsureKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.Karm return createKarmadaWebhookService(client, name, namespace) } -func installKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.KarmadaWebhook, name, namespace string, featureGates map[string]bool) error { +func installKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.KarmadaWebhook, name, namespace string, _ map[string]bool) error { webhookDeploymentSetBytes, err := util.ParseTemplate(KarmadaWebhookDeployment, struct { DeploymentName, Namespace, Image string KubeconfigSecret, WebhookCertsSecret string diff --git a/pkg/controllers/hpareplicassyncer/hpa_replicas_syncer_predicate.go b/pkg/controllers/hpareplicassyncer/hpa_replicas_syncer_predicate.go index b02cf13cd02d..b93a29b341d8 100644 --- a/pkg/controllers/hpareplicassyncer/hpa_replicas_syncer_predicate.go +++ b/pkg/controllers/hpareplicassyncer/hpa_replicas_syncer_predicate.go @@ -86,7 +86,7 @@ func (r *HPAReplicasSyncer) Delete(e event.DeleteEvent) bool { } // Generic implements default GenericEvent filter -func (r *HPAReplicasSyncer) Generic(e event.GenericEvent) bool { +func (r *HPAReplicasSyncer) Generic(_ event.GenericEvent) bool { return false } diff --git a/pkg/controllers/multiclusterservice/endpointslice_collect_controller.go b/pkg/controllers/multiclusterservice/endpointslice_collect_controller.go index 4cb4eef63ee4..fc2c10ce2d80 100644 --- a/pkg/controllers/multiclusterservice/endpointslice_collect_controller.go +++ b/pkg/controllers/multiclusterservice/endpointslice_collect_controller.go @@ -102,7 +102,7 @@ func (c *EndpointSliceCollectController) Reconcile(ctx context.Context, req cont return controllerruntime.Result{Requeue: true}, err } - if err = c.buildResourceInformers(ctx, work, clusterName); err != nil { + if err = c.buildResourceInformers(clusterName); err != nil { return controllerruntime.Result{Requeue: true}, err } @@ -147,7 +147,7 @@ func (c *EndpointSliceCollectController) collectEndpointSlice(key util.QueueKey) return nil } -func (c *EndpointSliceCollectController) buildResourceInformers(ctx context.Context, work *workv1alpha1.Work, clusterName string) error { +func (c *EndpointSliceCollectController) buildResourceInformers(clusterName string) error { cluster, err := util.GetCluster(c.Client, clusterName) if err != nil { klog.Errorf("Failed to get the given member cluster %s", clusterName) diff --git a/pkg/controllers/status/cluster_status_controller_test.go b/pkg/controllers/status/cluster_status_controller_test.go index 664fb9bf998e..f9b9bd1bbedf 100644 --- a/pkg/controllers/status/cluster_status_controller_test.go +++ b/pkg/controllers/status/cluster_status_controller_test.go @@ -985,7 +985,7 @@ func TestClusterStatusController_updateStatusIfNeeded(t *testing.T) { }) } -func NewClusterDynamicClientSetForAgentWithError(clusterName string, client client.Client) (*util.DynamicClusterClient, error) { +func NewClusterDynamicClientSetForAgentWithError(_ string, _ client.Client) (*util.DynamicClusterClient, error) { return nil, fmt.Errorf("err") } @@ -1029,7 +1029,7 @@ func TestClusterStatusController_initializeGenericInformerManagerForCluster(t *t }) } -func TestClusterStatusController_initLeaseController(t *testing.T) { +func TestClusterStatusController_initLeaseController(_ *testing.T) { c := &ClusterStatusController{ Client: fake.NewClientBuilder().WithScheme(gclient.NewSchema()).Build(), GenericInformerManager: genericmanager.GetInstance(), diff --git a/pkg/controllers/status/work_status_controller_test.go b/pkg/controllers/status/work_status_controller_test.go index ba20fe19a2b9..921f35375923 100644 --- a/pkg/controllers/status/work_status_controller_test.go +++ b/pkg/controllers/status/work_status_controller_test.go @@ -341,7 +341,7 @@ func TestWorkStatusController_getEventHandler(t *testing.T) { assert.NotEmpty(t, eventHandler) } -func TestWorkStatusController_RunWorkQueue(t *testing.T) { +func TestWorkStatusController_RunWorkQueue(_ *testing.T) { c := WorkStatusController{ Client: fake.NewClientBuilder().WithScheme(gclient.NewSchema()).WithObjects(newCluster("cluster", clusterv1alpha1.ClusterConditionReady, metav1.ConditionFalse)).Build(), InformerManager: genericmanager.GetInstance(), diff --git a/pkg/karmadactl/promote/promote.go b/pkg/karmadactl/promote/promote.go index 4e19dd82b3ca..dd1e0604a63c 100644 --- a/pkg/karmadactl/promote/promote.go +++ b/pkg/karmadactl/promote/promote.go @@ -554,7 +554,7 @@ func (o *CommandPromoteOption) promote(controlPlaneRestConfig *rest.Config, obj } if o.AutoCreatePolicy { - err = o.createClusterPropagationPolicy(karmadaClient, obj, gvr, isDep) + err = o.createClusterPropagationPolicy(karmadaClient, gvr, isDep) if err != nil { return err } @@ -681,7 +681,7 @@ func (o *CommandPromoteOption) createPropagationPolicy(karmadaClient *karmadacli } // createClusterPropagationPolicy create ClusterPropagationPolicy in karmada control plane -func (o *CommandPromoteOption) createClusterPropagationPolicy(karmadaClient *karmadaclientset.Clientset, obj *unstructured.Unstructured, gvr schema.GroupVersionResource, isDep bool) error { +func (o *CommandPromoteOption) createClusterPropagationPolicy(karmadaClient *karmadaclientset.Clientset, gvr schema.GroupVersionResource, isDep bool) error { var policyName string if o.PolicyName == "" { policyName = names.GeneratePolicyName("", o.name, o.gvk.String()) diff --git a/pkg/metricsadapter/provider/externalmetrics.go b/pkg/metricsadapter/provider/externalmetrics.go index 166628687c05..1b8f9a852850 100755 --- a/pkg/metricsadapter/provider/externalmetrics.go +++ b/pkg/metricsadapter/provider/externalmetrics.go @@ -35,7 +35,7 @@ func MakeExternalMetricsProvider() *ExternalMetricsProvider { } // GetExternalMetric will query metrics by selector from member clusters and return the result -func (c *ExternalMetricsProvider) GetExternalMetric(ctx context.Context, namespace string, metricSelector labels.Selector, info provider.ExternalMetricInfo) (*external_metrics.ExternalMetricValueList, error) { +func (c *ExternalMetricsProvider) GetExternalMetric(_ context.Context, _ string, _ labels.Selector, _ provider.ExternalMetricInfo) (*external_metrics.ExternalMetricValueList, error) { return nil, fmt.Errorf("karmada-metrics-adapter still not implement it") } diff --git a/pkg/webhook/multiclusterservice/validating.go b/pkg/webhook/multiclusterservice/validating.go index fb567d4ce250..3df70e0391e5 100644 --- a/pkg/webhook/multiclusterservice/validating.go +++ b/pkg/webhook/multiclusterservice/validating.go @@ -45,7 +45,7 @@ var _ admission.Handler = &ValidatingAdmission{} // Handle implements admission.Handler interface. // It yields a response to an AdmissionRequest. -func (v *ValidatingAdmission) Handle(ctx context.Context, req admission.Request) admission.Response { +func (v *ValidatingAdmission) Handle(_ context.Context, req admission.Request) admission.Response { mcs := &networkingv1alpha1.MultiClusterService{} err := v.Decoder.Decode(req, mcs) if err != nil {