fix linter errors

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>
kubernetes-sigs · Apr 28, 2023 · ec17d0c · ec17d0c
1 parent 4a4fb76
commit ec17d0c
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 64 deletions.
diff --git a/pkg/apiserver/installer/apiserver_test.go b/pkg/apiserver/installer/apiserver_test.go
@@ -182,7 +182,7 @@ type fakeCMProvider struct {
 	metrics                []provider.CustomMetricInfo
 }
 
-func (p *fakeCMProvider) valuesFor(name types.NamespacedName, info provider.CustomMetricInfo, metricSelector labels.Selector) (string, []custom_metrics.MetricValue, bool) {
+func (p *fakeCMProvider) valuesFor(name types.NamespacedName, info provider.CustomMetricInfo) (string, []custom_metrics.MetricValue, bool) {
 	if info.Namespaced {
 		metricID := name.Namespace + "/" + info.GroupResource.String() + "/" + name.Name + "/" + info.Metric
 		values, ok := p.namespacedValues[metricID]
@@ -193,17 +193,17 @@ func (p *fakeCMProvider) valuesFor(name types.NamespacedName, info provider.Cust
 	return metricID, values, ok
 }
 
-func (p *fakeCMProvider) GetMetricByName(ctx context.Context, name types.NamespacedName, info provider.CustomMetricInfo, metricSelector labels.Selector) (*custom_metrics.MetricValue, error) {
-	metricID, values, ok := p.valuesFor(name, info, metricSelector)
+func (p *fakeCMProvider) GetMetricByName(_ context.Context, name types.NamespacedName, info provider.CustomMetricInfo, _ labels.Selector) (*custom_metrics.MetricValue, error) {
+	metricID, values, ok := p.valuesFor(name, info)
 	if !ok {
 		return nil, fmt.Errorf("non-existent metric requested (id: %s)", metricID)
 	}
 
 	return &values[0], nil
 }
 
-func (p *fakeCMProvider) GetMetricBySelector(ctx context.Context, namespace string, selector labels.Selector, info provider.CustomMetricInfo, metricSelector labels.Selector) (*custom_metrics.MetricValueList, error) {
-	metricID, values, ok := p.valuesFor(types.NamespacedName{Namespace: namespace, Name: "*"}, info, metricSelector)
+func (p *fakeCMProvider) GetMetricBySelector(_ context.Context, namespace string, selector labels.Selector, info provider.CustomMetricInfo, _ labels.Selector) (*custom_metrics.MetricValueList, error) {
+	metricID, values, ok := p.valuesFor(types.NamespacedName{Namespace: namespace, Name: "*"}, info)
 	if !ok {
 		return nil, fmt.Errorf("non-existent metric requested (id: %s)", metricID)
 	}

diff --git a/pkg/apiserver/installer/conversion.go b/pkg/apiserver/installer/conversion.go
@@ -63,15 +63,7 @@ func ConvertURLValuesToV1beta2MetricListOptions(in *url.Values, out *cmv1beta2.M
 
 // RegisterConversions adds conversion functions to the given scheme.
 func RegisterConversions(s *runtime.Scheme) error {
-	if err := s.AddConversionFunc((*url.Values)(nil), (*cmv1beta1.MetricListOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
+	return s.AddConversionFunc((*url.Values)(nil), (*cmv1beta1.MetricListOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return ConvertURLValuesToV1beta1MetricListOptions(a.(*url.Values), b.(*cmv1beta1.MetricListOptions), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddConversionFunc((*url.Values)(nil), (*cmv1beta2.MetricListOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return ConvertURLValuesToV1beta2MetricListOptions(a.(*url.Values), b.(*cmv1beta2.MetricListOptions), scope)
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }