Skip to content
Open
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
11 changes: 8 additions & 3 deletions internal/pkg/print/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,14 @@ func (p *Printer) PagerDisplay(content string) error {
// -K: exits if an interrupt character is typed
pagerCmd := exec.Command("less", "-F", "-S", "-w", "-R", "-K")

pager, pagerExists := os.LookupEnv("PAGER")
if pagerExists && pager != "nil" && pager != "" {
pagerCmd = exec.Command(pager) // #nosec G204
stackitPager, stackitPagerExists := os.LookupEnv("STACKIT_PAGER")
if stackitPagerExists && stackitPager != "nil" && stackitPager != "" {
pagerCmd = exec.Command(stackitPager) // #nosec G204
} else if !stackitPagerExists {
pager, pagerExists := os.LookupEnv("PAGER")
if pagerExists && pager != "nil" && pager != "" {
pagerCmd = exec.Command(pager) // #nosec G204
}
}

pagerCmd.Stdin = strings.NewReader(content)
Expand Down
52 changes: 52 additions & 0 deletions internal/pkg/print/print_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,58 @@ func TestPagerDisplay(t *testing.T) {
}
}

func TestPagerDisplay_StackitPager(t *testing.T) {
tests := []struct {
description string
stackitPager string
setStackitPager bool
pager string
setPager bool
content string
}{
{
description: "STACKIT_PAGER set takes precedence over PAGER",
stackitPager: "non-existent-pager-stackit",
setStackitPager: true,
pager: "non-existent-pager-fallback",
setPager: true,
content: "Test precedence message",
},
{
description: "STACKIT_PAGER unset falls back to PAGER",
setStackitPager: false,
pager: "non-existent-pager-fallback",
setPager: true,
content: "Test fallback message",
},
}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {
if tt.setStackitPager {
t.Setenv("STACKIT_PAGER", tt.stackitPager)
}
if tt.setPager {
t.Setenv("PAGER", tt.pager)
}
var buf bytes.Buffer
p := &Printer{
StdOut: &buf,
StdErr: &buf,
Verbosity: InfoLevel,
}
viper.Reset()

err := p.PagerDisplay(tt.content)
if err != nil {
t.Fatalf("unexpected error: %s", err.Error())
}
if buf.String() != tt.content {
t.Errorf("unexpected output: got %q, want %q", buf.String(), tt.content)
}
})
}
}

func TestDebug(t *testing.T) {
tests := []struct {
description string
Expand Down