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.

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

Add navigation menu with in compose up (attached) #11605

Merged
merged 1 commit into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ RUN --mount=type=bind,target=. \
FROM build-base AS test
ARG CGO_ENABLED=0
ARG BUILD_TAGS
ENV COMPOSE_MENU=FALSE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary for building?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, because by default it should be true, in order not to break tests this is easier to set the COMPOSE_MENU false in all containers

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(as a follow-up) We can have the e2e tests set this when they exec Compose to avoid needing it globally like this

RUN --mount=type=bind,target=. \
--mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/go/pkg/mod \
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

PKG := github.com/docker/compose/v2
export COMPOSE_MENU = FALSE
VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)

GO_LDFLAGS ?= -w -X ${PKG}/internal.Version=${VERSION}
Expand Down
14 changes: 14 additions & 0 deletions cmd/compose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
ComposeIgnoreOrphans = "COMPOSE_IGNORE_ORPHANS"
// ComposeEnvFiles defines the env files to use if --env-file isn't used
ComposeEnvFiles = "COMPOSE_ENV_FILES"
// ComposeMenu defines if the navigation menu should be rendered. Can be also set via --menu
ComposeMenu = "COMPOSE_MENU"
)

type Backend interface {
Expand Down Expand Up @@ -620,3 +622,15 @@
ui.ModePlain,
ui.ModeQuiet,
}

