Skip to content

Commit d11fd6a

Browse files
added ports listing
1 parent 9eb2c38 commit d11fd6a

1 file changed

Lines changed: 26 additions & 42 deletions

File tree

cmd/list/ports.go

Lines changed: 26 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
package list
22

33
import (
4+
"context"
5+
"errors"
46
"github.com/loft-sh/devspace/cmd/flags"
57
"github.com/loft-sh/devspace/pkg/util/factory"
8+
"github.com/loft-sh/devspace/pkg/util/log"
9+
"github.com/loft-sh/devspace/pkg/util/message"
610
"github.com/spf13/cobra"
711
)
812

@@ -33,9 +37,9 @@ Lists the port forwarding configurations
3337

3438
// RunListPort runs the list port command logic
3539
func (cmd *portsCmd) RunListPort(f factory.Factory, cobraCmd *cobra.Command, args []string) error {
36-
/*logger := f.GetLog()
40+
logger := f.GetLog()
3741
// Set config root
38-
configLoader := f.NewConfigLoader(cmd.ConfigPath)
42+
configLoader, _ := f.NewConfigLoader(cmd.ConfigPath)
3943
configExists, err := configLoader.SetDevSpaceRoot(logger)
4044
if err != nil {
4145
return err
@@ -44,60 +48,40 @@ func (cmd *portsCmd) RunListPort(f factory.Factory, cobraCmd *cobra.Command, arg
4448
return errors.New(message.ConfigNotFound)
4549
}
4650

47-
configInterface, err := configLoader.Load(cmd.ToConfigOptions(logger), logger)
51+
configInterface, err := configLoader.Load(context.TODO(), nil, cmd.ToConfigOptions(), logger)
4852
if err != nil {
4953
return err
5054
}
5155

5256
config := configInterface.Config()
53-
if config.Dev.Ports == nil || len(config.Dev.Ports) == 0 {
54-
logger.Info("No ports are forwarded.\n")
55-
return nil
56-
}
57-
58-
headerColumnNames := []string{
59-
"ImageSelector",
60-
"LabelSelector",
61-
"Ports (Local:Remote)",
62-
}
63-
64-
portForwards := make([][]string, 0, len(config.Dev.Ports))
65-
66-
// Transform values into string arrays
67-
for _, value := range config.Dev.Ports {
57+
portForwards := make([][]string, 0)
58+
for _, dev := range config.Dev {
59+
if dev.Ports == nil || len(dev.Ports) == 0 {
60+
logger.Info("No ports are forwarded.\n")
61+
return nil
62+
}
6863
selector := ""
69-
for k, v := range value.LabelSelector {
64+
for k, v := range dev.LabelSelector {
7065
if len(selector) > 0 {
7166
selector += ", "
7267
}
73-
7468
selector += k + "=" + v
7569
}
76-
77-
portMappings := ""
78-
if value.PortMappings != nil {
79-
for _, v := range value.PortMappings {
80-
if len(portMappings) > 0 {
81-
portMappings += ", "
82-
}
83-
84-
remotePort := *v.LocalPort
85-
if v.RemotePort != nil {
86-
remotePort = *v.RemotePort
87-
}
88-
89-
portMappings += strconv.Itoa(*v.LocalPort) + ":" + strconv.Itoa(remotePort)
90-
}
70+
// Transform values into string arrays
71+
for _, value := range dev.Ports {
72+
portForwards = append(portForwards, []string{
73+
dev.ImageSelector,
74+
selector,
75+
value.Port,
76+
})
9177
}
92-
93-
portForwards = append(portForwards, []string{
94-
value.ImageSelector,
95-
selector,
96-
portMappings,
97-
})
9878
}
9979

80+
headerColumnNames := []string{
81+
"ImageSelector",
82+
"LabelSelector",
83+
"Ports (Local:Remote)",
84+
}
10085
log.PrintTable(logger, headerColumnNames, portForwards)
101-
return nil*/
10286
return nil
10387
}

0 commit comments

Comments
 (0)