added pvc changes

Author: vijeyash1

agent/kubviz/kubePreUpgrade.go

@@ -85,7 +85,6 @@ func KubePreUpgradeDetector(config *rest.Config, js nats.JetStreamContext) error
 	if err != nil {
 		return err
 	}
-
 	filename := fmt.Sprintf("%s/swagger-%s.json", uniqueDir, k8sVersion)
 	url := fmt.Sprintf("%s/%s/%s", baseURL, k8sVersion, fileURL)
 	err = downloadFile(filename, url)
@@ -104,6 +103,7 @@ func KubePreUpgradeDetector(config *rest.Config, js nats.JetStreamContext) error
 
 func PopulateKubeAPIMap(swagfile string) (model.KubernetesAPIs, error) {
 	var kubeAPIs = make(model.KubernetesAPIs)
+	// log.Infof("Populating the PopulateKubeAPIMap")
 	jsonFile, err := os.Open(swagfile)
 	if err != nil {
 		log.Error(err)

agent/kubviz/outdated.go

@@ -447,6 +447,13 @@ func splitOutlierSemvers(allSemverTags []*semver.Version) ([]*semver.Version, []
 	return outliers, remaining, nil
 }
 
+// func homeDir() string {
+// 	if h := os.Getenv("HOME"); h != "" {
+// 		return h
+// 	}
+// 	return os.Getenv("USERPROFILE")
+// }
+
 type VersionTag struct {
 	Sort    int    `json:"sort"`
 	Version string `json:"version"`

agent/kubviz/trivy_image.go

@@ -16,15 +16,13 @@ import (
 )
 
 func RunTrivyImageScans(config *rest.Config, js nats.JetStreamContext) error {
-
 	pvcMountPath := "/mnt/agent/kbz"
 	trivyImageCacheDir := fmt.Sprintf("%s/trivy-imagecache", pvcMountPath)
 	err := os.MkdirAll(trivyImageCacheDir, 0755)
 	if err != nil {
 		log.Printf("Error creating Trivy Image cache directory: %v\n", err)
 		return err
 	}
-
 	clearCacheCmd := "trivy image --clear-cache"
 
 	images, err := ListImages(config)

agent/kubviz/trivy_sbom.go

@@ -47,21 +47,26 @@ func executeCommandSbom(command string) ([]byte, error) {
 }
 
 func RunTrivySbomScan(config *rest.Config, js nats.JetStreamContext) error {
-	clearCacheCmd := "trivy image --clear-cache"
 	pvcMountPath := "/mnt/agent/kbz"
 	trivySbomCacheDir := fmt.Sprintf("%s/trivy-sbomcache", pvcMountPath)
 	err := os.MkdirAll(trivySbomCacheDir, 0755)
 	if err != nil {
 		log.Printf("Error creating Trivy cache directory: %v\n", err)
 		return err
 	}
+	clearCacheCmd := "trivy image --clear-cache"
+
+	log.Println("trivy sbom run started")
 	images, err := ListImages(config)
+
 	if err != nil {
 		log.Printf("failed to list images: %v", err)
 	}
 	for _, image := range images {
+
 		sbomcmd := fmt.Sprintf("trivy image --format cyclonedx %s --cache-dir %s", image.PullableImage, trivySbomCacheDir)
 		out, err := executeCommandSbom(sbomcmd)
+
 		if err != nil {
 			log.Printf("Error executing Trivy for image sbom %s: %v", image.PullableImage, err)
 			continue // Move on to the next image in case of an error
@@ -72,6 +77,7 @@ func RunTrivySbomScan(config *rest.Config, js nats.JetStreamContext) error {
 			log.Printf("Trivy output is empty for image sbom %s", image.PullableImage)
 			continue // Move on to the next image
 		}
+
 		var report cyclonedx.BOM
 		err = json.Unmarshal(out, &report)
 		if err != nil {