Renamings

Author: weilerN

cmd/autoscaler/app/autoscaler.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/v3io/scaler/pkg/autoscaler"
-	"github.com/v3io/scaler/pkg/autoscaler/factory"
+	"github.com/v3io/scaler/pkg/autoscaler/metricsclients"
 	"github.com/v3io/scaler/pkg/common"
 	"github.com/v3io/scaler/pkg/pluginloader"
 	"github.com/v3io/scaler/pkg/scalertypes"
@@ -104,7 +104,7 @@ func createAutoScaler(restConfig *rest.Config,
 	}
 
 	// create metrics client using factory
-	metricsClient, err := factory.NewMetricsClient(rootLogger, restConfig, options)
+	metricsClient, err := metricsclients.NewMetricsClient(rootLogger, restConfig, options)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create metrics client")
 	}

…r/metricsclients/custommetricswrapper.go …toscaler/metricsclients/custommetrics.gopkg/autoscaler/metricsclients/custommetricswrapper.go renamed to pkg/autoscaler/metricsclients/custommetrics.go pkg/autoscaler/metricsclients/custommetricswrapper.go renamed to pkg/autoscaler/metricsclients/custommetrics.go

@@ -30,42 +30,42 @@ import (
 	"k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/restmapper"
-	"k8s.io/metrics/pkg/client/custom_metrics"
+	k8scustommetrics "k8s.io/metrics/pkg/client/custom_metrics"
 )
 
-type CustomMetricsWrapper struct {
-	custom_metrics.CustomMetricsClient
+type CustomMetricsClient struct {
+	k8scustommetrics.CustomMetricsClient
 	namespace string
 	groupKind schema.GroupKind
 	logger    logger.Logger
 }
 
 // NewCustomMetricsClientFromConfig creates a custom_metrics.CustomMetricsClient from rest.Config
-func NewCustomMetricsClientFromConfig(restConfig *rest.Config) (custom_metrics.CustomMetricsClient, error) {
+func NewCustomMetricsClientFromConfig(restConfig *rest.Config) (k8scustommetrics.CustomMetricsClient, error) {
 	discoveryClient, err := discovery.NewDiscoveryClientForConfig(restConfig)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create discovery client")
 	}
-	availableAPIsGetter := custom_metrics.NewAvailableAPIsGetter(discoveryClient)
+	availableAPIsGetter := k8scustommetrics.NewAvailableAPIsGetter(discoveryClient)
 	restMapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(discoveryClient))
-	customMetricsClient := custom_metrics.NewForConfig(restConfig, restMapper, availableAPIsGetter)
+	customMetricsClient := k8scustommetrics.NewForConfig(restConfig, restMapper, availableAPIsGetter)
 	return customMetricsClient, nil
 }
 
 func NewCustomMetricsWrapper(
 	logger logger.Logger,
-	customMetricsClient custom_metrics.CustomMetricsClient,
+	customMetricsClient k8scustommetrics.CustomMetricsClient,
 	namespace string,
-	groupKind schema.GroupKind) *CustomMetricsWrapper {
-	return &CustomMetricsWrapper{
+	groupKind schema.GroupKind) *CustomMetricsClient {
+	return &CustomMetricsClient{
 		logger:              logger,
 		CustomMetricsClient: customMetricsClient,
 		namespace:           namespace,
 		groupKind:           groupKind,
 	}
 }
 
-func (cmw *CustomMetricsWrapper) GetResourceMetrics(metricNames []string) (map[string]map[string]int, error) {
+func (cmw *CustomMetricsClient) GetResourceMetrics(metricNames []string) (map[string]map[string]int, error) {
 	resourcesMetricsMap := make(map[string]map[string]int)
 	resourceLabels := labels.Everything()
 	metricSelectorLabels := labels.Everything()

pkg/autoscaler/factory/factory.go pkg/autoscaler/metricsclients/factory.gopkg/autoscaler/factory/factory.go renamed to pkg/autoscaler/metricsclients/factory.go

@@ -18,12 +18,11 @@ under the Apache 2.0 license is conditioned upon your compliance with
 such restriction.
 */
 
-package factory
+package metricsclients
 
 import (
 	"fmt"
 
-	"github.com/v3io/scaler/pkg/autoscaler/metricsclients"
 	"github.com/v3io/scaler/pkg/scalertypes"
 
 	"github.com/nuclio/errors"
@@ -34,11 +33,11 @@ import (
 func NewMetricsClient(logger logger.Logger, restConfig *rest.Config, autoScalerConf scalertypes.AutoScalerOptions) (scalertypes.MetricsClient, error) {
 	switch autoScalerConf.MetricClientOptions.Kind {
 	case scalertypes.KindCustomMetrics:
-		customMetricsClient, err := metricsclients.NewCustomMetricsClientFromConfig(restConfig)
+		customMetricsClient, err := NewCustomMetricsClientFromConfig(restConfig)
 		if err != nil {
 			return nil, errors.Wrap(err, "Failed to create custom metrics client")
 		}
-		return metricsclients.NewCustomMetricsWrapper(
+		return NewCustomMetricsWrapper(
 			logger.GetChild("customMetricsClient"),
 			customMetricsClient,
 			autoScalerConf.Namespace,