fix: Implementing new UI

kaytu-io · Apr 25, 2024 · e107293 · e107293
1 parent 9246166
commit e107293
Show file tree

Hide file tree

Showing 8 changed files with 386 additions and 176 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -147,4 +147,38 @@ jobs:
           upload_url: ${{ steps.sign_executable.outputs.upload_url }}
           asset_path: ./kaytu_${{ steps.set_new_tag.outputs.new_tag }}_windows_amd64_signed.zip
           asset_name: kaytu_${{ steps.set_new_tag.outputs.new_tag }}_windows_amd64.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip
+
+      - name: update cli version in homebrew
+        run: |
+          sed -i "s+VERSION_HOMEBREW+$(echo "${{ steps.tag_version.outputs.new_tag }}" | sed 's/^.//')+g" homebrew/kaytu.rb
+          
+          sha256sum build/ktucli-macos-amd64 | awk '{print $1}' > newHash
+          sed -i "s+HASH_MAC_AMD64+$(cat newHash)+g" homebrew/kaytu.rb
+          
+          sha256sum build/ktucli-macos-arm64 | awk '{print $1}' > newHash
+          sed -i "s+HASH_MAC_ARM64+$(cat newHash)+g" homebrew/kaytu.rb
+          
+          sha256sum build/ktucli-linux-arm64 | awk '{print $1}' > newHash
+          sed -i "s+HASH_LINUX_ARM64+$(cat newHash)+g" homebrew/kaytu.rb
+          
+          sha256sum build/ktucli-linux-amd64 | awk '{print $1}' > newHash
+          sed -i "s+HASH_LINUX_AMD64+$(cat newHash)+g" homebrew/kaytu.rb
+          
+          git clone https://x-access-token:${{ secrets.GITHUBCI_TOKEN }}@github.com/kaytu-io/homebrew-cli-tap.git
+          
+          cd homebrew-cli-tap
+          
+          git remote add homebrew-cli-tap-origin https://x-access-token:${{ secrets.GITHUBCI_TOKEN }}@github.com/kaytu-io/homebrew-cli-tap.git
+          git config user.name 'Kaytu Developer'
+          git config user.email 'dev@kaytu.io'
+          
+          cp ../homebrew/kaytu.rb kaytu.rb  
+          
+          git checkout main
+          git add .
+          git commit -a -m "update cli version"
+          git push homebrew-cli-tap-origin 
+          
+          cd ..
+          rm -rf homebrew-cli-tap
diff --git a/cmd/flags/helpers.go b/cmd/flags/helpers.go
@@ -1,7 +1,6 @@
 package flags
 
 import (
-	"fmt"
 	"github.com/iancoleman/strcase"
 	"github.com/spf13/cobra"
 	"io/ioutil"
@@ -13,7 +12,7 @@ import (
 func ReadStringFlag(cmd *cobra.Command, name string) string {
 	name = strings.ReplaceAll(strcase.ToSnake(name), "_", "-")
 	if cmd.Flags().Lookup(name) == nil {
-		fmt.Println("cant find", name)
+		return ""
 	}
 	value := cmd.Flags().Lookup(name).Value.String()
 	if strings.HasPrefix(value, "@") {

diff --git a/cmd/optimize/view/app.go b/cmd/optimize/view/app.go
@@ -279,47 +279,19 @@ func (m *App) ProcessInstance(awsConf aws.Config, item OptimizationItem, account
 	}
 	m.jobChan <- job
 
-	if res.RightSizing == nil {
+	if res.RightSizing.Current.InstanceType == "" {
 		item.OptimizationLoading = false
 		m.optimizationsTable.SendItem(item)
 		return
 	}
 
-	res.RightSizing.AvgVolumesThroughputUtilization = map[string]float64{}
-	res.RightSizing.MinVolumesThroughputUtilization = map[string]float64{}
-	res.RightSizing.MaxVolumesThroughputUtilization = map[string]float64{}
-	res.RightSizing.AvgVolumesIOPSUtilization = map[string]float64{}
-	res.RightSizing.MinVolumesIOPSUtilization = map[string]float64{}
-	res.RightSizing.MaxVolumesIOPSUtilization = map[string]float64{}
-	for volumeID, v := range req.VolumeMetrics {
-		readBytesAvg := averageOfDatapoints(v["VolumeReadBytes"])
-		writeBytesAvg := averageOfDatapoints(v["VolumeWriteBytes"])
-		res.RightSizing.AvgVolumesThroughputUtilization[volumeID] = (readBytesAvg + writeBytesAvg) / 1000000.0
-		readBytesMin := minOfDatapoints(v["VolumeReadBytes"])
-		writeBytesMin := minOfDatapoints(v["VolumeWriteBytes"])
-		res.RightSizing.MinVolumesThroughputUtilization[volumeID] = (readBytesMin + writeBytesMin) / 1000000.0
-		readBytesMax := maxOfDatapoints(v["VolumeReadBytes"])
-		writeBytesMax := maxOfDatapoints(v["VolumeWriteBytes"])
-		res.RightSizing.MaxVolumesThroughputUtilization[volumeID] = (readBytesMax + writeBytesMax) / 1000000.0
-
-		readOpsAvg := averageOfDatapoints(v["VolumeReadOps"])
-		writeOpsAvg := averageOfDatapoints(v["VolumeWriteOps"])
-		res.RightSizing.AvgVolumesIOPSUtilization[volumeID] = readOpsAvg + writeOpsAvg
-		readOpsMin := minOfDatapoints(v["VolumeReadOps"])
-		writeOpsMin := minOfDatapoints(v["VolumeWriteOps"])
-		res.RightSizing.MinVolumesIOPSUtilization[volumeID] = readOpsMin + writeOpsMin
-		readOpsMax := maxOfDatapoints(v["VolumeReadOps"])
-		writeOpsMax := maxOfDatapoints(v["VolumeWriteOps"])
-		res.RightSizing.MaxVolumesIOPSUtilization[volumeID] = readOpsMax + writeOpsMax
-	}
-
 	m.optimizationsTable.SendItem(OptimizationItem{
-		Instance:                  item.Instance,
-		Volumes:                   volumesResp.Volumes,
-		Region:                    awsConf.Region,
-		OptimizationLoading:       false,
-		RightSizingRecommendation: *res.RightSizing,
-		Preferences:               item.Preferences,
+		Instance:            item.Instance,
+		Volumes:             volumesResp.Volumes,
+		Region:              awsConf.Region,
+		OptimizationLoading: false,
+		Wastage:             *res,
+		Preferences:         item.Preferences,
 	})
 }