diff --git a/internal/pkg/print/print.go b/internal/pkg/print/print.go index 62e919409..8ab933376 100644 --- a/internal/pkg/print/print.go +++ b/internal/pkg/print/print.go @@ -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) diff --git a/internal/pkg/print/print_test.go b/internal/pkg/print/print_test.go index bbfc3b220..337c59c3e 100644 --- a/internal/pkg/print/print_test.go +++ b/internal/pkg/print/print_test.go @@ -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