Skip to content

Commit 98c03ec

Browse files
committed
Fix supervisor send empty port name and desc
1 parent e148325 commit 98c03ec

File tree

3 files changed

+45
-26
lines changed

3 files changed

+45
-26
lines changed

components/gitpod-protocol/go/gitpod-config-types.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/supervisor/pkg/ports/ports-config.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,11 @@ func (configs *Configs) Get(port uint32) (*gitpod.PortConfig, ConfigKind, bool)
7474
for _, rangeConfig := range configs.instanceRangeConfigs {
7575
if rangeConfig.Start <= port && port <= rangeConfig.End {
7676
return &gitpod.PortConfig{
77-
Port: float64(port),
78-
OnOpen: rangeConfig.OnOpen,
79-
Visibility: rangeConfig.Visibility,
77+
OnOpen: rangeConfig.OnOpen,
78+
Port: float64(port),
79+
Visibility: rangeConfig.Visibility,
80+
Description: rangeConfig.Description,
81+
Name: rangeConfig.Name,
8082
}, RangeConfigKind, true
8183
}
8284
}
@@ -197,9 +199,11 @@ func parseInstanceConfigs(ports []*gitpod.PortsItems) (portConfigs map[uint32]*g
197199
_, exists := portConfigs[port]
198200
if !exists {
199201
portConfigs[port] = &gitpod.PortConfig{
200-
OnOpen: config.OnOpen,
201-
Port: float64(Port),
202-
Visibility: config.Visibility,
202+
OnOpen: config.OnOpen,
203+
Port: float64(Port),
204+
Visibility: config.Visibility,
205+
Description: config.Description,
206+
Name: config.Name,
203207
}
204208
}
205209
continue

components/supervisor/pkg/ports/ports-config_test.go

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,21 @@ func TestPortsConfig(t *testing.T) {
2929
Desc: "workspace port config",
3030
WorkspacePorts: []*gitpod.PortConfig{
3131
{
32-
Port: 9229,
33-
OnOpen: "ignore",
34-
Visibility: "public",
32+
Port: 9229,
33+
OnOpen: "ignore",
34+
Visibility: "public",
35+
Description: "Nice Port Description",
36+
Name: "Nice Port Name",
3537
},
3638
},
3739
Expectation: &PortConfigTestExpectations{
3840
WorkspaceConfigs: []*gitpod.PortConfig{
3941
{
40-
Port: 9229,
41-
OnOpen: "ignore",
42-
Visibility: "public",
42+
Port: 9229,
43+
OnOpen: "ignore",
44+
Visibility: "public",
45+
Description: "Nice Port Description",
46+
Name: "Nice Port Name",
4347
},
4448
},
4549
},
@@ -49,18 +53,22 @@ func TestPortsConfig(t *testing.T) {
4953
GitpodConfig: &gitpod.GitpodConfig{
5054
Ports: []*gitpod.PortsItems{
5155
{
52-
Port: 9229,
53-
OnOpen: "ignore",
54-
Visibility: "public",
56+
Port: 9229,
57+
OnOpen: "ignore",
58+
Visibility: "public",
59+
Description: "Nice Port Description",
60+
Name: "Nice Port Name",
5561
},
5662
},
5763
},
5864
Expectation: &PortConfigTestExpectations{
5965
InstancePortConfigs: []*gitpod.PortConfig{
6066
{
61-
Port: 9229,
62-
OnOpen: "ignore",
63-
Visibility: "public",
67+
Port: 9229,
68+
OnOpen: "ignore",
69+
Visibility: "public",
70+
Description: "Nice Port Description",
71+
Name: "Nice Port Name",
6472
},
6573
},
6674
},
@@ -70,19 +78,23 @@ func TestPortsConfig(t *testing.T) {
7078
GitpodConfig: &gitpod.GitpodConfig{
7179
Ports: []*gitpod.PortsItems{
7280
{
73-
Port: "9229-9339",
74-
OnOpen: "ignore",
75-
Visibility: "public",
81+
Port: "9229-9339",
82+
OnOpen: "ignore",
83+
Visibility: "public",
84+
Description: "Nice Port Description",
85+
Name: "Nice Port Name",
7686
},
7787
},
7888
},
7989
Expectation: &PortConfigTestExpectations{
8090
InstanceRangeConfigs: []*RangeConfig{
8191
{
8292
PortsItems: &gitpod.PortsItems{
83-
Port: "9229-9339",
84-
OnOpen: "ignore",
85-
Visibility: "public",
93+
Port: "9229-9339",
94+
OnOpen: "ignore",
95+
Visibility: "public",
96+
Description: "Nice Port Description",
97+
Name: "Nice Port Name",
8698
},
8799
Start: 9229,
88100
End: 9339,

0 commit comments

Comments
 (0)