Fix go_package in runnerv2alpha1

It also contains typo fixes and additional tests.
stateful · Feb 2, 2024 · fd8617d · fd8617d
1 parent c55d629
commit fd8617d
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 32 deletions.
diff --git a/internal/api/runme/runner/v1/runner.proto b/internal/api/runme/runner/v1/runner.proto
@@ -259,6 +259,6 @@ service RunnerService {
   // using the provided sources, which can be a list of environment variables,
   // a session, or a project.
   // The result contains all found environment variables. If the env is in any source,
-  // it is considered resolved. Otherwise, it is makred as unresolved.
+  // it is considered resolved. Otherwise, it is marked as unresolved.
   rpc ResolveEnv(ResolveEnvRequest) returns (ResolveEnvResponse) {}
 }
diff --git a/internal/api/runme/runner/v2alpha1/config.proto b/internal/api/runme/runner/v2alpha1/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package runme.runner.v2alpha1;
 
-option go_package = "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v1;runnerv1";
+option go_package = "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v2alpha1;runnerv2alpha1";
 
 enum CommandMode {
   COMMAND_MODE_UNSPECIFIED = 0;

diff --git a/internal/api/runme/runner/v2alpha1/runner.proto b/internal/api/runme/runner/v2alpha1/runner.proto
@@ -5,7 +5,7 @@ package runme.runner.v2alpha1;
 import "google/protobuf/wrappers.proto";
 import "runme/runner/v2alpha1/config.proto";
 
-option go_package = "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v1;runnerv1";
+option go_package = "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v2alpha1;runnerv2alpha1";
 
 message Project {
   // root is a root directory of the project.
@@ -232,6 +232,6 @@ service RunnerService {
   // using the provided sources, which can be a list of environment variables,
   // a session, or a project.
   // The result contains all found environment variables. If the env is in any source,
-  // it is considered resolved. Otherwise, it is makred as unresolved.
+  // it is considered resolved. Otherwise, it is marked as unresolved.
   rpc ResolveEnv(ResolveEnvRequest) returns (ResolveEnvResponse) {}
 }
diff --git a/internal/command/command_unix.go b/internal/command/command_unix.go
@@ -42,13 +42,6 @@ func closeOnExec(fd uintptr) {
 	syscall.CloseOnExec(int(fd))
 }
 
-// func setSysProcAttrPgid(cmd *exec.Cmd) {
-// 	if cmd.SysProcAttr == nil {
-// 		cmd.SysProcAttr = &syscall.SysProcAttr{}
-// 	}
-// 	cmd.SysProcAttr.Setpgid = true
-// }
-
 func signalPgid(pid int, sig os.Signal) error {
 	pgid, err := syscall.Getpgid(pid)
 	if err != nil {

diff --git a/internal/command/env_resolver.go b/internal/command/env_resolver.go
@@ -18,7 +18,7 @@ func EnvResolverSourceFunc(env []string) EnvResolverSource {
 
 // EnvResolver uses a list of EnvResolverSource to resolve environment variables
 // found in a shell program. The result contains all found environment variables.
-// If the env is in any source, it is considered resolved. Otherwise, it is makred
+// If the env is in any source, it is considered resolved. Otherwise, it is marked
 // as unresolved.
 type EnvResolver struct {
 	sources  []EnvResolverSource

diff --git a/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go b/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go
diff --git a/internal/gen/proto/go/runme/runner/v2alpha1/config.pb.go b/internal/gen/proto/go/runme/runner/v2alpha1/config.pb.go
diff --git a/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go b/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go
diff --git a/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go b/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go
diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts
@@ -57,7 +57,7 @@ export interface IRunnerServiceClient {
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse);
      */
@@ -105,7 +105,7 @@ export declare class RunnerServiceClient implements IRunnerServiceClient, Servic
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse);
      */

diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js
@@ -63,7 +63,7 @@ export class RunnerServiceClient {
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse);
      */

diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts
@@ -63,7 +63,7 @@ export interface IRunnerServiceClient {
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse);
      */
@@ -115,7 +115,7 @@ export declare class RunnerServiceClient implements IRunnerServiceClient, Servic
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse);
      */

diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js
@@ -70,7 +70,7 @@ export class RunnerServiceClient {
      * using the provided sources, which can be a list of environment variables,
      * a session, or a project.
      * The result contains all found environment variables. If the env is in any source,
-     * it is considered resolved. Otherwise, it is makred as unresolved.
+     * it is considered resolved. Otherwise, it is marked as unresolved.
      *
      * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse);
      */

diff --git a/internal/runnerv2service/service_resolve_env_test.go b/internal/runnerv2service/service_resolve_env_test.go
@@ -40,6 +40,17 @@ func TestRunnerServiceResolveEnv(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "WithAdditionalEnv",
+			request: &runnerv2alpha1.ResolveEnvRequest{
+				Env: []string{"TEST_RESOLVED=value", "TEST_EXTRA=value"},
+				Source: &runnerv2alpha1.ResolveEnvRequest_Commands{
+					Commands: &runnerv2alpha1.ResolveEnvRequest_CommandList{
+						Items: []string{"export TEST_RESOLVED=default", "export TEST_UNRESOLVED"},
+					},
+				},
+			},
+		},
 	}
 
 	for _, tc := range testCases {