Skip to content

Switch to slog #35

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

Merged
090809 merged 11 commits into from
Jul 6, 2026
Merged

Switch to slog #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fc75b25
Switch to slog
YuryLysov Jul 2, 2026
3929f17
Add context to ask password
YuryLysov Jul 2, 2026
3dd961a
++
YuryLysov Jul 3, 2026
4a2bf1f
Update gomod
YuryLysov Jul 3, 2026
c86124a
Update gomod
YuryLysov Jul 3, 2026
cb54b89
Fix tests
YuryLysov Jul 3, 2026
ab5c061
Bump lib-dhctl to v0.20.0
YuryLysov Jul 3, 2026
cea0e25
Update gomod
YuryLysov Jul 3, 2026
a757334
Update CODEOWNERS
YuryLysov Jul 3, 2026
ed9aff3
- Add `tests.WaitPortFree` to ensure fixed ports are free before reus…
090809 Jul 4, 2026
ba36553
go mod tidy
090809 Jul 4, 2026
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @name212
* @090809
22 changes: 11 additions & 11 deletions examples/cobra/cmd/kube_only.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@ func runKube(params *runKubeParams) error {
logger := sett.Logger()

if err := kubeProvider.Cleanup(ctx); err != nil {
logger.ErrorF("Failed to cleanup kube provider: %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Failed to cleanup kube provider: %v", err))
return
}

logger.InfoF("kube provider cleaned up successfully")
logger.InfoContext(ctx, "kube provider cleaned up successfully")
}()

logger := sett.Logger()

// example that additional flags also parsed
if *params.printWarn {
logger.WarnF("WARNING: printing warnings flag set")
logger.WarnContext(ctx, "WARNING: printing warnings flag set")
}

if err != nil {
Expand All @@ -149,25 +149,25 @@ func runKube(params *runKubeParams) error {
_, err = kubeErrProvider.Client(ctx)
if err != nil {
if errors.Is(err, provider.ErrSSHClientCannotProvided) {
logger.InfoF("Cannot provide kube client because %v", err)
logger.InfoContext(ctx, fmt.Sprintf("Cannot provide kube client because %v", err))
} else {
logger.ErrorF("Cannot provide kube client with unknown %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Cannot provide kube client with unknown %v", err))
}
} else {
logger.ErrorF("Kube client should not provided")
logger.ErrorContext(ctx, "Kube client should not provided")
}

// example fail fast with ProvideErrorSSHProviderInitializer
failFastInitializer := provider.NewProvideErrorSSHProviderInitializer(fmt.Errorf("should not use over ssh"))
_, err = provider.GetRunnerInterface(ctx, useSSHKubeConfig, sett, failFastInitializer)
if err != nil {
if errors.Is(err, provider.ErrCannotProvideSSHProvider) {
logger.InfoF("Cannot provide kube runner provider because %v", err)
logger.InfoContext(ctx, fmt.Sprintf("Cannot provide kube runner provider because %v", err))
} else {
logger.ErrorF("Cannot provide kube runner with unknown %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Cannot provide kube runner with unknown %v", err))
}
} else {
logger.ErrorF("Kube runner should not provided")
logger.ErrorContext(ctx, "Kube runner should not provided")
}

return nil
Expand All @@ -194,10 +194,10 @@ func getNodes(ctx context.Context, sett settings.Settings, kubeProvider connecti
return fmt.Errorf("cannot list kube nodes: %w", err)
}

sett.Logger().InfoF("Got kube nodes: %d\n", len(nodes.Items))
sett.Logger().InfoContext(ctx, fmt.Sprintf("Got kube nodes: %d\n", len(nodes.Items)))

for _, node := range nodes.Items {
sett.Logger().InfoF("\t%s\n", node.Name)
sett.Logger().InfoContext(ctx, fmt.Sprintf("\t%s\n", node.Name))
}

return nil
Expand Down
14 changes: 7 additions & 7 deletions examples/cobra/cmd/with_ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func AppendSSHCommand(settProvider SettingsProvider, rootCmd *cobra.Command) (*c
return nil, err
}

sshParser := sshconfig.NewFlagsParser(settProvider())
sshParser := sshconfig.NewFlagsParser(rootCmd.Context(), settProvider())
sshFlags, err := sshParser.InitFlags(flagSet)
if err != nil {
return nil, err
Expand Down Expand Up @@ -120,11 +120,11 @@ func runSSH(params *runSSHParams) error {
logger := sett.Logger()

if err := sshProvider.Cleanup(ctx); err != nil {
logger.ErrorF("Failed to cleanup ssh provider: %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Failed to cleanup ssh provider: %v", err))
return
}

logger.InfoF("SSH provider cleaned up successfully")
logger.InfoContext(ctx, "SSH provider cleaned up successfully")
}()

