mirror of
https://github.com/skoelle/kctl-tui.git
synced 2026-09-17 20:10:24 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2911f97991 | ||
|
|
7db58b6fe8 | ||
|
|
201168e8cd | ||
|
|
ffbf4341fa | ||
|
|
37be0707ad | ||
|
|
9e6acdedc2 | ||
|
|
07662dc9b7 | ||
|
|
38b28f64fb | ||
|
|
6a749811c7 | ||
|
|
313dffcbbf | ||
|
|
8546ac9bf2 | ||
|
|
4c0650c43b | ||
|
|
e36ac3568f | ||
|
|
697017e496 | ||
|
|
36a7cc5e3a | ||
|
|
e48bd790bd | ||
|
|
6795ee1f4f | ||
|
|
edc02d48d4 | ||
|
|
2c8e8016ff | ||
|
|
886efa5958 | ||
|
|
c4d54d153f | ||
|
|
4bb3507aec | ||
|
|
145288971a | ||
|
|
75e0b832a2 |
@@ -0,0 +1,38 @@
|
||||
---
|
||||
name: Bug Report
|
||||
about: Report a bug to help us improve kctl-tui
|
||||
title: ""
|
||||
labels: bug
|
||||
assignees: ""
|
||||
---
|
||||
|
||||
## Describe the Bug
|
||||
|
||||
A clear description of what the bug is.
|
||||
|
||||
## Steps to Reproduce
|
||||
|
||||
1. Run `kctl-tui ...`
|
||||
2. Select '...'
|
||||
3. See error
|
||||
|
||||
## Expected Behavior
|
||||
|
||||
What you expected to happen.
|
||||
|
||||
## Actual Behavior
|
||||
|
||||
What actually happened.
|
||||
|
||||
## Environment
|
||||
|
||||
- OS: [e.g. Windows 11, Ubuntu 24.04, macOS 15]
|
||||
- Go version: [e.g. 1.22.5]
|
||||
- kctl-tui version: [e.g. v0.2.0]
|
||||
- kubectl version: [e.g. v1.30.0]
|
||||
- tmux/psmux version: [e.g. tmux 3.4, psmux latest]
|
||||
- Terminal: [e.g. Windows Terminal, iTerm2, GNOME Terminal]
|
||||
|
||||
## Additional Context
|
||||
|
||||
Config file (without secrets), error logs, or screenshots.
|
||||
@@ -0,0 +1,23 @@
|
||||
---
|
||||
name: Feature Request
|
||||
about: Suggest a new feature or improvement
|
||||
title: ""
|
||||
labels: enhancement
|
||||
assignees: ""
|
||||
---
|
||||
|
||||
## Problem
|
||||
|
||||
What problem does this feature solve?
|
||||
|
||||
## Proposed Solution
|
||||
|
||||
Describe the solution you'd like.
|
||||
|
||||
## Alternatives Considered
|
||||
|
||||
Any alternative solutions or workarounds you considered.
|
||||
|
||||
## Additional Context
|
||||
|
||||
Any mockups, examples, or references.
|
||||
@@ -0,0 +1,23 @@
|
||||
## Summary
|
||||
|
||||
Brief description of what this PR does.
|
||||
|
||||
## Changes
|
||||
|
||||
- ...
|
||||
|
||||
## Related Issues
|
||||
|
||||
Closes #
|
||||
|
||||
## Testing
|
||||
|
||||
- [ ] `go vet ./...` passes
|
||||
- [ ] `go test ./...` passes
|
||||
- [ ] Manually tested on [OS]
|
||||
|
||||
## Checklist
|
||||
|
||||
- [ ] Code follows existing style
|
||||
- [ ] No new comments added (unless necessary)
|
||||
- [ ] CHANGELOG.md updated (if applicable)
|
||||
@@ -60,7 +60,7 @@ jobs:
|
||||
ext=""
|
||||
if [ "${{ matrix.goos }}" = "windows" ]; then ext=".exe"; fi
|
||||
out="dist/kctl-tui-${{ matrix.goos }}-${{ matrix.goarch }}${ext}"
|
||||
go build -o "$out" -ldflags "-s -w" ./cmd/kctl-tui
|
||||
go build -o "$out" -ldflags "-s -w -X main.version=${GITHUB_REF_NAME}" ./cmd/kctl-tui
|
||||
echo "Built $out"
|
||||
|
||||
- name: Upload artifact
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
# Binaries
|
||||
/bin/
|
||||
/dist/
|
||||
kctl-tui
|
||||
kctl-tui.exe
|
||||
/kctl-tui
|
||||
/kctl-tui.exe
|
||||
|
||||
# Go
|
||||
*.test
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to kctl-tui will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.2.0] - 2026-08-09
|
||||
|
||||
### Added
|
||||
- **Windows support** via [psmux](https://github.com/marlocarlo/psmux) as tmux-compatible multiplexer
|
||||
- `install.ps1` PowerShell install script for Windows
|
||||
- `--help` flag with full usage documentation
|
||||
- `--version` / `-v` flag (set via `-ldflags` at build time)
|
||||
- `kctl-tui doctor` command to verify tools, config and cluster connectivity
|
||||
- `kctl-tui config check` command to validate `~/.kctl-tui/config.yaml`
|
||||
- `--verbose` flag for debug logging of all kubectl/aws commands to stderr
|
||||
- Binary secret value detection (`IsBinary`) — base64 or non-UTF-8 content is flagged
|
||||
- ExternalSecret name validation before force-sync
|
||||
- `CheckTool()` and `CheckAWSAuth()` helpers for pre-flight checks
|
||||
- Diff table scroll support (j/k, up/down arrows)
|
||||
- `--command pods` flag for k9s to start directly in pod view
|
||||
- `--namespace` flag for k9s (Windows compatibility)
|
||||
|
||||
### Fixed
|
||||
- Tmux session cleanup: stale sessions are killed before creating new ones
|
||||
- Panel path: uses `os.Executable()` instead of PATH lookup for correct binary
|
||||
- k9s on Windows: `--namespace` instead of `-n`, direct pods view
|
||||
- `--help` always shows usage and exits (no fallthrough to TUI)
|
||||
- Unknown subcommands show error message + usage (exit 1)
|
||||
- Panel quit: properly closes tmux session and exits
|
||||
- Bubbles list filter disabled to prevent stuck filter state after tmux return
|
||||
|
||||
### Changed
|
||||
- Config uses `k8s_secret_name_template` for Kubernetes secret names (separate from AWS `secret_name_template`)
|
||||
- Contexts resolved via template (`context_template`) instead of live kubectl discovery
|
||||
- Panel redesigned: env-first menu (quit/beta/prod) with secrets sync + redeploy
|
||||
- Full-mode navigation starts at team selection with default context
|
||||
- `tea.ExecProcess` only used for `tmux attach` — setup commands run synchronously
|
||||
|
||||
### Removed
|
||||
- Context-pair logic (superseded by env-template based context resolution)
|
||||
- Live kubectl discovery (superseded by config templates)
|
||||
|
||||
## [0.1.0] - 2026-07-XX
|
||||
|
||||
### Added
|
||||
- Initial release with Bubble Tea TUI
|
||||
- 3-pane tmux orchestration (control panel + 2x k9s)
|
||||
- Team/namespace navigation with kubectl context switching
|
||||
- Panel mode with redeploy and secrets diff/force-sync
|
||||
- AWS SSO integration with interactive login prompt
|
||||
- CI/CD pipeline with Go build and release
|
||||
- Linux/macOS install script
|
||||
|
||||
[Unreleased]: https://github.com/skoelle/kctl-tui/compare/v0.2.0...HEAD
|
||||
[0.2.0]: https://github.com/skoelle/kctl-tui/compare/v0.1.0...v0.2.0
|
||||
[0.1.0]: https://github.com/skoelle/kctl-tui/releases/tag/v0.1.0
|
||||
@@ -0,0 +1,95 @@
|
||||
# Contributing to kctl-tui
|
||||
|
||||
Thanks for your interest in contributing! This document explains how to get
|
||||
started.
|
||||
|
||||
## Development Setup
|
||||
|
||||
```bash
|
||||
git clone https://github.com/skoelle/kctl-tui.git
|
||||
cd kctl-tui
|
||||
go mod download
|
||||
```
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- Go 1.22+
|
||||
- kubectl, k9s, tmux (or psmux on Windows)
|
||||
- An active Kubernetes cluster for integration testing
|
||||
|
||||
### Running Locally
|
||||
|
||||
```bash
|
||||
go run ./cmd/kctl-tui
|
||||
```
|
||||
|
||||
### Building
|
||||
|
||||
```bash
|
||||
go build -o kctl-tui ./cmd/kctl-tui
|
||||
```
|
||||
|
||||
### With Version Tag
|
||||
|
||||
```bash
|
||||
go build -ldflags "-X main.version=v0.2.0" -o kctl-tui ./cmd/kctl-tui
|
||||
```
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
cmd/kctl-tui/ Entry points (main, full mode, panel mode)
|
||||
internal/config/ YAML config loading and template resolution
|
||||
internal/kctl/ Pure logic (secret diffing, template engine)
|
||||
internal/kubeexec/ kubectl/aws/tmux wrappers (side effects only)
|
||||
```
|
||||
|
||||
### Architecture Rules
|
||||
|
||||
- **Pure logic** goes into `internal/kctl` or `internal/config` — no exec, no I/O.
|
||||
- **Side effects** (running kubectl, aws, tmux) go into `internal/kubeexec`.
|
||||
- **UI** lives in `cmd/kctl-tui/` — Bubble Tea models, views, handlers.
|
||||
- Unit tests cover pure logic only. Side-effect packages are tested via
|
||||
integration/manual tests.
|
||||
|
||||
## Testing
|
||||
|
||||
```bash
|
||||
go vet ./... # static analysis
|
||||
go test ./... # unit tests
|
||||
```
|
||||
|
||||
There are no integration tests yet. Manual testing against a real cluster is
|
||||
expected for UI and kubeexec changes.
|
||||
|
||||
## Code Style
|
||||
|
||||
- Standard Go formatting (`gofmt`).
|
||||
- No comments unless the logic is non-obvious.
|
||||
- Error messages should be actionable — tell the user what to fix.
|
||||
- Log commands with `kubeexec.VerboseLog()` when `--verbose` is active.
|
||||
|
||||
## Commits
|
||||
|
||||
- One logical change per commit.
|
||||
- Imperative mood in commit messages ("Add ...", "Fix ...", "Remove ...").
|
||||
- No co-authors in commits.
|
||||
|
||||
## Pull Requests
|
||||
|
||||
1. Fork the repo and create a feature branch.
|
||||
2. Make your changes following the style guide above.
|
||||
3. Run `go vet` and `go test`.
|
||||
4. Open a PR against `main` with a clear description of what changed and why.
|
||||
5. Reference any related issues.
|
||||
|
||||
## Issues
|
||||
|
||||
- Use the provided issue templates.
|
||||
- Include your OS, Go version, and kctl-tui version.
|
||||
- For bugs: steps to reproduce, expected vs actual behavior.
|
||||
|
||||
## License
|
||||
|
||||
By contributing, you agree that your contributions will be licensed under the
|
||||
MIT License.
|
||||
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026 Stefan Koelle
|
||||
Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -17,15 +17,17 @@ is still open. For the full requirements, see [SPEC.md](SPEC.md).
|
||||
## Phase 1 — Core logic + navigation (done, initial version)
|
||||
|
||||
- [x] `internal/kctl`: pure, unit-tested logic —
|
||||
context-pair matching (`FindNextContext`), namespace/label filtering
|
||||
template resolution (`ResolveTemplate`), namespace/label filtering
|
||||
(`DistinctLabelValues`, `NamespacesForLabelValue`), and secret diffing
|
||||
(`DiffSecretValues`, `AnyMismatch`).
|
||||
- [x] `internal/config`: YAML config loading (`context_pairs`,
|
||||
`team_label_key`), with safe defaults when no config file exists yet.
|
||||
- [x] `internal/config`: YAML config loading with template-based context
|
||||
and secret name resolution (`ContextTemplate`, `SecretNameTemplate`,
|
||||
`K8sSecretNameTemplate`), with safe defaults when no config file
|
||||
exists yet.
|
||||
- [x] `internal/kubeexec`: thin wrappers around `kubectl`/`aws` CLI calls
|
||||
(contexts, namespaces, deployments, rollout restart/status, listing
|
||||
AWS secrets, reading all fields of a Kubernetes secret, ExternalSecret
|
||||
annotation).
|
||||
(namespaces, deployments, rollout restart/status, fetching AWS
|
||||
secrets by template-resolved ID, reading all fields of a Kubernetes
|
||||
secret, ExternalSecret annotation, AWS auth check).
|
||||
- [x] `cmd/kctl-tui` "full" mode: Bubble Tea navigation for
|
||||
context -> team -> namespace, with `Esc` correctly popping back one
|
||||
level at a time, defaults pre-selected from the currently active
|
||||
@@ -38,13 +40,13 @@ is still open. For the full requirements, see [SPEC.md](SPEC.md).
|
||||
- [x] `cmd/kctl-tui` "panel" mode:
|
||||
- Redeploy: pick a deployment from a list, confirm, then
|
||||
`rollout restart` + `rollout status`.
|
||||
- Secrets: pick an AWS region, then pick the actual secret from a
|
||||
**list of all AWS Secrets Manager secrets** in that region (no more
|
||||
manual secret-ID typing), enter the matching Kubernetes secret
|
||||
name, and automatically diff **every field** of both secrets in one
|
||||
table (key / AWS value / Kubernetes value / match status). If any
|
||||
field differs, offer a single force-sync request for the **whole
|
||||
secret** (one ExternalSecret annotation), not per individual field.
|
||||
- Secrets: AWS auth check with interactive SSO login fallback,
|
||||
then automatically resolve the AWS secret ID (from
|
||||
`secret_name_template`) and Kubernetes secret name (from
|
||||
`k8s_secret_name_template`), fetch both, diff **every field**
|
||||
in one table (key / AWS value / Kubernetes value / match status).
|
||||
If any field differs, offer a single force-sync request for the
|
||||
**whole secret** (one ExternalSecret annotation).
|
||||
- `Esc` closes the whole tmux session (`tmux kill-session`).
|
||||
|
||||
## Phase 2 — Hardening (open)
|
||||
@@ -64,27 +66,24 @@ is still open. For the full requirements, see [SPEC.md](SPEC.md).
|
||||
- [ ] Paginate/scroll the secrets diff table for secrets with many fields
|
||||
instead of relying on terminal wrapping.
|
||||
|
||||
## Phase 3 — Windows-native support (open, secondary priority)
|
||||
## Phase 3 — Windows-native support (done)
|
||||
|
||||
- [ ] Detect OS at runtime; on native Windows (no WSL), fall back to
|
||||
`wt.exe split-pane` instead of `tmux` for the status panes.
|
||||
- [ ] Document/implement that `Tab`-based context switching and
|
||||
`Esc`-triggered session close are **not** available in the native
|
||||
Windows fallback, per SPEC.md 3.6 — the panes must be closed
|
||||
manually there.
|
||||
- [x] Windows support via [psmux](https://github.com/marlocarlo/psmux) —
|
||||
a native, tmux-compatible terminal multiplexer. kctl-tui works
|
||||
without code changes; `CheckTool("tmux")` error message includes
|
||||
Windows-specific install hint.
|
||||
- [x] `install.ps1` — PowerShell install script for Windows.
|
||||
- [x] Updated README and SPEC with Windows + psmux setup instructions.
|
||||
|
||||
## Phase 4 — Nice-to-haves (open, not committed)
|
||||
|
||||
- [x] `--version` flag — prints version, set via `-ldflags` at build time.
|
||||
- [x] Config validation command (`kctl-tui config check`) — validates
|
||||
required fields and shows a resolved context example.
|
||||
- [ ] Optional direct use of `client-go` instead of shelling out to
|
||||
`kubectl`, for faster context/namespace/label queries.
|
||||
- [ ] Config validation command (`kctl-tui config check`) that reports
|
||||
unknown label keys or context names not present in the current
|
||||
kubeconfig.
|
||||
- [ ] Homebrew tap / `scoop` manifest as additional install options
|
||||
alongside `install.sh`.
|
||||
- [ ] Optional heuristic to suggest a matching Kubernetes secret name for
|
||||
a chosen AWS secret (e.g. by common naming convention), instead of
|
||||
always asking for it manually.
|
||||
|
||||
## Notes for contributors
|
||||
|
||||
|
||||
@@ -68,12 +68,16 @@ See [SPEC.md](SPEC.md) for the full requirements and design rationale, and
|
||||
Configuration below - they must already exist in your kubeconfig, e.g.
|
||||
added via `aws eks update-kubeconfig`).
|
||||
- `k9s` (used for the two status panes).
|
||||
- `tmux` (used for the 3-pane layout). On Windows, this means running
|
||||
kctl-tui inside **WSL** — `tmux` has no native Windows port. Native
|
||||
Windows Terminal has its own split-pane feature, but it cannot be
|
||||
scripted from inside a pane the way `tmux` can, so the automated 3-pane
|
||||
layout and the `Esc` session handling described above are only fully
|
||||
supported under Linux/WSL. See SPEC.md section 3.6 for details.
|
||||
- `tmux` (used for the 3-pane layout). On **Linux/macOS**, install
|
||||
`tmux` via your package manager. On **Windows**, install
|
||||
[psmux](https://github.com/marlocarlo/psmux) — a native,
|
||||
tmux-compatible terminal multiplexer:
|
||||
```powershell
|
||||
scoop install psmux
|
||||
# or
|
||||
cargo install psmux
|
||||
```
|
||||
psmux provides a `tmux` command, so kctl-tui works without changes.
|
||||
- `aws` CLI, configured with credentials, only needed for the secrets
|
||||
workflow.
|
||||
|
||||
@@ -85,6 +89,15 @@ See [SPEC.md](SPEC.md) for the full requirements and design rationale, and
|
||||
curl -fsSL https://raw.githubusercontent.com/skoelle/kctl-tui/main/install.sh | bash
|
||||
```
|
||||
|
||||
### Quick install (Windows)
|
||||
|
||||
```powershell
|
||||
irm https://raw.githubusercontent.com/skoelle/kctl-tui/main/install.ps1 | iex
|
||||
```
|
||||
|
||||
This downloads the latest release binary for your architecture from
|
||||
GitHub Releases and installs it to your PATH.
|
||||
|
||||
This downloads the latest release binary for your OS/architecture from
|
||||
GitHub Releases and installs it to `/usr/local/bin/kctl-tui`.
|
||||
|
||||
@@ -125,6 +138,7 @@ aws_region: "eu-central-1"
|
||||
aws_account_id: "123456789012"
|
||||
|
||||
secret_name_template: "tf-{namespace}-{env}-secrets"
|
||||
k8s_secret_name_template: "{namespace}-common-secrets"
|
||||
context_template: "arn:aws:eks:{region}:{account_id}:cluster/tf-{env}-{context}-1"
|
||||
|
||||
team_label_key: "example.org/team"
|
||||
@@ -144,6 +158,10 @@ aws_sso_login_command: "aws sso login"
|
||||
- `secret_name_template`: builds the AWS Secrets Manager secret ID from
|
||||
the chosen namespace and environment. Placeholders: `{namespace}`,
|
||||
`{env}`.
|
||||
- `k8s_secret_name_template`: builds the Kubernetes secret name from the
|
||||
chosen namespace. Kept separate from `secret_name_template` because the
|
||||
two sides commonly follow different naming conventions. Placeholders:
|
||||
`{namespace}`.
|
||||
- `context_template`: builds the actual kubectl context name/ARN from
|
||||
region, account ID, environment, and context. Placeholders: `{region}`,
|
||||
`{account_id}`, `{env}`, `{context}`. Adjust the literal parts (`tf-`,
|
||||
@@ -162,17 +180,37 @@ aws_sso_login_command: "aws sso login"
|
||||
that way — it typically contains your organization's internal account ID,
|
||||
context naming, and label names.
|
||||
|
||||
## WSL setup notes
|
||||
## Windows notes
|
||||
|
||||
If `kubectx`/`kubens` or `kctl-tui` report a missing kubeconfig inside WSL,
|
||||
your kubeconfig most likely only exists on the Windows side. Symlink it
|
||||
into WSL:
|
||||
On native Windows (without WSL), install [psmux](https://github.com/marlocarlo/psmux)
|
||||
for the 3-pane layout. psmux is a native Windows terminal multiplexer
|
||||
that is tmux-compatible — kctl-tui works without code changes:
|
||||
|
||||
```powershell
|
||||
scoop install psmux
|
||||
# or
|
||||
cargo install psmux
|
||||
```
|
||||
|
||||
If you prefer WSL, symlink your kubeconfig into WSL:
|
||||
|
||||
```bash
|
||||
mkdir -p ~/.kube
|
||||
ln -s /mnt/c/Users/<your-windows-username>/.kube/config ~/.kube/config
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
kctl-tui # start the TUI (full navigation mode)
|
||||
kctl-tui --help # show all commands and flags
|
||||
kctl-tui --version # print version
|
||||
kctl-tui --verbose # enable debug logging to stderr
|
||||
kctl-tui doctor # check if all tools, config and connections are OK
|
||||
kctl-tui config check # validate ~/.kctl-tui/config.yaml
|
||||
kctl-tui panel --context=... --ns=... --team=... # internal (called by tmux)
|
||||
```
|
||||
|
||||
## Development
|
||||
|
||||
```bash
|
||||
@@ -189,4 +227,4 @@ and untested, since it has no meaningful behavior without a live cluster.
|
||||
|
||||
## License
|
||||
|
||||
[MIT](LICENSE)
|
||||
Licensed under the [MIT License](LICENSE) - Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
A single terminal tool as the central entry point for everyday Kubernetes
|
||||
work, bundling the most common workflows currently done via long
|
||||
`kubectl`/`k9s`/`aws-cli` commands, operable through a text UI (arrow keys,
|
||||
Esc, Tab) instead of long typed commands.
|
||||
Esc) instead of long typed commands.
|
||||
|
||||
Target platform: **Linux / WSL** (primary usage scenario, since split
|
||||
panes require a real terminal multiplexer). Native Windows (without WSL)
|
||||
@@ -49,9 +49,6 @@ Navigation:
|
||||
(`tmux kill-session`, closing both k9s panes as well) and then moves the
|
||||
Go tool's screen stack one level up: namespace selection -> team
|
||||
selection -> context selection.
|
||||
- **Tab** in the control pane switches the context pair according to the
|
||||
context-pair pattern (see 3.6) for both status panes simultaneously; the
|
||||
namespace stays the same.
|
||||
|
||||
### 3.2 Namespace grouping via labels
|
||||
|
||||
@@ -64,10 +61,10 @@ Navigation:
|
||||
kubectl get ns -o jsonpath='{range .items[*]}{.metadata.labels["<team-label-key>"]}{"\n"}{end}' | sort -u
|
||||
```
|
||||
- The actual label key is project-specific and set via the configuration
|
||||
file (see 3.6), not hardcoded.
|
||||
file (see `team_label_key` in config), not hardcoded.
|
||||
- Namespace labeling is a prerequisite (one-time setup outside the tool).
|
||||
|
||||
### 3.3 Layout: 3-panel view (core design change vs. earlier drafts)
|
||||
### 3.3 Layout: 3-panel view
|
||||
|
||||
Once start navigation is complete, the tool opens a tmux session with
|
||||
**three panes**, started with a single command:
|
||||
@@ -78,9 +75,9 @@ Once start navigation is complete, the tool opens a tmux session with
|
||||
| -> runs the kctl-tui binary in "panel" mode |
|
||||
| -> menu: Redeploy, secrets diff |
|
||||
+--------------------------------------------------+
|
||||
| Pane 1 (middle): k9s --context <context-a> -n <ns>|
|
||||
| Pane 1 (middle): k9s --context <context-a> --namespace <ns> --command pods|
|
||||
+--------------------------------------------------+
|
||||
| Pane 2 (bottom): k9s --context <context-b> -n <ns>|
|
||||
| Pane 2 (bottom): k9s --context <context-b> --namespace <ns> --command pods|
|
||||
+--------------------------------------------------+
|
||||
```
|
||||
|
||||
@@ -92,11 +89,15 @@ not cover: **redeploy** and **secrets diff**.
|
||||
Example startup command (generic placeholders):
|
||||
|
||||
```
|
||||
# Kill stale session first (separate command — tmux aborts on kill-session error).
|
||||
tmux kill-session -t kctl
|
||||
tmux new-session -d -s kctl \
|
||||
"kctl-tui panel --ctx=$CTX_A --ns=$NS --team=$TEAM" \; \
|
||||
split-window -v "k9s --context $CTX_A -n $NS" \; \
|
||||
split-window -v "k9s --context $CTX_B -n $NS" \; \
|
||||
select-layout main-horizontal \; \
|
||||
"kctl-tui panel --context=$CTX_A --ns=$NS --team=$TEAM" \; \
|
||||
set-option -t kctl remain-on-exit on \; \
|
||||
split-window -v -t kctl:0.0 "k9s --context $CTX_A --namespace $NS --command pods" \; \
|
||||
split-window -v -t kctl:0.1 "k9s --context $CTX_B --namespace $NS --command pods" \; \
|
||||
select-layout -t kctl even-vertical \; \
|
||||
select-pane -t kctl:0.0 \; \
|
||||
attach -t kctl
|
||||
```
|
||||
|
||||
@@ -115,59 +116,68 @@ Switching between panes: `Ctrl-b` + arrow key, or `Ctrl-b` `o`.
|
||||
|
||||
### 3.5 AWS Secrets Manager <-> Kubernetes Secret diff — in the control pane
|
||||
|
||||
1. Load the secret from AWS Secrets Manager:
|
||||
1. Before entering the secrets workflow, verify the AWS session is valid
|
||||
(`aws sts get-caller-identity`). If expired, offer to run the
|
||||
configured SSO login command interactively.
|
||||
2. Resolve the AWS Secrets Manager secret ID from `secret_name_template`
|
||||
(using namespace + env) and the Kubernetes secret name from
|
||||
`k8s_secret_name_template` (using namespace). No manual input required
|
||||
for either name.
|
||||
3. Fetch the AWS secret:
|
||||
`aws secretsmanager get-secret-value --secret-id <secret-id> --region <region> --query SecretString --output text`.
|
||||
2. Show the contained keys for selection.
|
||||
3. Load the matching Kubernetes secret field:
|
||||
`kubectl -n <ns> get secret <secret-name> -o jsonpath='{.data.<field>}'`,
|
||||
base64-decode it.
|
||||
4. Compare the values (identical / different).
|
||||
5. On mismatch, optionally request a force-sync:
|
||||
4. Fetch all fields of the Kubernetes secret and base64-decode them:
|
||||
`kubectl -n <ns> get secret <secret-name> -o json`.
|
||||
5. Compare every field at once in a table (key / AWS value / Kubernetes
|
||||
value / match status).
|
||||
6. On mismatch, optionally request a force-sync for the whole secret:
|
||||
`kubectl -n <ns> annotate externalsecret <name> force-sync=<unix-timestamp> --overwrite`.
|
||||
|
||||
All names (secret ID, secret name, field name, ExternalSecret name) are
|
||||
asked for interactively at runtime, never hardcoded in the tool.
|
||||
The ExternalSecret object name for the force-sync annotation is the only
|
||||
value asked for interactively at runtime.
|
||||
|
||||
### 3.6 Context-pair pattern (configurable) — drives both status panes at once
|
||||
### 3.6 Context resolution via templates
|
||||
|
||||
Requirement: the Tab switch in the control pane must switch **both**
|
||||
status panes below it, not just an internal state.
|
||||
The actual kubectl context name/ARN for each environment is computed from
|
||||
a configurable template at startup. The two k9s status panes and all
|
||||
kubectl calls in the control pane use the resolved context.
|
||||
|
||||
Configuration format (e.g. `~/.kctl-tui/config.yaml`), purely illustrative
|
||||
with generic placeholders:
|
||||
|
||||
```yaml
|
||||
context_pairs:
|
||||
- name: "environment-pair-1"
|
||||
contexts: ["<context-a1>", "<context-a2>"]
|
||||
- name: "environment-pair-2"
|
||||
contexts: ["<context-b1>", "<context-b2>"]
|
||||
contexts:
|
||||
- "internal"
|
||||
- "external"
|
||||
default_context: "internal"
|
||||
|
||||
envs:
|
||||
- "beta"
|
||||
- "prod"
|
||||
|
||||
aws_region: "eu-central-1"
|
||||
aws_account_id: "123456789012"
|
||||
|
||||
context_template: "arn:aws:eks:{region}:{account_id}:cluster/tf-{env}-{context}-1"
|
||||
secret_name_template: "tf-{namespace}-{env}-secrets"
|
||||
k8s_secret_name_template: "{namespace}-common-secrets"
|
||||
|
||||
team_label_key: "<organization>/<label-name>"
|
||||
```
|
||||
|
||||
Behavior on Tab in the control pane:
|
||||
The `context_template` replaces `{region}`, `{account_id}`, `{env}`, and
|
||||
`{context}` placeholders with the configured values and the currently
|
||||
selected environment/context. The resolved value must match an existing
|
||||
context in your kubeconfig (e.g. added via `aws eks update-kubeconfig`).
|
||||
|
||||
1. Determine the current context pair from the configuration.
|
||||
2. Restart both k9s panes via
|
||||
`tmux respawn-pane -k -t kctl:0.1 "k9s --context <newA> -n <ns>"` and
|
||||
`... kctl:0.2 ...` (namespace stays the same).
|
||||
3. If the current context is in no configured list: show a hint in the
|
||||
control pane instead of an error.
|
||||
4. No action outside this configuration — no error, only a hint.
|
||||
|
||||
**Platform limitation on Windows without WSL:** `respawn-pane`/
|
||||
`kill-session` are tmux-specific. Windows Terminal (`wt.exe`) offers no
|
||||
equivalent scripting to replace panes or end the session from inside a
|
||||
pane. On plain Windows (without WSL), only a simplified flow is possible:
|
||||
k9s panes are closed manually (`q`, then `Ctrl+Shift+W`); Tab switching and
|
||||
automatic session termination are unavailable there. This limitation is
|
||||
the main reason the primary target system is set to Linux/WSL.
|
||||
**Windows support:** On native Windows, install
|
||||
[psmux](https://github.com/marlocarlo/psmux) — a native, tmux-compatible
|
||||
terminal multiplexer. psmux provides a `tmux` command, so kctl-tui works
|
||||
without code changes (including `Esc`-triggered session termination).
|
||||
Alternatively, run kctl-tui inside WSL with standard `tmux`.
|
||||
|
||||
## 4. Non-functional requirements
|
||||
|
||||
- **Primary platform Linux/WSL**, secondary native Windows with reduced
|
||||
functionality.
|
||||
- **Primary platform Linux/WSL**, secondary native Windows (via psmux).
|
||||
- **Single-binary distribution** without external runtime dependency (Go
|
||||
provides this natively).
|
||||
- **External dependencies**: `kubectl` mandatory; `tmux`, `k9s`, `aws-cli`
|
||||
@@ -240,8 +250,8 @@ Rejected options (see discussion history):
|
||||
- Split view v1 fixed at 2 status panes + 1 control pane (3 panes total).
|
||||
- No RBAC/permission checks before executing sensitive actions — the tool
|
||||
assumes existing kubectl permissions.
|
||||
- Configuration file format (`config.yaml`) is a proposal, not finally
|
||||
agreed; concrete label keys, context names, and namespace names are
|
||||
- Configuration file format (`config.yaml`) is defined and implemented;
|
||||
concrete label keys, context names, and namespace names are
|
||||
project-specific and belong exclusively in the user's local, unversioned
|
||||
configuration, not in this document or the source code.
|
||||
- Native Windows (without WSL) remains a secondary platform with manual
|
||||
|
||||
+55
-16
@@ -1,8 +1,13 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"sort"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/bubbles/list"
|
||||
@@ -45,6 +50,7 @@ func newFullModel() *fullModel {
|
||||
l := list.New(nil, list.NewDefaultDelegate(), 0, 0)
|
||||
l.Title = "kctl-tui"
|
||||
l.SetShowStatusBar(false)
|
||||
l.SetFilteringEnabled(false)
|
||||
return &fullModel{list: l}
|
||||
}
|
||||
|
||||
@@ -66,6 +72,9 @@ func (m *fullModel) bootstrap() tea.Msg {
|
||||
if len(cfg.Envs) == 0 {
|
||||
return errMsg{fmt.Errorf("no 'envs' configured in ~/.kctl-tui/config.yaml (see config.example.yaml)")}
|
||||
}
|
||||
if err := kubeexec.CheckTool("kubectl"); err != nil {
|
||||
return errMsg{err}
|
||||
}
|
||||
return bootstrapMsg{cfg: cfg, context: cfg.EffectiveDefaultContext()}
|
||||
}
|
||||
|
||||
@@ -188,6 +197,14 @@ func (m *fullModel) handleSelect() (tea.Model, tea.Cmd) {
|
||||
|
||||
case screenNamespace:
|
||||
m.selectedNamespace = item.value
|
||||
if err := kubeexec.CheckTool("tmux"); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
if err := kubeexec.CheckTool("k9s"); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
return m, m.startTmuxSession()
|
||||
}
|
||||
return m, nil
|
||||
@@ -235,6 +252,7 @@ func (m *fullModel) loadNamespacesFor(teamValue string) tea.Cmd {
|
||||
for ns := range m.namespaces {
|
||||
names = append(names, ns)
|
||||
}
|
||||
sort.Strings(names)
|
||||
} else {
|
||||
names = namespacesForLabelValue(m.namespaces, m.cfg.TeamLabelKey, teamValue)
|
||||
}
|
||||
@@ -252,31 +270,52 @@ func (m *fullModel) loadNamespacesFor(teamValue string) tea.Cmd {
|
||||
// configured envs, resolved via the context template, so both are
|
||||
// visible side by side.
|
||||
func (m *fullModel) startTmuxSession() tea.Cmd {
|
||||
selfPath := "kctl-tui" // resolved via PATH; see README for install instructions
|
||||
selfPath, err := os.Executable()
|
||||
if err != nil {
|
||||
selfPath = "kctl-tui" // fallback to PATH lookup
|
||||
}
|
||||
panelCmd := fmt.Sprintf("%s panel --context=%s --ns=%s --team=%s",
|
||||
selfPath, m.selectedContext, m.selectedNamespace, m.selectedTeam)
|
||||
|
||||
envA := m.cfg.Envs[0]
|
||||
envB := m.cfg.Envs[0]
|
||||
if len(m.cfg.Envs) > 1 {
|
||||
envB = m.cfg.Envs[1]
|
||||
}
|
||||
ctxA := m.cfg.ResolveContext(envA, m.selectedContext)
|
||||
ctxB := m.cfg.ResolveContext(envB, m.selectedContext)
|
||||
k9sCmdA := fmt.Sprintf("k9s --context %s --namespace %s --command pods", ctxA, m.selectedNamespace)
|
||||
|
||||
k9sCmdA := fmt.Sprintf("k9s --context %s -n %s", ctxA, m.selectedNamespace)
|
||||
k9sCmdB := fmt.Sprintf("k9s --context %s -n %s", ctxB, m.selectedNamespace)
|
||||
kubeexec.VerboseLog("[debug] selfPath=%s\n", selfPath)
|
||||
kubeexec.VerboseLog("[debug] panelCmd=%s\n", panelCmd)
|
||||
kubeexec.VerboseLog("[debug] k9sCmdA=%s\n", k9sCmdA)
|
||||
|
||||
c := exec.Command("tmux", "new-session", "-d", "-s", "kctl",
|
||||
panelCmd, ";",
|
||||
"set-option", "-t", "kctl", "remain-on-exit", "on", ";",
|
||||
"split-window", "-v", "-t", "kctl:0.0", k9sCmdA, ";",
|
||||
"split-window", "-v", "-t", "kctl:0.1", k9sCmdB, ";",
|
||||
"select-layout", "-t", "kctl", "even-vertical", ";",
|
||||
"select-pane", "-t", "kctl:0.0", ";",
|
||||
"attach", "-t", "kctl",
|
||||
// Kill stale session first (ignore error if none exists).
|
||||
exec.Command("tmux", "kill-session", "-t", "kctl").Run()
|
||||
|
||||
// Run setup commands individually — this avoids the ; separator
|
||||
// issue on Windows where psmux doesn't handle chained args.
|
||||
setup := [][]string{
|
||||
{"new-session", "-d", "-s", "kctl", panelCmd},
|
||||
{"set-option", "-t", "kctl", "remain-on-exit", "on"},
|
||||
{"split-window", "-v", "-t", "kctl:0.0", k9sCmdA},
|
||||
}
|
||||
if len(m.cfg.Envs) > 1 {
|
||||
envB := m.cfg.Envs[1]
|
||||
ctxB := m.cfg.ResolveContext(envB, m.selectedContext)
|
||||
k9sCmdB := fmt.Sprintf("k9s --context %s --namespace %s --command pods", ctxB, m.selectedNamespace)
|
||||
kubeexec.VerboseLog("[debug] k9sCmdB=%s\n", k9sCmdB)
|
||||
setup = append(setup, []string{"split-window", "-v", "-t", "kctl:0.1", k9sCmdB})
|
||||
}
|
||||
setup = append(setup,
|
||||
[]string{"select-layout", "-t", "kctl", "even-vertical"},
|
||||
[]string{"select-pane", "-t", "kctl:0.0"},
|
||||
)
|
||||
|
||||
for _, args := range setup {
|
||||
if out, err := exec.Command("tmux", args...).CombinedOutput(); err != nil {
|
||||
kubeexec.VerboseLog("[debug] tmux %s failed: %v\n%s\n", args[0], err, out)
|
||||
return func() tea.Msg { return tmuxDoneMsg{err: fmt.Errorf("tmux %s: %w", args[0], err)} }
|
||||
}
|
||||
}
|
||||
|
||||
// Only attach uses tea.ExecProcess so it takes over the terminal.
|
||||
c := exec.Command("tmux", "attach", "-t", "kctl")
|
||||
return tea.ExecProcess(c, func(err error) tea.Msg {
|
||||
return tmuxDoneMsg{err: err}
|
||||
})
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package main
|
||||
|
||||
import "github.com/skoelle/kctl-tui/internal/kctl"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package main
|
||||
|
||||
// simpleItem is a minimal implementation of list.Item used for all
|
||||
|
||||
+246
-4
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
@@ -5,15 +8,71 @@ import (
|
||||
"os"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
"github.com/skoelle/kctl-tui/internal/config"
|
||||
"github.com/skoelle/kctl-tui/internal/kubeexec"
|
||||
)
|
||||
|
||||
// version is set via -ldflags at build time.
|
||||
var version = "dev"
|
||||
|
||||
func main() {
|
||||
if len(os.Args) > 1 && os.Args[1] == "panel" {
|
||||
if err := runPanel(os.Args[2:]); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "kctl-tui panel error:", err)
|
||||
args := os.Args[1:]
|
||||
|
||||
// Extract global flags before delegating to sub-commands.
|
||||
verbose := false
|
||||
showHelp := false
|
||||
filtered := make([]string, 0, len(args))
|
||||
for _, a := range args {
|
||||
switch a {
|
||||
case "--verbose":
|
||||
verbose = true
|
||||
case "--version", "-v":
|
||||
fmt.Printf("kctl-tui %s\n", version)
|
||||
return
|
||||
case "--help", "-h":
|
||||
showHelp = true
|
||||
default:
|
||||
filtered = append(filtered, a)
|
||||
}
|
||||
}
|
||||
if verbose {
|
||||
kubeexec.SetVerbose(true, os.Stderr)
|
||||
}
|
||||
|
||||
if showHelp {
|
||||
printUsage()
|
||||
return
|
||||
}
|
||||
if len(filtered) == 0 {
|
||||
// No subcommand — start the full TUI.
|
||||
}
|
||||
|
||||
if len(filtered) > 0 {
|
||||
switch filtered[0] {
|
||||
case "panel":
|
||||
if err := runPanel(filtered[1:]); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "kctl-tui panel error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
case "config":
|
||||
if err := runConfig(filtered[1:]); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "kctl-tui config error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
case "doctor":
|
||||
if err := runDoctor(); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "kctl-tui doctor error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
default:
|
||||
fmt.Fprintf(os.Stderr, "unknown command: %s\n\n", filtered[0])
|
||||
printUsage()
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
m := newFullModel()
|
||||
@@ -23,3 +82,186 @@ func main() {
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func printUsage() {
|
||||
fmt.Print(`kctl-tui — Kubernetes entry-point TUI
|
||||
|
||||
Usage:
|
||||
kctl-tui [flags] start the TUI (full navigation mode)
|
||||
kctl-tui doctor check tools, config and connections
|
||||
kctl-tui config check validate ~/.kctl-tui/config.yaml
|
||||
kctl-tui panel [options] control pane (called internally by tmux)
|
||||
|
||||
Flags:
|
||||
--verbose log all kubectl/aws commands to stderr
|
||||
--version print version
|
||||
--help show this help
|
||||
|
||||
Examples:
|
||||
kctl-tui # start the TUI
|
||||
kctl-tui doctor # verify everything is installed
|
||||
kctl-tui --verbose 2>debug.log # log commands to a file
|
||||
kctl-tui config check # validate config
|
||||
`)
|
||||
}
|
||||
|
||||
func runConfig(args []string) error {
|
||||
if len(args) == 0 || args[0] != "check" {
|
||||
return fmt.Errorf("usage: kctl-tui config check")
|
||||
}
|
||||
cfgPath, err := config.DefaultPath()
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot determine config path: %w", err)
|
||||
}
|
||||
cfg, err := config.Load(cfgPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to load %s: %w", cfgPath, err)
|
||||
}
|
||||
|
||||
ok := true
|
||||
if len(cfg.Contexts) == 0 {
|
||||
fmt.Fprintln(os.Stderr, "ERROR: no 'contexts' configured")
|
||||
ok = false
|
||||
}
|
||||
if len(cfg.Envs) == 0 {
|
||||
fmt.Fprintln(os.Stderr, "ERROR: no 'envs' configured")
|
||||
ok = false
|
||||
}
|
||||
if cfg.ContextTemplate == "" {
|
||||
fmt.Fprintln(os.Stderr, "ERROR: 'context_template' is empty")
|
||||
ok = false
|
||||
}
|
||||
if cfg.SecretNameTemplate == "" {
|
||||
fmt.Fprintln(os.Stderr, "ERROR: 'secret_name_template' is empty")
|
||||
ok = false
|
||||
}
|
||||
if cfg.TeamLabelKey == "" {
|
||||
fmt.Fprintln(os.Stderr, "WARNING: 'team_label_key' is empty — team selection will have no groups")
|
||||
}
|
||||
if cfg.AWSRegion == "" {
|
||||
fmt.Fprintln(os.Stderr, "WARNING: 'aws_region' is empty — secrets workflow will fail")
|
||||
}
|
||||
|
||||
// Try resolving one context to verify the template works.
|
||||
if len(cfg.Contexts) > 0 && len(cfg.Envs) > 0 && cfg.ContextTemplate != "" {
|
||||
ctx := cfg.ResolveContext(cfg.Envs[0], cfg.Contexts[0])
|
||||
fmt.Printf("Resolved context example: %s\n", ctx)
|
||||
}
|
||||
|
||||
if ok {
|
||||
fmt.Println("Config OK")
|
||||
} else {
|
||||
fmt.Fprintln(os.Stderr, "Config has errors — see above")
|
||||
os.Exit(1)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func runDoctor() error {
|
||||
pass := "ok"
|
||||
fail := "FAIL"
|
||||
warn := "WARN"
|
||||
status := pass
|
||||
errs := 0
|
||||
|
||||
check := func(label string, err error) {
|
||||
if err != nil {
|
||||
fmt.Printf(" [%s] %s: %v\n", fail, label, err)
|
||||
status = fail
|
||||
errs++
|
||||
} else {
|
||||
fmt.Printf(" [%s] %s\n", pass, label)
|
||||
}
|
||||
}
|
||||
|
||||
warnCheck := func(label string, err error) {
|
||||
if err != nil {
|
||||
fmt.Printf(" [%s] %s: %v\n", warn, label, err)
|
||||
} else {
|
||||
fmt.Printf(" [%s] %s\n", pass, label)
|
||||
}
|
||||
}
|
||||
|
||||
// --- Tools ---
|
||||
fmt.Println("\nTools:")
|
||||
check("kubectl", kubeexec.CheckTool("kubectl"))
|
||||
check("tmux/psmux", kubeexec.CheckTool("tmux"))
|
||||
check("k9s", kubeexec.CheckTool("k9s"))
|
||||
warnCheck("aws CLI (optional)", kubeexec.CheckTool("aws"))
|
||||
|
||||
// --- Config ---
|
||||
fmt.Println("\nConfig:")
|
||||
cfgPath, err := config.DefaultPath()
|
||||
if err != nil {
|
||||
fmt.Printf(" [%s] config path: %v\n", fail, err)
|
||||
errs++
|
||||
status = fail
|
||||
} else {
|
||||
cfg, err := config.Load(cfgPath)
|
||||
if err != nil {
|
||||
fmt.Printf(" [%s] load config: %v\n", fail, err)
|
||||
errs++
|
||||
status = fail
|
||||
} else {
|
||||
check("config file exists", nil)
|
||||
if len(cfg.Contexts) == 0 {
|
||||
fmt.Printf(" [%s] contexts configured\n", fail)
|
||||
errs++
|
||||
status = fail
|
||||
} else {
|
||||
fmt.Printf(" [%s] contexts configured (%d)\n", pass, len(cfg.Contexts))
|
||||
}
|
||||
if len(cfg.Envs) == 0 {
|
||||
fmt.Printf(" [%s] envs configured\n", fail)
|
||||
errs++
|
||||
status = fail
|
||||
} else {
|
||||
fmt.Printf(" [%s] envs configured (%d)\n", pass, len(cfg.Envs))
|
||||
}
|
||||
if cfg.ContextTemplate != "" {
|
||||
ctx := cfg.ResolveContext(cfg.Envs[0], cfg.Contexts[0])
|
||||
fmt.Printf(" [%s] context_template resolves to: %s\n", pass, ctx)
|
||||
} else {
|
||||
fmt.Printf(" [%s] context_template is empty\n", fail)
|
||||
errs++
|
||||
status = fail
|
||||
}
|
||||
if cfg.SecretNameTemplate != "" && len(cfg.Envs) > 0 {
|
||||
secret := cfg.ResolveSecretName("example-ns", cfg.Envs[0])
|
||||
fmt.Printf(" [%s] secret_name_template resolves to: %s\n", pass, secret)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- Connections ---
|
||||
fmt.Println("\nConnections:")
|
||||
if kubeexec.CheckTool("kubectl") == nil {
|
||||
err := kubeexec.CheckAWSAuth()
|
||||
if err == nil {
|
||||
fmt.Printf(" [%s] kubectl cluster reachable\n", pass)
|
||||
} else {
|
||||
// Not fatal — cluster might be unreachable from this machine
|
||||
fmt.Printf(" [%s] kubectl cluster: %v\n", warn, err)
|
||||
}
|
||||
}
|
||||
if kubeexec.CheckTool("aws") == nil {
|
||||
err := kubeexec.CheckAWSAuth()
|
||||
if err == nil {
|
||||
fmt.Printf(" [%s] AWS credentials valid\n", pass)
|
||||
} else {
|
||||
fmt.Printf(" [%s] AWS credentials: %v\n", warn, err)
|
||||
}
|
||||
} else {
|
||||
fmt.Printf(" [%s] AWS credentials (aws CLI not installed)\n", warn)
|
||||
}
|
||||
|
||||
// --- Summary ---
|
||||
fmt.Println()
|
||||
if status == pass {
|
||||
fmt.Println("All checks passed. kctl-tui is ready to use.")
|
||||
} else {
|
||||
fmt.Printf("%d error(s) found. Fix the issues above and re-run: kctl-tui doctor\n", errs)
|
||||
os.Exit(1)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
+90
-35
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
@@ -27,7 +30,6 @@ const (
|
||||
stepRedeployList
|
||||
stepRedeployConfirm
|
||||
stepAWSAuthPrompt
|
||||
stepK8sSecretName
|
||||
stepDiffResult
|
||||
stepForceSyncConfirm
|
||||
stepExternalSecretName
|
||||
@@ -47,11 +49,12 @@ type panelModel struct {
|
||||
|
||||
deploymentName string
|
||||
|
||||
awsSecretID string
|
||||
awsSecretName string // resolved via secret_name_template (namespace + env)
|
||||
k8sSecretName string // resolved via k8s_secret_name_template (namespace only)
|
||||
awsValues map[string]string
|
||||
k8sSecretName string
|
||||
k8sValues map[string]string
|
||||
diffEntries []kctl.SecretDiffEntry
|
||||
diffOffset int // scroll position for diff table
|
||||
|
||||
message string
|
||||
err error
|
||||
@@ -77,13 +80,19 @@ func newPanelModel(context, ns, team string) *panelModel {
|
||||
ti.Focus()
|
||||
|
||||
cfgPath, _ := config.DefaultPath()
|
||||
cfg, _ := config.Load(cfgPath)
|
||||
cfg, loadErr := config.Load(cfgPath)
|
||||
|
||||
l := list.New(nil, list.NewDefaultDelegate(), 0, 0)
|
||||
l.SetShowStatusBar(false)
|
||||
l.SetFilteringEnabled(false)
|
||||
|
||||
m := &panelModel{context: context, ns: ns, team: team, cfg: cfg, step: stepEnvMenu, list: l, input: ti}
|
||||
m.showEnvMenu()
|
||||
if loadErr != nil {
|
||||
m.err = fmt.Errorf("config load failed: %w", loadErr)
|
||||
m.step = stepError
|
||||
} else {
|
||||
m.showEnvMenu()
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
@@ -140,6 +149,14 @@ func (m *panelModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
return m.handleEsc()
|
||||
case "enter":
|
||||
return m.handleEnter()
|
||||
case "up", "k":
|
||||
if m.step == stepDiffResult {
|
||||
return m.scrollDiff(-1)
|
||||
}
|
||||
case "down", "j":
|
||||
if m.step == stepDiffResult {
|
||||
return m.scrollDiff(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,11 +172,7 @@ func (m *panelModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
}
|
||||
|
||||
func (m *panelModel) usesTextInput() bool {
|
||||
switch m.step {
|
||||
case stepK8sSecretName, stepExternalSecretName:
|
||||
return true
|
||||
}
|
||||
return false
|
||||
return m.step == stepExternalSecretName
|
||||
}
|
||||
|
||||
// handleEsc navigates one level up: action menu -> env menu, most
|
||||
@@ -192,9 +205,6 @@ func (m *panelModel) handleEnter() (tea.Model, tea.Cmd) {
|
||||
return m.fromRedeployConfirm()
|
||||
case stepAWSAuthPrompt:
|
||||
return m.fromAWSAuthPrompt()
|
||||
case stepK8sSecretName:
|
||||
m.k8sSecretName = m.input.Value()
|
||||
return m.compareAllFields()
|
||||
case stepForceSyncConfirm:
|
||||
return m.fromForceSyncConfirm()
|
||||
case stepExternalSecretName:
|
||||
@@ -258,6 +268,9 @@ func (m *panelModel) fromActionMenu() (tea.Model, tea.Cmd) {
|
||||
// interactively instead of letting the user hit a confusing failure
|
||||
// several steps later.
|
||||
func (m *panelModel) checkAWSAuthAndProceed() (tea.Model, tea.Cmd) {
|
||||
if err := kubeexec.CheckTool("aws"); err != nil {
|
||||
return m.showError(err)
|
||||
}
|
||||
if err := kubeexec.CheckAWSAuth(); err != nil {
|
||||
m.err = err
|
||||
m.list.SetItems([]list.Item{
|
||||
@@ -296,14 +309,17 @@ func (m *panelModel) afterAWSLogin(execErr error) (tea.Model, tea.Cmd) {
|
||||
return m.startSecretsFlow()
|
||||
}
|
||||
|
||||
// startSecretsFlow computes the AWS secret ID from the configured
|
||||
// template (namespace + env) and fetches it directly - no more listing
|
||||
// secrets or asking for a region, both now driven by config.
|
||||
// startSecretsFlow computes the AWS secret ID (namespace + env) and the
|
||||
// Kubernetes secret name (namespace only) from their respective
|
||||
// templates and fetches the AWS side directly - no manual input required
|
||||
// for either name.
|
||||
func (m *panelModel) startSecretsFlow() (tea.Model, tea.Cmd) {
|
||||
m.awsSecretID = m.cfg.ResolveSecretName(m.ns, m.currentEnv)
|
||||
raw, err := kubeexec.GetAWSSecretString(m.awsSecretID, m.cfg.AWSRegion)
|
||||
m.awsSecretName = m.cfg.ResolveSecretName(m.ns, m.currentEnv)
|
||||
m.k8sSecretName = m.cfg.ResolveK8sSecretName(m.ns)
|
||||
|
||||
raw, err := kubeexec.GetAWSSecretString(m.awsSecretName, m.cfg.AWSRegion)
|
||||
if err != nil {
|
||||
return m.showError(fmt.Errorf("failed to fetch AWS secret %q: %w", m.awsSecretID, err))
|
||||
return m.showError(fmt.Errorf("failed to fetch AWS secret %q: %w", m.awsSecretName, err))
|
||||
}
|
||||
var parsed map[string]interface{}
|
||||
if err := json.Unmarshal([]byte(raw), &parsed); err != nil {
|
||||
@@ -316,10 +332,7 @@ func (m *panelModel) startSecretsFlow() (tea.Model, tea.Cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
m.step = stepK8sSecretName
|
||||
m.input.SetValue("")
|
||||
m.input.Placeholder = "Kubernetes secret name (in namespace " + m.ns + ")"
|
||||
return m, nil
|
||||
return m.compareAllFields()
|
||||
}
|
||||
|
||||
func (m *panelModel) fromRedeployList() (tea.Model, tea.Cmd) {
|
||||
@@ -358,15 +371,16 @@ func (m *panelModel) fromRedeployConfirm() (tea.Model, tea.Cmd) {
|
||||
}
|
||||
|
||||
// compareAllFields fetches every field of the Kubernetes secret and diffs
|
||||
// it against every key of the templated AWS secret in one go.
|
||||
// it against every key of the AWS secret in one go.
|
||||
func (m *panelModel) compareAllFields() (tea.Model, tea.Cmd) {
|
||||
k8sValues, err := kubeexec.GetSecretAllFields(m.resolvedContext(), m.ns, m.k8sSecretName)
|
||||
if err != nil {
|
||||
return m.showError(err)
|
||||
return m.showError(fmt.Errorf("failed to fetch Kubernetes secret %q: %w", m.k8sSecretName, err))
|
||||
}
|
||||
m.k8sValues = k8sValues
|
||||
m.diffEntries = diffSecretValues(m.awsValues, m.k8sValues)
|
||||
m.message = renderDiffTable(m.currentEnv, m.awsSecretID, m.k8sSecretName, m.diffEntries)
|
||||
m.diffOffset = 0
|
||||
m.message = renderDiffTable(m.currentEnv, m.awsSecretName, m.k8sSecretName, m.diffEntries, m.diffOffset, 0)
|
||||
|
||||
if anyMismatch(m.diffEntries) {
|
||||
m.list.SetItems([]list.Item{
|
||||
@@ -381,16 +395,52 @@ func (m *panelModel) compareAllFields() (tea.Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func renderDiffTable(env, awsSecretID, k8sSecretName string, entries []kctl.SecretDiffEntry) string {
|
||||
func (m *panelModel) scrollDiff(delta int) (tea.Model, tea.Cmd) {
|
||||
newOff := m.diffOffset + delta
|
||||
if newOff < 0 {
|
||||
newOff = 0
|
||||
}
|
||||
maxOff := len(m.diffEntries) - 1
|
||||
if maxOff < 0 {
|
||||
maxOff = 0
|
||||
}
|
||||
if newOff > maxOff {
|
||||
newOff = maxOff
|
||||
}
|
||||
m.diffOffset = newOff
|
||||
m.message = renderDiffTable(m.currentEnv, m.awsSecretName, m.k8sSecretName, m.diffEntries, m.diffOffset, 0)
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func renderDiffTable(env, awsSecretName, k8sSecretName string, entries []kctl.SecretDiffEntry, offset, visibleHeight int) string {
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, "env: %s AWS secret: %s Kubernetes secret: %s\n\n", env, awsSecretID, k8sSecretName)
|
||||
fmt.Fprintf(&b, "env: %s AWS secret: %s Kubernetes secret: %s\n\n", env, awsSecretName, k8sSecretName)
|
||||
fmt.Fprintf(&b, "%-25s %-20s %-20s %s\n", "KEY", "AWS", "KUBERNETES", "STATUS")
|
||||
for _, e := range entries {
|
||||
start := offset
|
||||
if start > len(entries) {
|
||||
start = len(entries)
|
||||
}
|
||||
end := len(entries)
|
||||
if visibleHeight > 0 && start+visibleHeight < end {
|
||||
end = start + visibleHeight
|
||||
}
|
||||
for _, e := range entries[start:end] {
|
||||
status := "OK"
|
||||
if !e.Match {
|
||||
status = "MISMATCH"
|
||||
}
|
||||
fmt.Fprintf(&b, "%-25s %-20s %-20s %s\n", e.Key, truncate(e.Left, 20), truncate(e.Right, 20), status)
|
||||
left := e.Left
|
||||
if e.LeftBin {
|
||||
left = fmt.Sprintf("<binary %d bytes>", len(e.Left))
|
||||
}
|
||||
right := e.Right
|
||||
if e.RightBin {
|
||||
right = fmt.Sprintf("<binary %d bytes>", len(e.Right))
|
||||
}
|
||||
fmt.Fprintf(&b, "%-25s %-20s %-20s %s\n", e.Key, truncate(left, 20), truncate(right, 20), status)
|
||||
}
|
||||
if len(entries) > 0 {
|
||||
fmt.Fprintf(&b, "\n Showing %d-%d of %d fields (j/k or arrow keys to scroll)", start+1, end, len(entries))
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
@@ -418,7 +468,15 @@ func (m *panelModel) fromForceSyncConfirm() (tea.Model, tea.Cmd) {
|
||||
}
|
||||
|
||||
func (m *panelModel) doForceSync() (tea.Model, tea.Cmd) {
|
||||
name := m.input.Value()
|
||||
name := strings.TrimSpace(m.input.Value())
|
||||
if name == "" {
|
||||
return m.showError(fmt.Errorf("ExternalSecret name must not be empty"))
|
||||
}
|
||||
for _, r := range name {
|
||||
if r < 0x20 || r > 0x7e || r == '/' || r == ' ' {
|
||||
return m.showError(fmt.Errorf("ExternalSecret name contains invalid character: %q", r))
|
||||
}
|
||||
}
|
||||
ts := time.Now().Unix()
|
||||
_, err := kubeexec.AnnotateForceSync(m.resolvedContext(), m.ns, name, ts)
|
||||
if err != nil {
|
||||
@@ -460,10 +518,7 @@ func (m *panelModel) View() string {
|
||||
}
|
||||
|
||||
func (m *panelModel) stepPrompt() string {
|
||||
switch m.step {
|
||||
case stepK8sSecretName:
|
||||
return fmt.Sprintf("Kubernetes secret name (env=%s, namespace=%s)", m.currentEnv, m.ns)
|
||||
case stepExternalSecretName:
|
||||
if m.step == stepExternalSecretName {
|
||||
return "ExternalSecret object name to annotate"
|
||||
}
|
||||
return ""
|
||||
|
||||
@@ -34,6 +34,14 @@ aws_account_id: "123456789012"
|
||||
# environment. Available placeholders: {namespace}, {env}.
|
||||
secret_name_template: "tf-{namespace}-{env}-secrets"
|
||||
|
||||
# Builds the Kubernetes secret name from the chosen namespace. Kept as a
|
||||
# separate template from secret_name_template above because the AWS side
|
||||
# and the Kubernetes side commonly follow different naming conventions
|
||||
# (e.g. the Kubernetes secret is per-namespace only, without an env
|
||||
# segment, because each environment already has its own cluster).
|
||||
# Available placeholders: {namespace}.
|
||||
k8s_secret_name_template: "{namespace}-common-secrets"
|
||||
|
||||
# Builds the actual kubectl context name/ARN from region, account ID, env,
|
||||
# and context. Available placeholders: {region}, {account_id}, {env},
|
||||
# {context}. Adjust the literal parts ("tf-", "-1", cluster naming, ARN
|
||||
|
||||
@@ -5,6 +5,26 @@ go 1.22
|
||||
require (
|
||||
github.com/charmbracelet/bubbles v0.20.0
|
||||
github.com/charmbracelet/bubbletea v1.1.1
|
||||
github.com/charmbracelet/lipgloss v1.0.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/atotto/clipboard v0.1.4 // indirect
|
||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||
github.com/charmbracelet/lipgloss v1.0.0 // indirect
|
||||
github.com/charmbracelet/x/ansi v0.4.2 // indirect
|
||||
github.com/charmbracelet/x/term v0.2.0 // indirect
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.16 // indirect
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||
github.com/muesli/termenv v0.15.2 // indirect
|
||||
github.com/rivo/uniseg v0.4.7 // indirect
|
||||
github.com/sahilm/fuzzy v0.1.1 // indirect
|
||||
golang.org/x/sync v0.8.0 // indirect
|
||||
golang.org/x/sys v0.24.0 // indirect
|
||||
golang.org/x/text v0.3.8 // indirect
|
||||
)
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
|
||||
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
|
||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
||||
github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
|
||||
github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
|
||||
github.com/charmbracelet/bubbletea v1.1.1 h1:KJ2/DnmpfqFtDNVTvYZ6zpPFL9iRCRr0qqKOCvppbPY=
|
||||
github.com/charmbracelet/bubbletea v1.1.1/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4=
|
||||
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
|
||||
github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
|
||||
github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk=
|
||||
github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
|
||||
github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0=
|
||||
github.com/charmbracelet/x/term v0.2.0/go.mod h1:GVxgxAbjUrmpvIINHIQnJJKpMlHiZ4cktEQCN6GWyF0=
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
||||
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
|
||||
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
||||
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
|
||||
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
|
||||
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
||||
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
|
||||
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
|
||||
github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
|
||||
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
|
||||
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
|
||||
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
|
||||
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
# Install script for kctl-tui on Windows.
|
||||
# Downloads the latest GitHub release binary matching the current architecture
|
||||
# and installs it to your PATH.
|
||||
#
|
||||
# Usage (PowerShell):
|
||||
# irm https://raw.githubusercontent.com/skoelle/kctl-tui/main/install.ps1 | iex
|
||||
#
|
||||
# Or save and run locally:
|
||||
# .\install.ps1
|
||||
#
|
||||
# Requires: PowerShell 5.1+, internet access.
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$Repo = "skoelle/kctl-tui"
|
||||
$BinName = "kctl-tui"
|
||||
|
||||
# --- Detect architecture ---
|
||||
$arch = $env:PROCESSOR_ARCHITECTURE
|
||||
switch ($arch) {
|
||||
"AMD64" { $goarch = "amd64" }
|
||||
"ARM64" { $goarch = "arm64" }
|
||||
default {
|
||||
Write-Error "Unsupported architecture: $arch"
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
|
||||
# --- Determine install directory ---
|
||||
$installDir = "$env:USERPROFILE\bin"
|
||||
if (-not (Test-Path $installDir)) {
|
||||
New-Item -ItemType Directory -Path $installDir | Out-Null
|
||||
}
|
||||
|
||||
# Add to PATH if not already there
|
||||
$currentPath = [Environment]::GetEnvironmentVariable("Path", "User")
|
||||
if ($currentPath -notlike "*$installDir*") {
|
||||
[Environment]::SetEnvironmentVariable("Path", "$currentPath;$installDir", "User")
|
||||
$env:Path = "$env:Path;$installDir"
|
||||
Write-Host "Added $installDir to your PATH."
|
||||
}
|
||||
|
||||
# --- Query GitHub API for latest release ---
|
||||
Write-Host "Detecting latest release for $Repo ..."
|
||||
try {
|
||||
$release = Invoke-RestMethod -Uri "https://api.github.com/repos/$Repo/releases/latest" -UseBasicParsing
|
||||
} catch {
|
||||
Write-Error "Failed to reach the GitHub API (network error). Check your internet connection and try again."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$tag = $release.tag_name
|
||||
if (-not $tag) {
|
||||
Write-Error "Could not find a published release for $Repo. No release has been tagged yet."
|
||||
exit 1
|
||||
}
|
||||
|
||||
Write-Host "Latest release: $tag"
|
||||
|
||||
# --- Download binary ---
|
||||
$asset = "kctl-tui-windows-${goarch}.exe"
|
||||
$url = "https://github.com/$Repo/releases/download/$tag/$asset"
|
||||
$outFile = "$installDir\$BinName.exe"
|
||||
|
||||
Write-Host "Downloading $asset ($tag) ..."
|
||||
try {
|
||||
Invoke-WebRequest -Uri $url -OutFile $outFile -UseBasicParsing
|
||||
} catch {
|
||||
Write-Error "Download failed: $_"
|
||||
exit 1
|
||||
}
|
||||
|
||||
Write-Host "Installed $BinName to $outFile"
|
||||
Write-Host "Done. Run '$BinName' to get started."
|
||||
@@ -1,4 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
# Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
# Install script for kctl-tui.
|
||||
# Downloads the latest GitHub release binary matching the current OS/arch
|
||||
# and installs it to /usr/local/bin (or $INSTALL_DIR if set).
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
// Package config loads the user-specific, non-versioned kctl-tui
|
||||
// configuration (contexts, envs, templates) from a YAML file.
|
||||
package config
|
||||
@@ -41,6 +44,12 @@ type Config struct {
|
||||
// namespace and env, e.g. "tf-{namespace}-{env}-secrets".
|
||||
SecretNameTemplate string `yaml:"secret_name_template"`
|
||||
|
||||
// K8sSecretNameTemplate builds the Kubernetes secret name from a
|
||||
// namespace, e.g. "{namespace}-common-secrets". Kept separate from
|
||||
// SecretNameTemplate because the two sides commonly follow different
|
||||
// naming conventions.
|
||||
K8sSecretNameTemplate string `yaml:"k8s_secret_name_template"`
|
||||
|
||||
// ContextTemplate builds the actual kubectl context name/ARN from
|
||||
// region, account_id, env, and context, e.g.
|
||||
// "arn:aws:eks:{region}:{account_id}:cluster/tf-{env}-{context}-1".
|
||||
@@ -96,6 +105,22 @@ func (c Config) ResolveSecretName(namespace, env string) string {
|
||||
})
|
||||
}
|
||||
|
||||
// ResolveK8sSecretName builds the Kubernetes secret name for a given
|
||||
// namespace using K8sSecretNameTemplate. Falls back to
|
||||
// SecretNameTemplate resolved without an env placeholder if
|
||||
// K8sSecretNameTemplate is not configured, so existing configs keep
|
||||
// working, though setting it explicitly is recommended since the two
|
||||
// naming conventions usually differ.
|
||||
func (c Config) ResolveK8sSecretName(namespace string) string {
|
||||
template := c.K8sSecretNameTemplate
|
||||
if template == "" {
|
||||
template = c.SecretNameTemplate
|
||||
}
|
||||
return kctl.ResolveTemplate(template, map[string]string{
|
||||
"namespace": namespace,
|
||||
})
|
||||
}
|
||||
|
||||
// DefaultPath returns the default config file location: ~/.kctl-tui/config.yaml
|
||||
func DefaultPath() (string, error) {
|
||||
home, err := os.UserHomeDir()
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
@@ -28,6 +31,7 @@ envs:
|
||||
aws_region: "eu-central-1"
|
||||
aws_account_id: "123456789012"
|
||||
secret_name_template: "tf-{namespace}-{env}-secrets"
|
||||
k8s_secret_name_template: "{namespace}-common-secrets"
|
||||
context_template: "arn:aws:eks:{region}:{account_id}:cluster/tf-{env}-{context}-1"
|
||||
team_label_key: "example.org/team"
|
||||
`)
|
||||
@@ -46,6 +50,9 @@ team_label_key: "example.org/team"
|
||||
if len(cfg.Contexts) != 2 || len(cfg.Envs) != 2 {
|
||||
t.Fatalf("unexpected contexts/envs: %+v", cfg)
|
||||
}
|
||||
if cfg.K8sSecretNameTemplate != "{namespace}-common-secrets" {
|
||||
t.Fatalf("unexpected k8s secret name template: %q", cfg.K8sSecretNameTemplate)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEffectiveDefaultContext(t *testing.T) {
|
||||
@@ -87,6 +94,24 @@ func TestResolveSecretName(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveK8sSecretName_ExplicitTemplate(t *testing.T) {
|
||||
cfg := Config{K8sSecretNameTemplate: "{namespace}-common-secrets"}
|
||||
got := cfg.ResolveK8sSecretName("example-ns")
|
||||
want := "example-ns-common-secrets"
|
||||
if got != want {
|
||||
t.Fatalf("got %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveK8sSecretName_FallsBackToSecretNameTemplate(t *testing.T) {
|
||||
cfg := Config{SecretNameTemplate: "tf-{namespace}-{env}-secrets"}
|
||||
got := cfg.ResolveK8sSecretName("example-ns")
|
||||
want := "tf-example-ns-{env}-secrets" // {env} intentionally left unresolved here
|
||||
if got != want {
|
||||
t.Fatalf("got %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoginCommand_DefaultsWhenUnset(t *testing.T) {
|
||||
cfg := Config{}
|
||||
if got := cfg.LoginCommand(); got != DefaultAWSSSOLoginCommand {
|
||||
|
||||
+31
-5
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import "sort"
|
||||
@@ -5,10 +8,27 @@ import "sort"
|
||||
// SecretDiffEntry represents the comparison of one key between two secret
|
||||
// sources (e.g. AWS Secrets Manager vs. a Kubernetes Secret).
|
||||
type SecretDiffEntry struct {
|
||||
Key string
|
||||
Left string // e.g. the AWS Secrets Manager value
|
||||
Right string // e.g. the decoded Kubernetes secret value
|
||||
Match bool
|
||||
Key string
|
||||
Left string // e.g. the AWS Secrets Manager value
|
||||
Right string // e.g. the decoded Kubernetes secret value
|
||||
Match bool
|
||||
LeftBin bool // true if Left contains non-printable (binary) data
|
||||
RightBin bool // true if Right contains non-printable (binary) data
|
||||
}
|
||||
|
||||
// IsBinary reports whether s contains non-printable bytes (i.e. is likely
|
||||
// binary data rather than human-readable text). Control characters below
|
||||
// space (0x20) are excluded, except for common whitespace (\t, \n, \r).
|
||||
func IsBinary(s string) bool {
|
||||
for _, r := range s {
|
||||
if r > 0x7f {
|
||||
return true
|
||||
}
|
||||
if r < 0x20 && r != '\t' && r != '\n' && r != '\r' {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// DiffSecretValues compares two key/value maps and returns a sorted list of
|
||||
@@ -35,7 +55,13 @@ func DiffSecretValues(left, right map[string]string) []SecretDiffEntry {
|
||||
for _, k := range keys {
|
||||
l := left[k]
|
||||
r := right[k]
|
||||
result = append(result, SecretDiffEntry{Key: k, Left: l, Right: r, Match: l == r})
|
||||
lb := IsBinary(l)
|
||||
rb := IsBinary(r)
|
||||
match := l == r
|
||||
if lb || rb {
|
||||
match = l == r
|
||||
}
|
||||
result = append(result, SecretDiffEntry{Key: k, Left: l, Right: r, Match: match, LeftBin: lb, RightBin: rb})
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import "testing"
|
||||
@@ -57,3 +60,43 @@ func TestDiffSecretValues_EmptyMaps(t *testing.T) {
|
||||
t.Fatalf("expected no mismatch for empty maps")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsBinary_Plaintext(t *testing.T) {
|
||||
if IsBinary("hello world") {
|
||||
t.Fatal("expected plaintext to not be binary")
|
||||
}
|
||||
if IsBinary("line1\nline2\ttab") {
|
||||
t.Fatal("expected newline/tab to not be binary")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsBinary_BinaryData(t *testing.T) {
|
||||
if !IsBinary("hello\x00world") {
|
||||
t.Fatal("expected null byte to be binary")
|
||||
}
|
||||
if !IsBinary("key=\xff\xfe") {
|
||||
t.Fatal("expected non-ASCII bytes to be binary")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDiffSecretValues_BinaryDetection(t *testing.T) {
|
||||
left := map[string]string{"ok": "text", "bin": "data\x00here"}
|
||||
right := map[string]string{"ok": "text", "bin": "data\x00here"}
|
||||
|
||||
entries := DiffSecretValues(left, right)
|
||||
for _, e := range entries {
|
||||
if e.Key == "bin" {
|
||||
if !e.LeftBin || !e.RightBin {
|
||||
t.Fatalf("expected binary flags set for key 'bin', got LeftBin=%v RightBin=%v", e.LeftBin, e.RightBin)
|
||||
}
|
||||
if !e.Match {
|
||||
t.Fatalf("expected binary values to match")
|
||||
}
|
||||
}
|
||||
if e.Key == "ok" {
|
||||
if e.LeftBin || e.RightBin {
|
||||
t.Fatalf("expected binary flags unset for key 'ok'")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import "sort"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import (
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import "strings"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kctl
|
||||
|
||||
import "testing"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
// Package kubeexec wraps kubectl/aws-cli invocations used by kctl-tui.
|
||||
// All functions here have side effects (they run external processes) and
|
||||
// are therefore not covered by unit tests; the pure logic they depend on
|
||||
@@ -19,12 +22,27 @@ import (
|
||||
)
|
||||
|
||||
func runOutput(name string, args ...string) (string, error) {
|
||||
logCmd(name, args...)
|
||||
cmd := exec.Command(name, args...)
|
||||
out, err := cmd.CombinedOutput()
|
||||
var stdout, stderr strings.Builder
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("%s %s failed: %w\n%s", name, strings.Join(args, " "), err, string(out))
|
||||
logErr(name, err)
|
||||
prefix := fmt.Sprintf("%s %s failed: %v", name, strings.Join(args, " "), err)
|
||||
msg := prefix
|
||||
if s := strings.TrimSpace(stderr.String()); s != "" {
|
||||
msg += "\n" + s
|
||||
}
|
||||
if s := strings.TrimSpace(stdout.String()); s != "" {
|
||||
msg += "\n" + s
|
||||
}
|
||||
return "", fmt.Errorf("%s", msg)
|
||||
}
|
||||
return strings.TrimSpace(string(out)), nil
|
||||
out := strings.TrimSpace(stdout.String())
|
||||
logOutput(name, out)
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// kubectlArgs prepends a --context flag when context is non-empty.
|
||||
@@ -162,3 +180,16 @@ func RunAWSLogin(loginCommand string) *exec.Cmd {
|
||||
}
|
||||
return exec.Command(parts[0], parts[1:]...)
|
||||
}
|
||||
|
||||
// CheckTool verifies that a named executable is available in PATH.
|
||||
// Returns nil if found, or a descriptive error if not.
|
||||
func CheckTool(name string) error {
|
||||
_, err := exec.LookPath(name)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
if name == "tmux" {
|
||||
return fmt.Errorf("%q not found in PATH — install tmux (Linux/macOS) or psmux (Windows: scoop install psmux or cargo install psmux)", name)
|
||||
}
|
||||
return fmt.Errorf("%q not found in PATH — please install it first", name)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
// Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
|
||||
// Licensed under the MIT License. See LICENSE file in project root for details.
|
||||
|
||||
package kubeexec
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
||||
var (
|
||||
verbose bool
|
||||
logOut io.Writer = io.Discard
|
||||
mu sync.Mutex
|
||||
)
|
||||
|
||||
// SetVerbose enables or disables debug logging of executed commands.
|
||||
// When enabled, commands and their outputs are written to the provided
|
||||
// writer (typically os.Stderr). When disabled (the default), all logging
|
||||
// is discarded.
|
||||
func SetVerbose(enabled bool, w io.Writer) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
verbose = enabled
|
||||
if w != nil {
|
||||
logOut = w
|
||||
}
|
||||
}
|
||||
|
||||
// VerboseLog writes a message to the verbose log if enabled.
|
||||
func VerboseLog(format string, args ...interface{}) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !verbose {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(logOut, format, args...)
|
||||
}
|
||||
|
||||
func logCmd(name string, args ...string) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !verbose {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(logOut, "[cmd] %s %s\n", name, strings.Join(args, " "))
|
||||
}
|
||||
|
||||
func logOutput(name string, output string) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !verbose {
|
||||
return
|
||||
}
|
||||
if output != "" {
|
||||
fmt.Fprintf(logOut, "[out] %s: %s\n", name, output)
|
||||
}
|
||||
}
|
||||
|
||||
func logErr(name string, err error) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !verbose {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(logOut, "[err] %s: %v\n", name, err)
|
||||
}
|
||||
Reference in New Issue
Block a user