Merge pull request #33 from kaytu-io/compute-instance-recommendations

fix: change proto file name
kaytu-io · Jul 2, 2024 · bb9c337 · bb9c337
2 parents 96282fc + 2d3ba99
commit bb9c337
Show file tree

Hide file tree

Showing 10 changed files with 357 additions and 357 deletions.
diff --git a/plugin/gcp/metrics.go b/plugin/gcp/metrics.go
@@ -3,7 +3,7 @@ package gcp
 import (
 	"context"
 	"fmt"
-	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang"
+	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang/gcp"
 	"google.golang.org/api/iterator"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 

diff --git a/plugin/processor/compute_instance/compute_instance.go b/plugin/processor/compute_instance/compute_instance.go
@@ -7,7 +7,7 @@ import (
 	"github.com/kaytu-io/kaytu/pkg/style"
 	"github.com/kaytu-io/kaytu/pkg/utils"
 	"github.com/kaytu-io/plugin-gcp/plugin/gcp"
-	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang"
+	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang/gcp"
 	util "github.com/kaytu-io/plugin-gcp/utils"
 	"strconv"
 	"strings"
@@ -80,34 +80,34 @@ func (m *ComputeInstanceProcessor) exportCsv() []*golang.CSVRow {
 	m.items.Range(func(key string, value ComputeInstanceItem) bool {
 		var additionalDetails []string
 		var rightSizingCost, saving, recSpec string
-		if value.Wastage.RightSizing.Recommended != nil {
-			rightSizingCost = utils.FormatPriceFloat(value.Wastage.RightSizing.Recommended.Cost)
-			saving = utils.FormatPriceFloat(value.Wastage.RightSizing.Current.Cost - value.Wastage.RightSizing.Recommended.Cost)
-			recSpec = value.Wastage.RightSizing.Recommended.MachineType
+		if value.Wastage.Rightsizing != nil && value.Wastage.Rightsizing.Recommended != nil {
+			rightSizingCost = utils.FormatPriceFloat(value.Wastage.Rightsizing.Recommended.Cost)
+			saving = utils.FormatPriceFloat(value.Wastage.Rightsizing.Current.Cost - value.Wastage.Rightsizing.Recommended.Cost)
+			recSpec = value.Wastage.Rightsizing.Recommended.MachineType
 
 			additionalDetails = append(additionalDetails,
-				fmt.Sprintf("Machine Type:: Current: %s - Recommended: %s", value.Wastage.RightSizing.Current.MachineType,
-					value.Wastage.RightSizing.Recommended.MachineType))
+				fmt.Sprintf("Machine Type:: Current: %s - Recommended: %s", value.Wastage.Rightsizing.Current.MachineType,
+					value.Wastage.Rightsizing.Recommended.MachineType))
 			additionalDetails = append(additionalDetails,
-				fmt.Sprintf("Region:: Current: %s - Recommended: %s", value.Wastage.RightSizing.Current.Region,
-					value.Wastage.RightSizing.Recommended.Region))
+				fmt.Sprintf("Region:: Current: %s - Recommended: %s", value.Wastage.Rightsizing.Current.Region,
+					value.Wastage.Rightsizing.Recommended.Region))
 			additionalDetails = append(additionalDetails,
-				fmt.Sprintf("CPU:: Current: %d - Recommended: %d", value.Wastage.RightSizing.Current.CPU,
-					value.Wastage.RightSizing.Recommended.CPU))
+				fmt.Sprintf("CPU:: Current: %d - Recommended: %d", value.Wastage.Rightsizing.Current.Cpu,
+					value.Wastage.Rightsizing.Recommended.Cpu))
 			additionalDetails = append(additionalDetails,
-				fmt.Sprintf("Memory:: Current: %d - Recommended: %d", value.Wastage.RightSizing.Current.MemoryMb,
-					value.Wastage.RightSizing.Recommended.MemoryMb))
+				fmt.Sprintf("Memory:: Current: %d - Recommended: %d", value.Wastage.Rightsizing.Current.MemoryMb,
+					value.Wastage.Rightsizing.Recommended.MemoryMb))
 		}
 		computeRow := []string{
 			value.ProjectId, value.Region, "Compute Instance", value.Id, value.Name, value.Platform,
-			"730 Hrs", utils.FormatPriceFloat(value.Wastage.RightSizing.Current.Cost), rightSizingCost, saving,
-			value.Wastage.RightSizing.Current.MachineType, recSpec, "None", value.Wastage.RightSizing.Description, strings.Join(additionalDetails, "---")}
+			"730 Hrs", utils.FormatPriceFloat(value.Wastage.Rightsizing.Current.Cost), rightSizingCost, saving,
+			value.Wastage.Rightsizing.Current.MachineType, recSpec, "None", value.Wastage.Rightsizing.Description, strings.Join(additionalDetails, "---")}
 
 		rows = append(rows, &golang.CSVRow{Row: computeRow})
 
 		for _, d := range value.Disks {
 			dKey := strconv.FormatUint(d.Id, 10)
-			disk := value.Wastage.VolumeRightSizing[dKey]
+			disk := value.Wastage.VolumesRightsizing[dKey]
 			var diskAdditionalDetails []string
 			var diskRightSizingCost, diskSaving, diskRecSpec string
 			if disk.Recommended != nil {
@@ -135,7 +135,7 @@ func (m *ComputeInstanceProcessor) exportCsv() []*golang.CSVRow {
 				value.ProjectId, value.Region, "Compute Disk", dKey, d.Name, "N/A",
 				"730 Hrs", utils.FormatPriceFloat(disk.Current.Cost), diskRightSizingCost, diskSaving,
 				fmt.Sprintf("%s / %d GB", disk.Current.DiskType, disk.Current.DiskSize), diskRecSpec,
-				"None", value.Wastage.RightSizing.Description, strings.Join(diskAdditionalDetails, "---")}
+				"None", value.Wastage.Rightsizing.Description, strings.Join(diskAdditionalDetails, "---")}
 
 			rows = append(rows, &golang.CSVRow{Row: diskRow})
 		}
@@ -161,15 +161,15 @@ func (m *ComputeInstanceProcessor) ResultsSummary() *golang.ResultSummary {
 
 func (m *ComputeInstanceProcessor) UpdateSummary(itemId string) {
 	i, ok := m.items.Get(itemId)
-	if ok && i.Wastage.RightSizing.Recommended != nil {
+	if ok && i.Wastage.Rightsizing.Recommended != nil {
 		totalSaving := 0.0
 		totalCurrentCost := 0.0
-		for _, v := range i.Wastage.VolumeRightSizing {
+		for _, v := range i.Wastage.VolumesRightsizing {
 			totalSaving += v.Current.Cost - v.Recommended.Cost
 			totalCurrentCost += v.Current.Cost
 		}
-		totalSaving += i.Wastage.RightSizing.Current.Cost - i.Wastage.RightSizing.Recommended.Cost
-		totalCurrentCost += i.Wastage.RightSizing.Current.Cost
+		totalSaving += i.Wastage.Rightsizing.Current.Cost - i.Wastage.Rightsizing.Recommended.Cost
+		totalCurrentCost += i.Wastage.Rightsizing.Current.Cost
 
 		m.summary.Set(itemId, ComputeInstanceSummary{
 			CurrentRuntimeCost: totalCurrentCost,

diff --git a/plugin/processor/compute_instance/compute_instance_item.go b/plugin/processor/compute_instance/compute_instance_item.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"github.com/kaytu-io/kaytu/pkg/plugin/proto/src/golang"
 	"github.com/kaytu-io/kaytu/pkg/utils"
-	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang"
+	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang/gcp"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 	"maps"

diff --git a/plugin/processor/compute_instance/job_get_compute_instance_metrics.go b/plugin/processor/compute_instance/job_get_compute_instance_metrics.go
@@ -3,7 +3,7 @@ package compute_instance
 import (
 	"context"
 	"fmt"
-	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang"
+	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang/gcp"
 	"google.golang.org/api/compute/v1"
 	"log"
 	"strconv"

diff --git a/plugin/processor/compute_instance/job_optimize_compute_instance.go b/plugin/processor/compute_instance/job_optimize_compute_instance.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/kaytu-io/plugin-gcp/plugin/processor/shared"
-	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang"
+	golang2 "github.com/kaytu-io/plugin-gcp/plugin/proto/src/golang/gcp"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 	"strconv"

diff --git a/plugin/proto/server.proto → plugin/proto/gcp_server.proto b/plugin/proto/server.proto → plugin/proto/gcp_server.proto