// example logic if you can use over ssh client and not
Expand All @@ -149,11 +149,11 @@ func runSSH(params *runSSHParams) error {
logger := sett.Logger()

if err := kubeProvider.Cleanup(ctx); err != nil {
logger.ErrorF("Failed to cleanup kube provider: %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Failed to cleanup kube provider: %v", err))
return
}

logger.InfoF("kube provider cleaned up successfully")
logger.InfoContext(ctx, "kube provider cleaned up successfully")
}()

if err != nil {
Expand All @@ -166,7 +166,7 @@ func runSSH(params *runSSHParams) error {

notUseSSH := os.Getenv("NOT_USE_SSH")
if notUseSSH != "" {
sett.Logger().InfoF("Not use ssh passed")
sett.Logger().InfoContext(ctx, "Not use ssh passed")
return nil
}

Expand All @@ -179,7 +179,7 @@ func runSSH(params *runSSHParams) error {
return err
}

sett.Logger().InfoF("SSH command succeeded")
sett.Logger().InfoContext(ctx, "SSH command succeeded")

return nil
}
Expand Down
14 changes: 7 additions & 7 deletions examples/cobra/cmd/with_ssh_additional_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func AppendSSHAdditionalCommand(settProvider SettingsProvider, rootCmd *cobra.Co
return nil, err
}

sshParser := sshconfig.NewFlagsParser(settProvider())
sshParser := sshconfig.NewFlagsParser(rootCmd.Context(), settProvider())
sshFlags, err := sshParser.InitFlags(flagSet)
if err != nil {
return nil, err
Expand Down Expand Up @@ -126,7 +126,7 @@ func doSSHAdditional(ctx context.Context, sett settings.Settings, consumer provi

sshProvider, err := consumer.GetSSHProvider(ctx)
if errors.Is(err, errNotPassedSSHHost) {
sett.Logger().WarnF("SSH host not passed. Skip run ssh command. Pass SSH_HOST_CONNECT env")
sett.Logger().WarnContext(ctx, "SSH host not passed. Skip run ssh command. Pass SSH_HOST_CONNECT env")
return nil
}

Expand All @@ -139,7 +139,7 @@ func doSSHAdditional(ctx context.Context, sett settings.Settings, consumer provi
return fmt.Errorf("fail to run ssh command: %w", err)
}

sett.Logger().InfoF("SSH command succeeded")
sett.Logger().InfoContext(ctx, "SSH command succeeded")

return nil
}
Expand Down Expand Up @@ -213,18 +213,18 @@ func (i *additionalProvidersConsumer) Cleanup(ctx context.Context) error {

if govalue.NotNil(i.kubeProvider) {
if err := i.kubeProvider.Cleanup(ctx); err != nil {
logger.ErrorF("Failed to cleanup kube provider: %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Failed to cleanup kube provider: %v", err))
} else {
logger.InfoF("Kube provider cleaned up successfully")
logger.InfoContext(ctx, "Kube provider cleaned up successfully")

}
}

if govalue.NotNil(i.sshProvider) {
if err := i.sshProvider.Cleanup(ctx); err != nil {
logger.ErrorF("Failed to cleanup SSH provider: %v", err)
logger.ErrorContext(ctx, fmt.Sprintf("Failed to cleanup SSH provider: %v", err))
} else {
logger.InfoF("SSH provider cleaned up successfully")
logger.InfoContext(ctx, "SSH provider cleaned up successfully")
}
}

Expand Down
23 changes: 15 additions & 8 deletions examples/cobra/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@ go 1.25.8

require (
github.com/deckhouse/lib-connection v0.0.0-00010101000000-000000000000
github.com/deckhouse/lib-dhctl v0.18.2
github.com/deckhouse/lib-dhctl v0.20.0
github.com/name212/govalue v1.1.0
github.com/spf13/cobra v1.10.2
k8s.io/apimachinery v0.33.12
)

require (
al.essio.dev/pkg/shellescape v1.6.0 // indirect
atomicgo.dev/cursor v0.2.0 // indirect
atomicgo.dev/keyboard v0.2.9 // indirect
atomicgo.dev/schedule v0.1.0 // indirect
github.com/DataDog/gostackparse v0.7.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/avelino/slugify v0.0.0-20180501145920-855f152bd774 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bramvdbogaerde/go-scp v1.6.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
github.com/containerd/console v1.0.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckhouse/deckhouse/pkg/log v0.1.1-0.20251230144142-2bad7c3d1edf // indirect
github.com/deckhouse/lib-gossh v0.3.0 // indirect
Expand All @@ -44,15 +48,18 @@ require (
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gookit/color v1.5.2 // indirect
github.com/gookit/color v1.6.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/lithammer/fuzzysearch v1.1.8 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.22 // indirect
github.com/mattn/go-runewidth v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.3.2 // indirect
github.com/moby/spdystream v0.5.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -66,21 +73,21 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/pterm/pterm v0.12.83 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/werf/logboek v0.5.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.mongodb.org/mongo-driver v1.5.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.9.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
Expand Down
Loading
Loading