resolve conflict

Author: SergioLangaritaBenitez

README.md

@@ -148,6 +148,7 @@ Aliases:
 
 Flags:
   -c, --cluster string   set the cluster
+  -o, --output string    output format (yaml or json) (default "yaml")
   -h, --help             help for status
 
 Global Flags:

cmd/bucket_get.go

@@ -112,7 +112,7 @@ func bucketGetPrintTable(cmd *cobra.Command, bucketName string, objects []*stora
 func makeBucketGetCmd() *cobra.Command {
 	bucketGetCmd := &cobra.Command{
 		Use:     "get BUCKET_NAME",
-		Short:   "Get a bucket",
+		Short:   "Get the contents of a bucket",
 		Long:    "Retrieve information about a specific OSCAR bucket using the cluster storage API.",
 		Args:    cobra.ExactArgs(1),
 		Aliases: []string{"g"},

cmd/bucket_list.go

@@ -84,9 +84,9 @@ func bucketListPrintTable(cmd *cobra.Command, objects []*storage.BucketInfo) {
 
 func makeBucketListCmd() *cobra.Command {
 	bucketListCmd := &cobra.Command{
-		Use:     "list BUCKET_NAME",
-		Short:   "List the contents of a bucket",
-		Long:    "List the objects stored in an OSCAR bucket using the cluster storage API.",
+		Use:     "list",
+		Short:   "List the buckets of a cluster",
+		Long:    "List the buckets of a OSCAR cluster using the cluster storage API.",
 		Args:    cobra.ExactArgs(0),
 		Aliases: []string{"ls"},
 		RunE:    bucketListFunc,

cmd/cluster_status.go

@@ -17,9 +17,11 @@ limitations under the License.
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/goccy/go-yaml"
+	"github.com/grycap/oscar-cli/pkg/cluster"
 	"github.com/grycap/oscar-cli/pkg/config"
 	"github.com/spf13/cobra"
 )
@@ -40,15 +42,30 @@ func clusterStatusFunc(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	output, err := yaml.Marshal(status)
-	if err != nil {
-		return fmt.Errorf("failed to serialize cluster status: %w", err)
+	output, _ := cmd.Flags().GetString("output")
+	switch output {
+	case "json":
+		if err := clusterInfoPrintJSON(cmd, status); err != nil {
+			return err
+		}
+	default:
+		outputyaml, err := yaml.Marshal(status)
+		if err != nil {
+			return fmt.Errorf("failed to serialize cluster status: %w", err)
+		}
+		fmt.Print(string(outputyaml))
+
 	}
 
-	fmt.Print(string(output))
 	return nil
 }
 
+func clusterInfoPrintJSON(cmd *cobra.Command, objects cluster.StatusInfo) error {
+	encoder := json.NewEncoder(cmd.OutOrStdout())
+	encoder.SetIndent("", "  ")
+	return encoder.Encode(objects)
+}
+
 func makeClusterStatusCmd() *cobra.Command {
 	clusterStatusCmd := &cobra.Command{
 		Use:     "status",
@@ -59,6 +76,7 @@ func makeClusterStatusCmd() *cobra.Command {
 	}
 
 	clusterStatusCmd.Flags().StringP("cluster", "c", "", "set the cluster")
+	clusterStatusCmd.Flags().StringP("output", "o", "table", "output format (json)")
 
 	return clusterStatusCmd
 }

go.mod

@@ -22,10 +22,11 @@ require (
 require (
 	github.com/gdamore/tcell/v2 v2.8.1
 	github.com/golang-jwt/jwt/v5 v5.2.2
-	github.com/grycap/oscar/v3 v3.3.0
+	github.com/grycap/oscar/v3 v3.6.5
 	github.com/indigo-dc/liboidcagent-go v0.3.0
 	github.com/rivo/tview v0.42.0
 	golang.org/x/term v0.28.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -58,14 +59,13 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apimachinery v0.29.2 // indirect
 	k8s.io/client-go v0.29.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect

go.sum

@@ -74,6 +74,8 @@ github.com/grycap/cdmi-client-go v0.1.1 h1:kHIrrLhvaCD0VyzEa5HOg7d/VgRE11yh9Ztdy
 github.com/grycap/cdmi-client-go v0.1.1/go.mod h1:ZqWeQS3YBJVXxg3HOIkAu1MLNJ4+7s848CyIPMFT5Gc=
 github.com/grycap/oscar/v3 v3.3.0 h1:+zDkUu6IryJ7Xq2QGNDkDCvhMrVhpjAU4cmiW2or+wc=
 github.com/grycap/oscar/v3 v3.3.0/go.mod h1:EN8kr1DLZc99llMJvXk4vnfVKQzEMLrnWdqaEKdg8YI=
+github.com/grycap/oscar/v3 v3.6.5 h1:iQDKY7Vqv/iWGLzyFoxONYQsHA8WunDhyOXP2JKGUis=
+github.com/grycap/oscar/v3 v3.6.5/go.mod h1:Js7D2jFlI5oCYw0QBFp1i3miRYtFLHF6HEALDbSoAis=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -197,6 +199,8 @@ golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
 golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

pkg/service/logs.go

@@ -33,16 +33,10 @@ import (
 
 const logsPath = "/system/logs"
 
-type JobsResponse struct {
-	Jobs         map[string]*types.JobInfo `json:"jobs"`
-	NextPage     string                    `json:"next_page,omitempty"`
-	RemainingJob *int64                    `json:"remaining_jobs,omitempty"`
-}
-
 var ErrNoLogsFound = errors.New("service has no logs")
 
 // ListLogs returns a map with all the available logs from the given service
-func ListLogs(c *cluster.Cluster, name string, page string) (logMap JobsResponse, err error) {
+func ListLogs(c *cluster.Cluster, name string, page string) (logMap types.JobsResponse, err error) {
 	listLogsURL, err := url.Parse(c.Endpoint)
 	if err != nil {
 		return logMap, cluster.ErrParsingEndpoint
@@ -76,7 +70,7 @@ func ListLogs(c *cluster.Cluster, name string, page string) (logMap JobsResponse
 		return logMap, err
 	}
 	jobs := map[string]*types.JobInfo{}
-	jobsResponse := JobsResponse{}
+	jobsResponse := types.JobsResponse{}
 	// Try to decode the response body into the jobsResponse
 	err = json.NewDecoder(bytes.NewReader(body)).Decode(&jobsResponse)
 	if err != nil {
@@ -91,7 +85,7 @@ func ListLogs(c *cluster.Cluster, name string, page string) (logMap JobsResponse
 		if _, ok := jobs["jobs"]; ok {
 			return jobsResponse, err
 		} else {
-			jobsResponse = JobsResponse{Jobs: jobs, NextPage: "", RemainingJob: nil}
+			jobsResponse = types.JobsResponse{Jobs: jobs, NextPage: "", RemainingJob: nil}
 			return jobsResponse, err
 		}