March 2025 Updates (#28)

* fixed bugs, skip cf items for on-prem when no creds are available

* fix issue with checking URL when config is nill

Author: ThatAmatoGuy

cmd/onprem.go

@@ -45,9 +45,10 @@ var onpremCmd = &cobra.Command{
 		cfConfig, err := codefresh.GetCodefreshCreds()
 		if err != nil {
 			cmd.PrintErrln("Error getting Codefresh credentials:", err)
-			return
+			cfConfig = nil
 		}
-		if cfConfig.BaseURL == "https://g.codefresh.io/api" {
+
+		if cfConfig != nil && cfConfig.BaseURL == "https://g.codefresh.io/api" {
 			cmd.PrintErrln("Cannot gather On-Prem data for Codefresh SaaS. If you need to gather data for Codefresh On-Prem, please update your ./cfconfig context (or Envs) to point to an On-Prem instance.")
 			cmd.PrintErrln("For Codefresh SaaS, use 'pipelines' or 'gitops' commands.")
 			return
@@ -71,44 +72,46 @@ var onpremCmd = &cobra.Command{
 			return
 		}
 
-		onpremAccounts, err := codefresh.OnPremAccounts(cfConfig)
-		if err != nil {
-			cmd.PrintErrln("Error fetching On-Prem accounts:", err)
-			return
-		}
-		if err := utils.WriteYaml(onpremAccounts, "onprem-accounts", dirPath); err != nil {
-			cmd.PrintErrln("Error writing On-Prem accounts:", err)
-			return
-		}
+		if cfConfig != nil {
+			onpremAccounts, err := codefresh.OnPremAccounts(cfConfig)
+			if err != nil {
+				cmd.PrintErrln("Error fetching On-Prem accounts:", err)
+				return
+			}
+			if err := utils.WriteYaml(onpremAccounts, "onprem-accounts", dirPath); err != nil {
+				cmd.PrintErrln("Error writing On-Prem accounts:", err)
+				return
+			}
 
-		onpremRuntimes, err := codefresh.OnPremRuntimes(cfConfig)
-		if err != nil {
-			cmd.PrintErrln("Error fetching On-Prem runtimes:", err)
-			return
-		}
-		if err := utils.WriteYaml(onpremRuntimes, "onprem-runtimes", dirPath); err != nil {
-			cmd.PrintErrln("Error writing On-Prem runtimes:", err)
-			return
-		}
+			onpremRuntimes, err := codefresh.OnPremRuntimes(cfConfig)
+			if err != nil {
+				cmd.PrintErrln("Error fetching On-Prem runtimes:", err)
+				return
+			}
+			if err := utils.WriteYaml(onpremRuntimes, "onprem-runtimes", dirPath); err != nil {
+				cmd.PrintErrln("Error writing On-Prem runtimes:", err)
+				return
+			}
 
-		onpremUsers, err := codefresh.OnPremUsers(cfConfig)
-		if err != nil {
-			cmd.PrintErrln("Error fetching On-Prem users:", err)
-			return
-		}
-		if err := utils.WriteYaml(onpremUsers, "onprem-users", dirPath); err != nil {
-			cmd.PrintErrln("Error writing On-Prem users:", err)
-			return
-		}
+			onpremUsers, err := codefresh.OnPremUsers(cfConfig)
+			if err != nil {
+				cmd.PrintErrln("Error fetching On-Prem users:", err)
+				return
+			}
+			if err := utils.WriteYaml(onpremUsers, "onprem-users", dirPath); err != nil {
+				cmd.PrintErrln("Error writing On-Prem users:", err)
+				return
+			}
 
-		onpremFeatureFlags, err := codefresh.OnPremFeatureFlags(cfConfig)
-		if err != nil {
-			cmd.PrintErrln("Error fetching On-Prem feature flags:", err)
-			return
-		}
-		if err := utils.WriteYaml(onpremFeatureFlags, "onprem-feature-flags", dirPath); err != nil {
-			cmd.PrintErrln("Error writing On-Prem feature flags:", err)
-			return
+			onpremFeatureFlags, err := codefresh.OnPremFeatureFlags(cfConfig)
+			if err != nil {
+				cmd.PrintErrln("Error fetching On-Prem feature flags:", err)
+				return
+			}
+			if err := utils.WriteYaml(onpremFeatureFlags, "onprem-feature-flags", dirPath); err != nil {
+				cmd.PrintErrln("Error writing On-Prem feature flags:", err)
+				return
+			}
 		}
 
 		cmd.Println("Data Gathered Successfully.")

internal/utils/fetch_and_save.go

@@ -19,7 +19,7 @@ func FetchAndSaveData(namespace string, k8sResources []string, dirPath, version
 		fmt.Printf("Gathering %s data...\n", k8sType)
 
 		labelSelector := ""
-		if k8sType == "PersistentVolumeClaims" || k8sType == "PersistentVolumes" {
+		if k8sType == "persistentvolumeclaims" || k8sType == "persistentvolumes" {
 			labelSelector = "io.codefresh.accountName"
 		}
 
@@ -34,7 +34,7 @@ func FetchAndSaveData(namespace string, k8sResources []string, dirPath, version
 			return fmt.Errorf("error writing resource list: %v", err)
 		}
 
-		if k8sType == "PersistentVolumeClaims" || k8sType == "PersistentVolumes" {
+		if k8sType == "persistentvolumeclaims" || k8sType == "persistentvolumes" {
 			items, ok := k8sResources.JSON["items"].([]interface{})
 			if ok && len(items) != 0 {
 				// Convert items to []map[string]interface{}
@@ -55,7 +55,7 @@ func FetchAndSaveData(namespace string, k8sResources []string, dirPath, version
 			continue
 		}
 
-		if k8sType == "Pods" {
+		if k8sType == "pods" {
 			for _, resource := range k8sResources.JSON["items"].([]interface{}) {
 				resourceMap := resource.(map[string]interface{})
 				podName := resourceMap["metadata"].(map[string]interface{})["name"].(string)