Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display information about the running API Server and web UI in odo describe component output #6964

Merged
merged 7 commits into from
Jul 18, 2023
Merged

Display information about the running API Server and web UI in odo describe component output #6964

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e7a5ee
refactor: Set the experimental mode env var in a single place for the…
rm3l Jul 12, 2023
ad4437a
Add integration tests highlighting the expectations
rm3l Jul 12, 2023
a5d2c62
Make the state client return the API server ports per platform
rm3l Jul 12, 2023
52b6c0f
Make 'odo describe component' return information about the API Server…
rm3l Jul 12, 2023
05ca03d
fixup! refactor: Set the experimental mode env var in a single place …
rm3l Jul 17, 2023
974d25c
Unit-test describe#filterByPlatform logic
rm3l Jul 17, 2023
562151e
Simplify logic for 'describe#filterByPlatform', as suggested in review
rm3l Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tests/helper/helper_dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ func StartDevMode(options DevSessionOpts) (devSession DevSession, err error) {
return DevSession{}, err
}

env := append(make([]string, 0, len(options.EnvVars)), options.EnvVars...)
args := []string{"dev"}
if options.NoCommands {
args = append(args, "--no-commands")
Expand All @@ -163,6 +164,7 @@ func StartDevMode(options DevSessionOpts) (devSession DevSession, err error) {
args = append(args, "--address", options.CustomAddress)
}
if options.StartAPIServer {
env = append(env, "ODO_EXPERIMENTAL_MODE=true")
args = append(args, "--api-server")
if options.APIServerPort != 0 {
args = append(args, "--api-server-port", fmt.Sprintf("%d", options.APIServerPort))
Expand All @@ -180,7 +182,7 @@ func StartDevMode(options DevSessionOpts) (devSession DevSession, err error) {
cmd.Cmd.Stdout = c.Tty()
cmd.Cmd.Stderr = c.Tty()

session := cmd.AddEnv(options.EnvVars...).Runner().session
session := cmd.AddEnv(env...).Runner().session
timeoutInSeconds := 420
if options.TimeoutInSeconds != 0 {
timeoutInSeconds = options.TimeoutInSeconds
Expand Down
6 changes: 2 additions & 4 deletions tests/integration/cmd_dev_api_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"k8s.io/utils/pointer"

"github.com/redhat-developer/odo/pkg/labels"
"github.com/redhat-developer/odo/tests/helper"
"k8s.io/utils/pointer"
)

var _ = Describe("odo dev command with api server tests", func() {
Expand Down Expand Up @@ -49,7 +50,6 @@ var _ = Describe("odo dev command with api server tests", func() {
opts := helper.DevSessionOpts{
RunOnPodman: podman,
StartAPIServer: true,
EnvVars: []string{"ODO_EXPERIMENTAL_MODE=true"},
}
if customPort {
opts.APIServerPort = localPort
Expand Down Expand Up @@ -88,7 +88,6 @@ var _ = Describe("odo dev command with api server tests", func() {
opts := helper.DevSessionOpts{
RunOnPodman: podman,
StartAPIServer: true,
EnvVars: []string{"ODO_EXPERIMENTAL_MODE=true"},
}
var err error
devSession, err = helper.StartDevMode(opts)
Expand Down Expand Up @@ -184,7 +183,6 @@ var _ = Describe("odo dev command with api server tests", func() {
CmdlineArgs: args,
RunOnPodman: podman,
StartAPIServer: true,
EnvVars: []string{"ODO_EXPERIMENTAL_MODE=true"},
})
Expect(err).ToNot(HaveOccurred())
})
Expand Down