remove dead code

internal/clients/rorapiclient/old.go

@@ -10,23 +10,8 @@ import (
 	"github.com/spf13/viper"
 )
 
-var rorclient *resty.Client
 var rorclientnonauth *resty.Client
 
-// Deprecated: GetOrCreateRorRestyClient is deprecated. Use rorclient instead
-func GetOrCreateRorRestyClient() (*resty.Client, error) {
-	if rorclient != nil {
-		return rorclient, nil
-	}
-
-	rorclient = resty.New()
-	rorclient.SetBaseURL(viper.GetString(configconsts.API_ENDPOINT))
-	rorclient.Header.Add("X-API-KEY", viper.GetString(configconsts.API_KEY))
-	rorclient.Header.Set("User-Agent", fmt.Sprintf("ROR-Agent/%s", viper.GetString(configconsts.VERSION)))
-
-	return rorclient, nil
-}
-
 // Deprecated: GetOrCreateRorRestyClientNonAuth is deprecated. Use rorclient instead
 func GetOrCreateRorRestyClientNonAuth() (*resty.Client, error) {
 	if rorclientnonauth != nil {

internal/scheduler/metrics.go

@@ -142,60 +142,3 @@ func CreateNodeMetrics(node apicontracts.NodeMetricsListItem) (apicontracts.Node
 	}
 	return nodeMetric, nil
 }
-func CreatePodMetricsList(k8sClient *kubernetes.Clientset) ([]apicontracts.PodMetric, error) {
-	var podMetricsList apicontracts.PodMetricsList
-	var metricsReportPods []apicontracts.PodMetric
-
-	data, err := k8sClient.RESTClient().Get().AbsPath("apis/metrics.k8s.io/v1beta1/pods").DoRaw(context.TODO())
-	if err != nil {
-		rlog.Error("error unmarshaling podmetrics", err)
-		return metricsReportPods, err
-	}
-
-	err = json.Unmarshal(data, &podMetricsList)
-	if err != nil {
-		rlog.Error("error unmarshaling podmetrics", err)
-		return metricsReportPods, err
-	}
-
-	for _, pod := range podMetricsList.Items {
-		metricsReportPod, err := CreatePodMetrics(pod)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return metricsReportPods, err
-		}
-		metricsReportPods = append(metricsReportPods, metricsReportPod)
-	}
-	return metricsReportPods, nil
-}
-
-func CreatePodMetrics(pod apicontracts.PodMetricsListItem) (apicontracts.PodMetric, error) {
-	var podMetric apicontracts.PodMetric
-	var timestamp time.Time = pod.Timestamp
-	var podCpuSum int64 = 0
-	var podMemorySum int64 = 0
-
-	for _, container := range pod.Containers {
-		podCpu, err := apimachinery.ParseQuantity(container.Usage.CPU)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return podMetric, err
-		}
-		podCpuSum = podCpuSum + podCpu.MilliValue()
-		podMemoryObj, err := apimachinery.ParseQuantity(container.Usage.Memory)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return podMetric, err
-		}
-		podMemory, _ := podMemoryObj.AsInt64()
-		podMemorySum = podMemorySum + podMemory
-	}
-	podMetric = apicontracts.PodMetric{
-		Name:        pod.Metadata.Name,
-		Namespace:   pod.Metadata.Namespace,
-		TimeStamp:   timestamp,
-		CpuUsage:    podCpuSum,
-		MemoryUsage: podMemorySum,
-	}
-	return podMetric, nil
-}

v2/go.mod

@@ -6,9 +6,7 @@ require (
 	github.com/NorskHelsenett/ror v0.3.11-rc3
 	github.com/go-co-op/gocron v1.37.0
 	github.com/go-resty/resty/v2 v2.16.0
-	github.com/google/go-cmp v0.6.0
 	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.9.0
 	go.uber.org/automaxprocs v1.6.0
 	k8s.io/apimachinery v0.31.2
 	k8s.io/client-go v0.31.2
@@ -37,6 +35,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -54,7 +53,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect

v2/internal/scheduler/metrics.go

@@ -140,60 +140,3 @@ func CreateNodeMetrics(node apicontracts.NodeMetricsListItem) (apicontracts.Node
 	}
 	return nodeMetric, nil
 }
-func CreatePodMetricsList(k8sClient *kubernetes.Clientset) ([]apicontracts.PodMetric, error) {
-	var podMetricsList apicontracts.PodMetricsList
-	var metricsReportPods []apicontracts.PodMetric
-
-	data, err := k8sClient.RESTClient().Get().AbsPath("apis/metrics.k8s.io/v1beta1/pods").DoRaw(context.TODO())
-	if err != nil {
-		rlog.Error("error unmarshaling podmetrics", err)
-		return metricsReportPods, err
-	}
-
-	err = json.Unmarshal(data, &podMetricsList)
-	if err != nil {
-		rlog.Error("error unmarshaling podmetrics", err)
-		return metricsReportPods, err
-	}
-
-	for _, pod := range podMetricsList.Items {
-		metricsReportPod, err := CreatePodMetrics(pod)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return metricsReportPods, err
-		}
-		metricsReportPods = append(metricsReportPods, metricsReportPod)
-	}
-	return metricsReportPods, nil
-}
-
-func CreatePodMetrics(pod apicontracts.PodMetricsListItem) (apicontracts.PodMetric, error) {
-	var podMetric apicontracts.PodMetric
-	var timestamp time.Time = pod.Timestamp
-	var podCpuSum int64 = 0
-	var podMemorySum int64 = 0
-
-	for _, container := range pod.Containers {
-		podCpu, err := apimachinery.ParseQuantity(container.Usage.CPU)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return podMetric, err
-		}
-		podCpuSum = podCpuSum + podCpu.MilliValue()
-		podMemoryObj, err := apimachinery.ParseQuantity(container.Usage.Memory)
-		if err != nil {
-			rlog.Error("error converting podmetrics", err)
-			return podMetric, err
-		}
-		podMemory, _ := podMemoryObj.AsInt64()
-		podMemorySum = podMemorySum + podMemory
-	}
-	podMetric = apicontracts.PodMetric{
-		Name:        pod.Metadata.Name,
-		Namespace:   pod.Metadata.Namespace,
-		TimeStamp:   timestamp,
-		CpuUsage:    podCpuSum,
-		MemoryUsage: podMemorySum,
-	}
-	return podMetric, nil
-}