Package renaming

cmd/licensing-info/main.go

@@ -10,15 +10,15 @@ import (
 	"log"
 
 	eckscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme"
-	"github.com/elastic/cloud-on-k8s/pkg/resource"
+	"github.com/elastic/cloud-on-k8s/pkg/license"
 	"k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 func main() {
-	licensingInfo, err := resource.NewLicensingReporter(newK8sClient()).Get()
+	licensingInfo, err := license.NewResourceReporter(newK8sClient()).Get()
 	if err != nil {
 		log.Fatal(err, "Failed to get licensing info")
 	}

cmd/manager/main.go

@@ -40,11 +40,11 @@ import (
 	"github.com/elastic/cloud-on-k8s/pkg/controller/kibana"
 	kbassn "github.com/elastic/cloud-on-k8s/pkg/controller/kibanaassociation"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/license"
+	licensing "github.com/elastic/cloud-on-k8s/pkg/license"
 	licensetrial "github.com/elastic/cloud-on-k8s/pkg/controller/license/trial"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/webhook"
 	"github.com/elastic/cloud-on-k8s/pkg/dev"
 	"github.com/elastic/cloud-on-k8s/pkg/dev/portforward"
-	"github.com/elastic/cloud-on-k8s/pkg/resource"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/net"
 )
 
@@ -322,7 +322,7 @@ func execute() {
 			os.Exit(1)
 		}
 
-		r := resource.NewLicensingReporter(mgr.GetClient())
+		r := licensing.NewResourceReporter(mgr.GetClient())
 		go r.Start(operatorNamespace)
 	}
 

pkg/resource/aggregator.go → pkg/license/aggregator.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package resource
+package license
 
 import (
 	"fmt"

pkg/resource/aggregator_test.go → pkg/license/aggregator_test.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package resource
+package license
 
 import (
 	"testing"

pkg/resource/license.go → pkg/license/license.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package resource
+package license
 
 import (
 	"encoding/json"
@@ -104,9 +104,9 @@ func inGB(q resource.Quantity) string {
 // inEnterpriseResourceUnits converts a resource.Quantity in Elastic Enterprise resource units
 func inEnterpriseResourceUnits(q resource.Quantity) string {
 	// divide by the value (in bytes) per 64 billion (64 GB)
-	eru := float64(q.Value())/64000000000
+	eru := float64(q.Value()) / 64000000000
 	// round to the nearest superior integer
-	return fmt.Sprintf("%f", math.Round(eru + 0.5))
+	return fmt.Sprintf("%f", math.Round(eru+0.5))
 }
 
 // toMap transforms a LicensingInfo to a map of string, in order to fill in the data of a config map

pkg/resource/reporter.go → pkg/license/reporter.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package resource
+package license
 
 import (
 	"time"
@@ -21,28 +21,28 @@ var (
 	log = logf.Log.WithName("resource")
 )
 
-// LicensingReporter aggregates resources of all Elastic components managed by the operator
+// ResourceReporter aggregates resources of all Elastic components managed by the operator
 // and reports them in a config map in the form of licensing information
-type LicensingReporter struct {
-	aggregator      Aggregator
-	licenseResolver LicensingResolver
+type ResourceReporter struct {
+	aggregator        Aggregator
+	licensingResolver LicensingResolver
 }
 
-// LicensingReporter returns a new LicensingReporter
-func NewLicensingReporter(client client.Client) LicensingReporter {
+// NewResourceReporter returns a new ResourceReporter
+func NewResourceReporter(client client.Client) ResourceReporter {
 	c := k8s.WrapClient(client)
-	return LicensingReporter{
+	return ResourceReporter{
 		aggregator: Aggregator{
 			client: c,
 		},
-		licenseResolver: LicensingResolver{
+		licensingResolver: LicensingResolver{
 			client: c,
 		},
 	}
 }
 
 // Start starts to report the licensing information repeatedly at regular intervals
-func (r LicensingReporter) Start(operatorNs string) {
+func (r ResourceReporter) Start(operatorNs string) {
 	ticker := time.NewTicker(refreshPeriod)
 	for range ticker.C {
 		err := r.Report(operatorNs)
@@ -53,21 +53,21 @@ func (r LicensingReporter) Start(operatorNs string) {
 }
 
 // Report reports the licensing information in a config map
-func (r LicensingReporter) Report(operatorNs string) error {
+func (r ResourceReporter) Report(operatorNs string) error {
 	licensingInfo, err := r.Get()
 	if err != nil {
 		return err
 	}
 
-	return r.licenseResolver.Save(licensingInfo, operatorNs)
+	return r.licensingResolver.Save(licensingInfo, operatorNs)
 }
 
 // Get aggregates managed resources and returns the licensing information
-func (r LicensingReporter) Get() (LicensingInfo, error) {
+func (r ResourceReporter) Get() (LicensingInfo, error) {
 	totalMemory, err := r.aggregator.AggregateMemory()
 	if err != nil {
 		return LicensingInfo{}, err
 	}
 
-	return r.licenseResolver.ToInfo(totalMemory)
+	return r.licensingResolver.ToInfo(totalMemory)
 }