fix: implement changes and apply lint fixes

implement changes

Signed-off-by: Rizul Gupta <mail2rizul@gmail.com>

view-cmd terminal change fixed

Signed-off-by: Rizul Gupta <mail2rizul@gmail.com>

lint fix

Signed-off-by: Rizul Gupta <mail2rizul@gmail.com>

Author: rizul2108

cmd/harbor/root/cmd.go

@@ -17,13 +17,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/goharbor/harbor-cli/cmd/harbor/root/scanner"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/artifact"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/config"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/labels"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/project"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/registry"
 	repositry "github.com/goharbor/harbor-cli/cmd/harbor/root/repository"
+	"github.com/goharbor/harbor-cli/cmd/harbor/root/scanner"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/schedule"
 	"github.com/goharbor/harbor-cli/cmd/harbor/root/user"
 	"github.com/goharbor/harbor-cli/pkg/utils"

cmd/harbor/root/scanner/view.go

@@ -16,17 +16,19 @@ package scanner
 import (
 	"github.com/goharbor/harbor-cli/pkg/api"
 	"github.com/goharbor/harbor-cli/pkg/prompt"
+	"github.com/goharbor/harbor-cli/pkg/utils"
 	"github.com/goharbor/harbor-cli/pkg/views/scanner/view"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 func ViewCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "view",
 		Short: "get scanner by id",
 		Args:  cobra.MaximumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			var err error
 			var registrationID string
 			if len(args) > 0 {
@@ -38,7 +40,16 @@ func ViewCommand() *cobra.Command {
 			if err != nil {
 				log.Errorf("failed to get scanner: %v", err)
 			}
-			view.ViewScanner(response.Payload)
+			formatFlag := viper.GetString("output-format")
+			if formatFlag != "" {
+				err = utils.PrintFormat(response, formatFlag)
+				if err != nil {
+					return err
+				}
+			} else {
+				view.ViewScanner(response.Payload)
+			}
+			return nil
 		},
 	}
 	return cmd

pkg/views/scanner/list/view.go

@@ -45,11 +45,11 @@ func ListScanners(scanners []*models.ScannerRegistration) {
 		rows = append(rows, table.Row{
 			s.Name,
 			s.Description,
-			fmt.Sprintf("%v", *s.IsDefault),
+			fmt.Sprintf("%v", *s.Disabled),
 			fmt.Sprintf("%v", s.URL),
+			fmt.Sprintf("%v", *s.IsDefault),
 			fmt.Sprintf("%v", *s.UseInternalAddr),
 			fmt.Sprintf("%v", createdAt),
-			fmt.Sprintf("%v", *s.Disabled),
 		})
 	}
 

pkg/views/scanner/metadata/view.go

@@ -15,7 +15,6 @@ package metadata
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
@@ -60,10 +59,7 @@ func DisplayScannerMetadata(md *models.ScannerAdapterMetadata) {
 		propTable: tablelist.NewModel(propCols, propRows, len(propRows)),
 	}
 
-	if _, err := tea.NewProgram(m).Run(); err != nil {
-		fmt.Println("Error running program:", err)
-		os.Exit(1)
-	}
+	fmt.Println(m.View())
 }
 
 type metadataModel struct {

pkg/views/scanner/view/view.go

@@ -46,10 +46,10 @@ func ViewScanner(scanner *models.ScannerRegistration) {
 		scanner.Name,
 		scanner.UUID,
 		utils.FormatUrl(scanner.URL.String()),
-		boolToStr(*scanner.IsDefault),
-		boolToStr(*scanner.Disabled),
-		boolToStr(*scanner.SkipCertVerify),
-		boolToStr(*scanner.UseInternalAddr),
+		fmt.Sprintf("%v", *scanner.IsDefault),
+		fmt.Sprintf("%v", *scanner.Disabled),
+		fmt.Sprintf("%v", *scanner.SkipCertVerify),
+		fmt.Sprintf("%v", *scanner.UseInternalAddr),
 		createdAt,
 		updatedAt,
 	})
@@ -61,10 +61,3 @@ func ViewScanner(scanner *models.ScannerRegistration) {
 		os.Exit(1)
 	}
 }
-
-func boolToStr(b bool) string {
-	if b {
-		return "true"
-	}
-	return "false"
-}