Fix deprecation of testscript.RunMain

hslatman · hslatman · commit 6a18ddaf6168 · 2025-06-25T18:57:29.000+02:00
diff --git a/cmd/step/main.go b/cmd/step/main.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"os"
-
 	"github.com/smallstep/certificates/ca"
 	"github.com/smallstep/cli-utils/step"
 
@@ -27,5 +25,5 @@ func init() {
 }
 
 func main() {
-	os.Exit(cmd.Run())
+	cmd.Run()
 }
diff --git a/integration/shared_test.go b/integration/shared_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"os"
 	"testing"
 
 	"github.com/rogpeppe/go-internal/testscript"
@@ -10,7 +9,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
+	testscript.Main(m, map[string]func(){
 		"step": cmd.Run, // main entrypoint name
-	}))
+	})
 }
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -43,15 +43,19 @@ import (
 	_ "github.com/smallstep/cli/command/ssh"
 )
 
-func Run() int {
+func Run() {
+	os.Exit(run())
+}
+
+func run() int {
+	defer panicHandler()
+
 	// initialize step environment.
 	if err := step.Init(); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		return 1
 	}
 
-	defer panicHandler()
-
 	// create new instance of app
 	app := newApp(os.Stdout, os.Stderr)
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "os"`
`5`		`-`
`6`	`4`	`"github.com/smallstep/certificates/ca"`
`7`	`5`	`"github.com/smallstep/cli-utils/step"`
`8`	`6`
`@@ -27,5 +25,5 @@ func init() {`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`func main() {`
`30`		`- os.Exit(cmd.Run())`
	`28`	`+ cmd.Run()`
`31`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package integration`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "os"`
`5`	`4`	`"testing"`
`6`	`5`
`7`	`6`	`"github.com/rogpeppe/go-internal/testscript"`
`@@ -10,7 +9,7 @@ import (`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`func TestMain(m *testing.M) {`
`13`		`- os.Exit(testscript.RunMain(m, map[string]func() int{`
	`12`	`+ testscript.Main(m, map[string]func(){`
`14`	`13`	`"step": cmd.Run, // main entrypoint name`
`15`		`- }))`
	`14`	`+ })`
`16`	`15`	`}`