func SetUnchangedOption(name string, experimentalFlag bool) bool {
var value bool
// If the var is defined we use that value first
if envVar, ok := os.LookupEnv(name); ok {
value = utils.StringToBool(envVar)

Check warning on line 630 in cmd/compose/compose.go

View check run for this annotation

Codecov / codecov/patch

cmd/compose/compose.go#L630

Added line #L630 was not covered by tests
} else {
// if not, we try to get it from experimental feature flag
value = experimentalFlag
}
return value
}
57 changes: 33 additions & 24 deletions cmd/compose/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,22 @@ type composeOptions struct {

type upOptions struct {
*composeOptions
Detach bool
noStart bool
noDeps bool
cascadeStop bool
exitCodeFrom string
noColor bool
noPrefix bool
attachDependencies bool
attach []string
noAttach []string
timestamp bool
wait bool
waitTimeout int
watch bool
Detach bool
noStart bool
noDeps bool
cascadeStop bool
exitCodeFrom string
noColor bool
noPrefix bool
attachDependencies bool
attach []string
noAttach []string
timestamp bool
wait bool
waitTimeout int
watch bool
navigationMenu bool
navigationMenuChanged bool
}

func (opts upOptions) apply(project *types.Project, services []string) (*types.Project, error) {
Expand Down Expand Up @@ -87,6 +89,7 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, ex
PreRunE: AdaptCmd(func(ctx context.Context, cmd *cobra.Command, args []string) error {
create.pullChanged = cmd.Flags().Changed("pull")
create.timeChanged = cmd.Flags().Changed("timeout")
up.navigationMenuChanged = cmd.Flags().Changed("menu")
return validateFlags(&up, &create)
}),
RunE: p.WithServices(dockerCli, func(ctx context.Context, project *types.Project, services []string) error {
Expand Down Expand Up @@ -128,6 +131,8 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, ex
flags.BoolVar(&up.wait, "wait", false, "Wait for services to be running|healthy. Implies detached mode.")
flags.IntVar(&up.waitTimeout, "wait-timeout", 0, "Maximum duration to wait for the project to be running|healthy")
flags.BoolVarP(&up.watch, "watch", "w", false, "Watch source code and rebuild/refresh containers when files are updated.")
flags.BoolVar(&up.navigationMenu, "menu", false, "Enable interactive shortcuts when running attached (Experimental). Incompatible with --detach.")
flags.MarkHidden("menu") //nolint:errcheck

return upCmd
}
Expand Down Expand Up @@ -161,7 +166,7 @@ func runUp(
ctx context.Context,
dockerCli command.Cli,
backend api.Service,
_ *experimental.State,
experimentals *experimental.State,
createOptions createOptions,
upOptions upOptions,
buildOptions buildOptions,
Expand All @@ -181,6 +186,9 @@ func runUp(
if err != nil {
return err
}
if !upOptions.navigationMenuChanged {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems bit complicated to manage value set by env var, is there any drawback doing the same as https://github.com/docker/compose/blob/main/cmd/compose/up.go#L109-L110 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(this comment is mine, I was connected with by @docker.com email while commenting :P)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we also want to have into consideration the value of the Docker Desktop experimental feature value
Screenshot 2024-03-21 at 16 05 49

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh indeed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(not for this PR)

We definitely need to figure out a re-usable pattern for these types of use cases to simplify driving experimental settings via Docker Desktop and combining with flags/options in Compose

Our init sequence has gotten pretty complex between Docker CLI plugin framework + Cobra + Compose itself 😓

upOptions.navigationMenu = SetUnchangedOption(ComposeMenu, experimentals.NavBar())
}

var build *api.BuildOptions
if !createOptions.noBuild {
Expand Down Expand Up @@ -253,15 +261,16 @@ func runUp(
return backend.Up(ctx, project, api.UpOptions{
Create: create,
Start: api.StartOptions{
Project: project,
Attach: consumer,
AttachTo: attach,
ExitCodeFrom: upOptions.exitCodeFrom,
CascadeStop: upOptions.cascadeStop,
Wait: upOptions.wait,
WaitTimeout: timeout,
Watch: upOptions.watch,
Services: services,
Project: project,
Attach: consumer,
AttachTo: attach,
ExitCodeFrom: upOptions.exitCodeFrom,
CascadeStop: upOptions.cascadeStop,
Wait: upOptions.wait,
WaitTimeout: timeout,
Watch: upOptions.watch,
Services: services,
NavigationMenu: upOptions.navigationMenu,
},
})
}
Expand Down
67 changes: 67 additions & 0 deletions cmd/formatter/ansi.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
Copyright 2024 Docker Compose CLI authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package formatter

import (
"fmt"

"github.com/acarl005/stripansi"
)

func ansi(code string) string {
return fmt.Sprintf("\033%s", code)
}
func SaveCursor() {
fmt.Print(ansi("7"))

Check warning on line 29 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L28-L29

Added lines #L28 - L29 were not covered by tests
}
func RestoreCursor() {
fmt.Print(ansi("8"))

Check warning on line 32 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L31-L32

Added lines #L31 - L32 were not covered by tests
}
func HideCursor() {
fmt.Print(ansi("[?25l"))

Check warning on line 35 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L34-L35

Added lines #L34 - L35 were not covered by tests
}
func ShowCursor() {
fmt.Print(ansi("[?25h"))

Check warning on line 38 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L37-L38

Added lines #L37 - L38 were not covered by tests
}
func MoveCursor(y, x int) {
fmt.Print(ansi(fmt.Sprintf("[%d;%dH", y, x)))

Check warning on line 41 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L40-L41

Added lines #L40 - L41 were not covered by tests
}
func MoveCursorX(pos int) {
fmt.Print(ansi(fmt.Sprintf("[%dG", pos)))

Check warning on line 44 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L43-L44

Added lines #L43 - L44 were not covered by tests
}
func ClearLine() {
// Does not move cursor from its current position
fmt.Print(ansi("[2K"))
}
func MoveCursorUp(lines int) {
// Does not add new lines
fmt.Print(ansi(fmt.Sprintf("[%dA", lines)))

Check warning on line 52 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L50-L52

Added lines #L50 - L52 were not covered by tests
}
func MoveCursorDown(lines int) {
// Does not add new lines
fmt.Print(ansi(fmt.Sprintf("[%dB", lines)))

Check warning on line 56 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L54-L56

Added lines #L54 - L56 were not covered by tests
}
func NewLine() {
// Like \n
fmt.Print("\012")

Check warning on line 60 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L58-L60

Added lines #L58 - L60 were not covered by tests
}
func lenAnsi(s string) int {
// len has into consideration ansi codes, if we want
// the len of the actual len(string) we need to strip
// all ansi codes
return len(stripansi.Strip(s))

Check warning on line 66 in cmd/formatter/ansi.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/ansi.go#L62-L66

Added lines #L62 - L66 were not covered by tests
}
25 changes: 21 additions & 4 deletions cmd/formatter/colors.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@
"white",
}

const (
BOLD = "1"
FAINT = "2"
ITALIC = "3"
UNDERLINE = "4"
)

const (
RESET = "0"
CYAN = "36"
)

const (
// Never use ANSI codes
Never = "never"
Expand Down Expand Up @@ -72,12 +84,17 @@
return s
}

func ansiColor(code, s string) string {
return fmt.Sprintf("%s%s%s", ansi(code), s, ansi("0"))
func ansiColor(code, s string, formatOpts ...string) string {
return fmt.Sprintf("%s%s%s", ansiColorCode(code, formatOpts...), s, ansiColorCode("0"))

Check warning on line 88 in cmd/formatter/colors.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/colors.go#L87-L88

Added lines #L87 - L88 were not covered by tests
}

func ansi(code string) string {
return fmt.Sprintf("\033[%sm", code)
// Everything about ansiColorCode color https://hyperskill.org/learn/step/18193
func ansiColorCode(code string, formatOpts ...string) string {
res := "\033["
for _, c := range formatOpts {
res = fmt.Sprintf("%s%s;", res, c)
}
return fmt.Sprintf("%s%sm", res, code)

Check warning on line 97 in cmd/formatter/colors.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/colors.go#L92-L97

Added lines #L92 - L97 were not covered by tests
}

func makeColorFunc(code string) colorFunc {
Expand Down
24 changes: 17 additions & 7 deletions cmd/formatter/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,29 @@
l.write(l.stderr, container, message)
}

var navColor = makeColorFunc("90")

func (l *logConsumer) write(w io.Writer, container, message string) {
if l.ctx.Err() != nil {
return
}
p := l.getPresenter(container)
timestamp := time.Now().Format(jsonmessage.RFC3339NanoFixed)
for _, line := range strings.Split(message, "\n") {
if l.timestamp {
fmt.Fprintf(w, "%s%s%s\n", p.prefix, timestamp, line)
} else {
fmt.Fprintf(w, "%s%s\n", p.prefix, line)
printFn := func() {
p := l.getPresenter(container)
timestamp := time.Now().Format(jsonmessage.RFC3339NanoFixed)
for _, line := range strings.Split(message, "\n") {
ClearLine()
if l.timestamp {
fmt.Fprintf(w, "%s%s%s\n", p.prefix, timestamp, line)

Check warning on line 117 in cmd/formatter/logs.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/logs.go#L117

Added line #L117 was not covered by tests
} else {
fmt.Fprintf(w, "%s%s\n", p.prefix, line)
}
}
}
if KeyboardManager != nil {
KeyboardManager.PrintKeyboardInfo(printFn)

Check warning on line 124 in cmd/formatter/logs.go

View check run for this annotation

Codecov / codecov/patch

cmd/formatter/logs.go#L124

Added line #L124 was not covered by tests
} else {
printFn()
}
}

func (l *logConsumer) Status(container, msg string) {
Expand Down
Loading
Loading