@@ -13,7 +13,6 @@ import (
1313 "github.com/openshift/odo/pkg/log"
1414 "github.com/openshift/odo/pkg/machineoutput"
1515 "github.com/openshift/odo/pkg/odo/genericclioptions"
16- "github.com/openshift/odo/pkg/odo/util/experimental"
1716 "github.com/openshift/odo/pkg/odo/util/pushtarget"
1817 "github.com/openshift/odo/pkg/util"
1918 "github.com/pkg/errors"
@@ -62,11 +61,11 @@ func (o *DescribeComponentOptions) Complete(name string, cmd *cobra.Command, arg
6261 tasks .Add (util.ConcurrentTask {ToRun : func (errChannel chan error ) {
6362 catalogList , err := catalog .ListComponents (o .Client )
6463 if err != nil {
65- if experimental . IsExperimentalModeEnabled () {
66- klog . V ( 4 ). Info ( "Please log in to an OpenShift cluster to list OpenShift/s2i components" )
67- } else {
68- errChannel <- err
69- }
64+ // TODO:
65+ // This MAY have to change in the future.. There is no good way to determine whether the user
66+ // wants to list OpenShift or Kubernetes components. So we simply just warn in debug V(4) if
67+ // we are unable to list anything from OpenShift.
68+ klog . V ( 4 ). Info ( "Please log in to an OpenShift cluster to list OpenShift/s2i components" )
7069 }
7170 for _ , image := range catalogList .Items {
7271 if image .Name == o .componentName {
@@ -76,18 +75,16 @@ func (o *DescribeComponentOptions) Complete(name string, cmd *cobra.Command, arg
7675 }})
7776 }
7877
79- if experimental .IsExperimentalModeEnabled () {
80- tasks .Add (util.ConcurrentTask {ToRun : func (errChannel chan error ) {
81- catalogDevfileList , err := catalog .ListDevfileComponents ("" )
82- if catalogDevfileList .DevfileRegistries == nil {
83- log .Warning ("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n " )
84- }
85- if err != nil {
86- errChannel <- err
87- }
88- o .GetDevfileComponentsByName (catalogDevfileList )
89- }})
90- }
78+ tasks .Add (util.ConcurrentTask {ToRun : func (errChannel chan error ) {
79+ catalogDevfileList , err := catalog .ListDevfileComponents ("" )
80+ if catalogDevfileList .DevfileRegistries == nil {
81+ log .Warning ("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n " )
82+ }
83+ if err != nil {
84+ errChannel <- err
85+ }
86+ o .GetDevfileComponentsByName (catalogDevfileList )
87+ }})
9188
9289 return tasks .Run ()
9390}
@@ -103,50 +100,48 @@ func (o *DescribeComponentOptions) Validate() (err error) {
103100
104101// Run contains the logic for the command associated with DescribeComponentOptions
105102func (o * DescribeComponentOptions ) Run () (err error ) {
106- if experimental .IsExperimentalModeEnabled () {
107- w := tabwriter .NewWriter (os .Stdout , 5 , 2 , 3 , ' ' , tabwriter .TabIndent )
108- if log .IsJSON () {
109- if len (o .devfileComponents ) > 0 {
110- for _ , devfileComponent := range o .devfileComponents {
111- devObj , err := GetDevfile (devfileComponent )
112- if err != nil {
113- return err
114- }
115-
116- machineoutput .OutputSuccess (devObj )
103+ w := tabwriter .NewWriter (os .Stdout , 5 , 2 , 3 , ' ' , tabwriter .TabIndent )
104+ if log .IsJSON () {
105+ if len (o .devfileComponents ) > 0 {
106+ for _ , devfileComponent := range o .devfileComponents {
107+ devObj , err := GetDevfile (devfileComponent )
108+ if err != nil {
109+ return err
117110 }
111+
112+ machineoutput .OutputSuccess (devObj )
118113 }
119- } else {
120- if len ( o . devfileComponents ) > 1 {
121- log . Warningf ( "There are multiple components named \" %s \" in different multiple devfile registries. \n " , o . componentName )
122- }
123- if len ( o . devfileComponents ) > 0 {
124- fmt . Fprintln ( w , "Devfile Component(s):" )
125-
126- for _ , devfileComponent := range o . devfileComponents {
127- fmt . Fprintln ( w , " \n * Registry: " + devfileComponent . Registry . Name )
128-
129- devObj , err := GetDevfile ( devfileComponent )
130- if err != nil {
131- return err
132- }
133-
134- projects := devObj . Data . GetStarterProjects ()
135- // only print project info if there is at least one project in the devfile
136- err = o . PrintDevfileStarterProjects ( w , projects , devObj )
137- if err != nil {
138- return err
139- }
114+ }
115+ } else {
116+ if len ( o . devfileComponents ) > 1 {
117+ log . Warningf ( "There are multiple components named \" %s \" in different multiple devfile registries. \n " , o . componentName )
118+ }
119+ if len ( o . devfileComponents ) > 0 {
120+ fmt . Fprintln ( w , "Devfile Component(s):" )
121+
122+ for _ , devfileComponent := range o . devfileComponents {
123+ fmt . Fprintln ( w , " \n * Registry: " + devfileComponent . Registry . Name )
124+
125+ devObj , err := GetDevfile ( devfileComponent )
126+ if err != nil {
127+ return err
128+ }
129+
130+ projects := devObj . Data . GetStarterProjects ()
131+ // only print project info if there is at least one project in the devfile
132+ err = o . PrintDevfileStarterProjects ( w , projects , devObj )
133+ if err != nil {
134+ return err
140135 }
141- } else {
142- fmt .Fprintln (w , "There are no Odo devfile components with the name \" " + o .componentName + "\" " )
143- }
144- if o .component != "" {
145- fmt .Fprintln (w , "\n S2I Based Components:" )
146- fmt .Fprintln (w , "-" + o .component )
147136 }
148- fmt .Fprintln (w )
137+ } else {
138+ fmt .Fprintln (w , "There are no Odo devfile components with the name \" " + o .componentName + "\" " )
139+ }
140+ if o .component != "" {
141+ fmt .Fprintln (w , "\n S2I Based Components:" )
142+ fmt .Fprintln (w , "-" + o .component )
149143 }
144+ fmt .Fprintln (w )
150145 }
151146
152147 return nil
0 commit comments