runner: rename runner.v2alpha1 to runner.v2 (#651)

Simply rename `runner.v2alpha1` to `runner.v2`.

---------

Co-authored-by: Sebastian Tiedtke <[email protected]>

buf.gen.yaml

@@ -1,4 +1,5 @@
 version: v2
+clean: true
 plugins:
   # Remote plugin. You can switch to a local one by using "go".
   - remote: buf.build/protocolbuffers/go

internal/cmd/beta/env_cmd.go

@@ -11,7 +11,7 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	runmetls "github.com/stateful/runme/v3/internal/tls"
-	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func envCmd(cflags *commonFlags) *cobra.Command {

internal/cmd/beta/run_cmd.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stateful/runme/v3/internal/command"
 	"github.com/stateful/runme/v3/internal/config/autoconfig"
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 	"github.com/stateful/runme/v3/pkg/document"
 	"github.com/stateful/runme/v3/pkg/project"
 )
@@ -117,7 +117,7 @@ func runCodeBlock(
 		return err
 	}
 
-	cfg.Mode = runnerv2alpha1.CommandMode_COMMAND_MODE_CLI
+	cfg.Mode = runnerv2.CommandMode_COMMAND_MODE_CLI
 
 	cmd, err := factory.Build(cfg, options)
 	if err != nil {

internal/cmd/server.go

@@ -21,7 +21,7 @@ import (
 	parserv1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/parser/v1"
 	projectv1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/project/v1"
 	runnerv1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v1"
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 	"github.com/stateful/runme/v3/pkg/document/editor/editorservice"
 )
 
@@ -119,7 +119,7 @@ The kernel is used to run long running processes like shells and interacting wit
 				if err != nil {
 					return err
 				}
-				runnerv2alpha1.RegisterRunnerServiceServer(server, runnerServicev2)
+				runnerv2.RegisterRunnerServiceServer(server, runnerServicev2)
 			}
 
 			healthcheck := health.NewServer()

internal/command/command_docker_test.go

@@ -12,7 +12,7 @@ import (
 	"go.uber.org/zap/zaptest"
 
 	"github.com/stateful/runme/v3/internal/dockerexec"
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestDockerCommand(t *testing.T) {
@@ -30,7 +30,7 @@ func TestDockerCommand(t *testing.T) {
 				ProgramName: "echo",
 				Arguments:   []string{"-n", "test"},
 				Interactive: true,
-				Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+				Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 			},
 			CommandOptions{},
 		)
@@ -47,7 +47,7 @@ func TestDockerCommand(t *testing.T) {
 				ProgramName: "echo",
 				Arguments:   []string{"-n", "test"},
 				Interactive: true,
-				Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+				Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 			},
 			CommandOptions{Stdout: stdout},
 		)
@@ -63,7 +63,7 @@ func TestDockerCommand(t *testing.T) {
 			&ProgramConfig{
 				ProgramName: "sleep",
 				Arguments:   []string{"1"},
-				Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+				Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 			},
 			CommandOptions{},
 		)
@@ -81,7 +81,7 @@ func TestDockerCommand(t *testing.T) {
 			&ProgramConfig{
 				ProgramName: "sh",
 				Arguments:   []string{"-c", "exit 11"},
-				Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+				Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 			},
 			CommandOptions{},
 		)

internal/command/command_file_test.go

@@ -5,7 +5,7 @@ package command
 import (
 	"testing"
 
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestFileCommand(t *testing.T) {
@@ -16,12 +16,12 @@ func TestFileCommand(t *testing.T) {
 
 		cfg := &ProgramConfig{
 			ProgramName: "bash",
-			Source: &runnerv2alpha1.ProgramConfig_Commands{
-				Commands: &runnerv2alpha1.ProgramConfig_CommandList{
+			Source: &runnerv2.ProgramConfig_Commands{
+				Commands: &runnerv2.ProgramConfig_CommandList{
 					Items: []string{"echo -n test"},
 				},
 			},
-			Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_FILE,
+			Mode: runnerv2.CommandMode_COMMAND_MODE_FILE,
 		}
 
 		testExecuteCommand(t, cfg, nil, "test", "")
@@ -33,12 +33,12 @@ func TestFileCommand(t *testing.T) {
 		cfg := &ProgramConfig{
 			ProgramName: "",
 			LanguageId:  "shellscript",
-			Source: &runnerv2alpha1.ProgramConfig_Commands{
-				Commands: &runnerv2alpha1.ProgramConfig_CommandList{
+			Source: &runnerv2.ProgramConfig_Commands{
+				Commands: &runnerv2.ProgramConfig_CommandList{
 					Items: []string{`echo -n "execute shellscript as shell script"`},
 				},
 			},
-			Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_FILE,
+			Mode: runnerv2.CommandMode_COMMAND_MODE_FILE,
 		}
 
 		testExecuteCommand(t, cfg, nil, "execute shellscript as shell script", "")
@@ -49,10 +49,10 @@ func TestFileCommand(t *testing.T) {
 
 		cfg := &ProgramConfig{
 			ProgramName: "python3",
-			Source: &runnerv2alpha1.ProgramConfig_Script{
+			Source: &runnerv2.ProgramConfig_Script{
 				Script: "print('test')",
 			},
-			Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_FILE,
+			Mode: runnerv2.CommandMode_COMMAND_MODE_FILE,
 		}
 
 		testExecuteCommand(t, cfg, nil, "test\n", "")
@@ -64,14 +64,14 @@ func TestFileCommand(t *testing.T) {
 
 		cfg := &ProgramConfig{
 			LanguageId: "ts",
-			Source: &runnerv2alpha1.ProgramConfig_Script{
+			Source: &runnerv2.ProgramConfig_Script{
 				Script: `function print(message: string): void {
 	console.log(message)
 }
 print("important message")
 `,
 			},
-			Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_FILE,
+			Mode: runnerv2.CommandMode_COMMAND_MODE_FILE,
 		}
 
 		testExecuteCommand(t, cfg, nil, "important message\n", "")

internal/command/command_inline_shell_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestInlineShellCommand_CollectEnv(t *testing.T) {
@@ -29,15 +29,15 @@ func TestInlineShellCommand_CollectEnv(t *testing.T) {
 
 		cfg := &ProgramConfig{
 			ProgramName: "bash",
-			Source: &runnerv2alpha1.ProgramConfig_Commands{
-				Commands: &runnerv2alpha1.ProgramConfig_CommandList{
+			Source: &runnerv2.ProgramConfig_Commands{
+				Commands: &runnerv2.ProgramConfig_CommandList{
 					Items: []string{
 						"export TEST_ENV=1",
 						"sleep 5",
 					},
 				},
 			},
-			Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+			Mode: runnerv2.CommandMode_COMMAND_MODE_INLINE,
 		}
 		sess := NewSession()
 		factory := NewFactory(WithLogger(zaptest.NewLogger(t)))
@@ -74,10 +74,10 @@ func testInlineShellCommandCollectEnv(t *testing.T) {
 
 	cfg := &ProgramConfig{
 		ProgramName: "bash",
-		Source: &runnerv2alpha1.ProgramConfig_Script{
+		Source: &runnerv2.ProgramConfig_Script{
 			Script: "export TEST_ENV=1",
 		},
-		Mode: runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+		Mode: runnerv2.CommandMode_COMMAND_MODE_INLINE,
 	}
 	sess := NewSession()
 

internal/command/command_inline_test.go

@@ -3,15 +3,15 @@ package command
 import (
 	"testing"
 
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestInlineCommand_Noninteractive(t *testing.T) {
 	t.Parallel()
 	cfg := &ProgramConfig{
 		ProgramName: "echo",
 		Arguments:   []string{"-n", "test"},
-		Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+		Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 	}
 	testExecuteCommand(t, cfg, nil, "test", "")
 }

internal/command/command_inline_unix_test.go

@@ -5,7 +5,7 @@ package command
 import (
 	"testing"
 
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestInlineCommand_Interactive(t *testing.T) {
@@ -14,7 +14,7 @@ func TestInlineCommand_Interactive(t *testing.T) {
 		ProgramName: "echo",
 		Arguments:   []string{"-n", "test"},
 		Interactive: true,
-		Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_INLINE,
+		Mode:        runnerv2.CommandMode_COMMAND_MODE_INLINE,
 	}
 	testExecuteCommand(t, cfg, nil, "test", "")
 }

internal/command/command_terminal_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	runnerv2alpha1 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2alpha1"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
 func TestTerminalCommand_EnvPropagation(t *testing.T) {
@@ -31,7 +31,7 @@ func TestTerminalCommand_EnvPropagation(t *testing.T) {
 		&ProgramConfig{
 			ProgramName: "bash",
 			Interactive: true,
-			Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_TERMINAL,
+			Mode:        runnerv2.CommandMode_COMMAND_MODE_TERMINAL,
 		},
 		CommandOptions{
 			Session:     session,
@@ -90,7 +90,7 @@ func TestTerminalCommand_NonInteractive(t *testing.T) {
 	cmd, err := factory.Build(
 		&ProgramConfig{
 			ProgramName: "bash",
-			Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_TERMINAL,
+			Mode:        runnerv2.CommandMode_COMMAND_MODE_TERMINAL,
 		},
 		CommandOptions{
 			StdinWriter: stdinW,
@@ -125,7 +125,7 @@ func TestTerminalCommand_OptionsStdinWriterNil(t *testing.T) {
 		&ProgramConfig{
 			ProgramName: "bash",
 			Interactive: true,
-			Mode:        runnerv2alpha1.CommandMode_COMMAND_MODE_TERMINAL,
+			Mode:        runnerv2.CommandMode_COMMAND_MODE_TERMINAL,
 		},
 		CommandOptions{},
 	)