fix typos and update tests

Signed-off-by: Jorge Turrado <[email protected]>
kubernetes-sigs · Apr 26, 2023 · 5e5c464 · 5e5c464
1 parent c950c89
commit 5e5c464
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/pkg/apiserver/installer/apiserver_test.go b/pkg/apiserver/installer/apiserver_test.go
@@ -45,6 +45,7 @@ import (
 	emv1beta1 "k8s.io/metrics/pkg/apis/external_metrics/v1beta1"
 
 	"sigs.k8s.io/custom-metrics-apiserver/pkg/provider"
+	"sigs.k8s.io/custom-metrics-apiserver/pkg/provider/defaults"
 	custommetricstorage "sigs.k8s.io/custom-metrics-apiserver/pkg/registry/custom_metrics"
 	externalmetricstorage "sigs.k8s.io/custom-metrics-apiserver/pkg/registry/external_metrics"
 	sampleprovider "sigs.k8s.io/custom-metrics-apiserver/test-adapter/provider"
@@ -180,6 +181,8 @@ type fakeCMProvider struct {
 	rootSubsetCounts       map[string]int
 	namespacedSubsetCounts map[string]int
 	metrics                []provider.CustomMetricInfo
+
+	defaults.DefaultCustomMetricsProvider
 }
 
 func (p *fakeCMProvider) valuesFor(name types.NamespacedName, info provider.CustomMetricInfo, metricSelector labels.Selector) (string, []custom_metrics.MetricValue, bool) {
@@ -241,10 +244,6 @@ func (p *fakeCMProvider) GetMetricBySelector(ctx context.Context, namespace stri
 	return &trimmedValues, nil
 }
 
-func (p *fakeCMProvider) ListAllMetrics() []provider.CustomMetricInfo {
-	return p.metrics
-}
-
 type T struct {
 	Method        string
 	Path          string

diff --git a/...der/defaults/default_metrics_provicers.go → ...ider/defaults/default_metric_providers.go b/...der/defaults/default_metrics_provicers.go → ...ider/defaults/default_metric_providers.go
diff --git a/pkg/provider/fake/fake.go b/pkg/provider/fake/fake.go
@@ -26,9 +26,13 @@ import (
 	"k8s.io/metrics/pkg/apis/external_metrics"
 
 	"sigs.k8s.io/custom-metrics-apiserver/pkg/provider"
+	"sigs.k8s.io/custom-metrics-apiserver/pkg/provider/defaults"
 )
 
-type fakeProvider struct{}
+type fakeProvider struct {
+	defaults.DefaultCustomMetricsProvider
+	defaults.DefaultExternalMetricsProvider
+}
 
 func (*fakeProvider) GetMetricByName(ctx context.Context, name types.NamespacedName, info provider.CustomMetricInfo, metricSelector labels.Selector) (*custom_metrics.MetricValue, error) {
 	return &custom_metrics.MetricValue{}, nil
@@ -38,18 +42,10 @@ func (*fakeProvider) GetMetricBySelector(ctx context.Context, namespace string,
 	return &custom_metrics.MetricValueList{}, nil
 }
 
-func (*fakeProvider) ListAllMetrics() []provider.CustomMetricInfo {
-	return []provider.CustomMetricInfo{}
-}
-
 func (*fakeProvider) GetExternalMetric(ctx context.Context, namespace string, metricSelector labels.Selector, info provider.ExternalMetricInfo) (*external_metrics.ExternalMetricValueList, error) {
 	return &external_metrics.ExternalMetricValueList{}, nil
 }
 
-func (*fakeProvider) ListAllExternalMetrics() []provider.ExternalMetricInfo {
-	return []provider.ExternalMetricInfo{}
-}
-
 // NewProvider creates a fake implementation of MetricsProvider.
 func NewProvider() provider.MetricsProvider {
 	return &fakeProvider{}