daria-malkova commented on a change in pull request #16477:
URL: https://github.com/apache/beam/pull/16477#discussion_r783735862
##########
File path: playground/backend/internal/setup_tools/builder/setup_builder.go
##########
@@ -31,73 +31,134 @@ const (
javaLogConfigFilePlaceholder = "{logConfigFile}"
)
-// SetupExecutorBuilder return executor with set args for validator,
preparator, compiler and runner
-func SetupExecutorBuilder(lc *fs_tool.LifeCycle, pipelineOptions string,
sdkEnv *environment.BeamEnvs) (*executors.ExecutorBuilder, error) {
+// SetupValidatorBuilder return executor with set args for validator
+func SetupValidatorBuilder(lc *fs_tool.LifeCycle, sdkEnv
*environment.BeamEnvs) (*executors.ExecutorBuilder, error) {
sdk := sdkEnv.ApacheBeamSdk
-
- if sdk == pb.Sdk_SDK_JAVA {
- pipelineOptions = utils.ReplaceSpacesWithEquals(pipelineOptions)
- }
-
val, err := utils.GetValidators(sdk, lc.GetAbsoluteSourceFilePath())
if err != nil {
return nil, err
}
+ builder := executors.NewExecutorBuilder().
+ WithValidator().
+ WithSdkValidators(val).
+ ExecutorBuilder
+ return &builder, err
+}
+
+// SetupPreparatorBuilder return executor with set args for preparator
+func SetupPreparatorBuilder(lc *fs_tool.LifeCycle, sdkEnv
*environment.BeamEnvs) (*executors.ExecutorBuilder, error) {
+ sdk := sdkEnv.ApacheBeamSdk
prep, err := utils.GetPreparators(sdk, lc.GetAbsoluteSourceFilePath())
if err != nil {
return nil, err
}
- executorConfig := sdkEnv.ExecutorConfig
builder := executors.NewExecutorBuilder().
- WithExecutableFileName(lc.GetAbsoluteExecutableFilePath()).
- WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
- WithValidator().
- WithSdkValidators(val).
WithPreparator().
WithSdkPreparators(prep).
+ ExecutorBuilder
+ return &builder, err
+}
+
+// SetupCompilerBuilder return executor with set args for compiler
+func SetupCompilerBuilder(lc *fs_tool.LifeCycle, sdkEnv *environment.BeamEnvs)
*executors.ExecutorBuilder {
+ sdk := sdkEnv.ApacheBeamSdk
+ executorConfig := sdkEnv.ExecutorConfig
+ builder := executors.NewExecutorBuilder().
WithCompiler().
WithCommand(executorConfig.CompileCmd).
+ WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
WithArgs(executorConfig.CompileArgs).
WithFileName(lc.GetAbsoluteSourceFilePath()).
+ ExecutorBuilder
+
+ switch sdk {
+ case pb.Sdk_SDK_JAVA:
+ builder.
+ WithCompiler().
+
WithFileName(GetFirstFileFromFolder(lc.GetAbsoluteSourceFolderPath()))
+ }
+ return &builder
+}
+
+// SetupRunBuilder return executor with set args for runner
+func SetupRunBuilder(lc *fs_tool.LifeCycle, pipelineOptions string, sdkEnv
*environment.BeamEnvs) (*executors.ExecutorBuilder, error) {
+ sdk := sdkEnv.ApacheBeamSdk
+
+ if sdk == pb.Sdk_SDK_JAVA {
+ pipelineOptions = utils.ReplaceSpacesWithEquals(pipelineOptions)
+ }
+ executorConfig := sdkEnv.ExecutorConfig
+ builder := executors.NewExecutorBuilder().
WithRunner().
+ WithExecutableFileName(lc.GetAbsoluteExecutableFilePath()).
Review comment:
Done
##########
File path: playground/backend/internal/setup_tools/builder/setup_builder_test.go
##########
@@ -23,100 +23,293 @@ import (
"beam.apache.org/playground/backend/internal/utils"
"fmt"
"github.com/google/uuid"
+ "reflect"
"strings"
"testing"
)
-func TestSetupExecutor(t *testing.T) {
+var lc *fs_tool.LifeCycle
+var sdkEnv *environment.BeamEnvs
+
+func TestMain(m *testing.M) {
+ setup()
+ m.Run()
+}
+
+func setup() {
pipelineId := uuid.New()
- sdk := pb.Sdk_SDK_JAVA
- lc, err := fs_tool.NewLifeCycle(sdk, pipelineId, "")
- if err != nil {
- t.Error(err)
- }
- pipelineOptions := ""
+ sdk := pb.Sdk_SDK_PYTHON
+ lc, _ = fs_tool.NewLifeCycle(sdk, pipelineId, "")
executorConfig := &environment.ExecutorConfig{
CompileCmd: "MOCK_COMPILE_CMD",
- RunCmd: "MOCK_RUN_CMD",
- TestCmd: "MOCK_TEST_CMD",
CompileArgs: []string{"MOCK_COMPILE_ARG"},
- RunArgs: []string{"MOCK_RUN_ARG"},
- TestArgs: []string{"MOCK_TEST_ARG"},
}
+ sdkEnv = environment.NewBeamEnvs(sdk, executorConfig, "", 0)
+}
+
+func TestSetupValidatorBuilder(t *testing.T) {
+ vals, err := utils.GetValidators(sdkEnv.ApacheBeamSdk,
lc.GetAbsoluteSourceFilePath())
if err != nil {
panic(err)
}
+ wantExecutor := executors.NewExecutorBuilder().
+ WithValidator().
+ WithSdkValidators(vals)
- srcFilePath := lc.GetAbsoluteSourceFilePath()
+ wrongSdkEnv := environment.NewBeamEnvs(pb.Sdk_SDK_UNSPECIFIED,
sdkEnv.ExecutorConfig, "", 0)
- sdkEnv := environment.NewBeamEnvs(sdk, executorConfig, "", 0)
- val, err := utils.GetValidators(sdk, srcFilePath)
- if err != nil {
- panic(err)
+ type args struct {
+ lc *fs_tool.LifeCycle
+ sdkEnv *environment.BeamEnvs
+ }
+ tests := []struct {
+ name string
+ args args
+ want *executors.ExecutorBuilder
+ wantErr bool
+ }{
+ {
+ // Test case with calling Setup with correct data.
+ // As a result, want to receive an expected validator
builder.
+ name: "Test correct validator builder",
+ args: args{
+ lc: lc,
+ sdkEnv: sdkEnv,
+ },
+ want: &wantExecutor.ExecutorBuilder,
+ wantErr: false,
+ },
+ {
+ // Test case with calling Setup with incorrect SDK.
+ // As a result, want to receive an error.
+ name: "incorrect sdk",
+ args: args{
+ lc: lc,
+ sdkEnv: wrongSdkEnv,
+ },
+ want: nil,
+ wantErr: true,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, err := SetupValidatorBuilder(tt.args.lc,
tt.args.sdkEnv)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("SetupValidatorBuilder() error = %v,
wantErr %v", err, tt.wantErr)
+ return
+ }
+ if err != nil && !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("SetupValidatorBuilder() got = %v,
want %v", got, tt.want)
+ return
+ }
+ if err == nil &&
!reflect.DeepEqual(fmt.Sprint(got.Build()), fmt.Sprint(tt.want.Build())) {
+ t.Errorf("SetupValidatorBuilder() got = %v\n,
want %v", got.Build(), tt.want.Build())
+ }
+ })
}
- prep, err := utils.GetPreparators(sdk, srcFilePath)
+}
+
+func TestSetupPreparatorBuilder(t *testing.T) {
+ prep, err := utils.GetPreparators(sdkEnv.ApacheBeamSdk,
lc.GetAbsoluteSourceFilePath())
if err != nil {
panic(err)
}
-
wantExecutor := executors.NewExecutorBuilder().
- WithExecutableFileName(lc.GetAbsoluteExecutableFilePath()).
- WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
- WithValidator().
- WithSdkValidators(val).
WithPreparator().
- WithSdkPreparators(prep).
- WithCompiler().
- WithCommand(executorConfig.CompileCmd).
- WithArgs(executorConfig.CompileArgs).
- WithFileName(srcFilePath).
- WithRunner().
- WithCommand(executorConfig.RunCmd).
- WithArgs(executorConfig.RunArgs).
- WithPipelineOptions(strings.Split(pipelineOptions, " ")).
- WithTestRunner().
- WithCommand(executorConfig.TestCmd).
- WithArgs(executorConfig.TestArgs).
- WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
- ExecutorBuilder
+ WithSdkPreparators(prep)
+
+ wrongSdkEnv := environment.NewBeamEnvs(pb.Sdk_SDK_UNSPECIFIED,
sdkEnv.ExecutorConfig, "", 0)
type args struct {
- lc *fs_tool.LifeCycle
- pipelineOptions string
- sdkEnv *environment.BeamEnvs
+ lc *fs_tool.LifeCycle
+ sdkEnv *environment.BeamEnvs
}
tests := []struct {
name string
args args
want *executors.ExecutorBuilder
wantErr bool
}{
+ {
+ // Test case with calling Setup with correct data.
+ // As a result, want to receive an expected preparator
builder.
+ name: "Test correct preparator builder",
+ args: args{
+ lc: lc,
+ sdkEnv: sdkEnv,
+ },
+ want: &wantExecutor.ExecutorBuilder,
+ wantErr: false,
+ },
{
// Test case with calling Setup with incorrect SDK.
// As a result, want to receive an error.
- name: "incorrect sdk",
- args: args{lc, pipelineOptions,
environment.NewBeamEnvs(pb.Sdk_SDK_UNSPECIFIED, executorConfig, "", 0)},
+ name: "incorrect sdk",
+ args: args{
+ lc: lc,
+ sdkEnv: wrongSdkEnv,
+ },
want: nil,
wantErr: true,
},
- {
- // Test case with calling Setup with correct SDK.
- // As a result, want to receive an expected builder.
- name: "correct sdk",
- args: args{lc, pipelineOptions, sdkEnv},
- want: &wantExecutor,
- wantErr: false,
- },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := SetupExecutorBuilder(tt.args.lc,
tt.args.pipelineOptions, tt.args.sdkEnv)
+ got, err := SetupPreparatorBuilder(tt.args.lc,
tt.args.sdkEnv)
if (err != nil) != tt.wantErr {
- t.Errorf("SetupExecutorBuilder() error = %v,
wantErr %v", err, tt.wantErr)
+ t.Errorf("SetupPreparatorBuilder() error = %v,
wantErr %v", err, tt.wantErr)
return
}
- if err == nil && fmt.Sprint(got.Build()) !=
fmt.Sprint(tt.want.Build()) {
- t.Errorf("SetupExecutorBuilder() got = %v\n,
want %v", got.Build(), tt.want.Build())
+ if err != nil && !reflect.DeepEqual(got, tt.want) {
+ t.Errorf("SetupPreparatorBuilder() got = %v,
want %v", got, tt.want)
+ return
+ }
+ if err == nil &&
!reflect.DeepEqual(fmt.Sprint(got.Build()), fmt.Sprint(tt.want.Build())) {
+ t.Errorf("SetupPreparatorBuilder() got = %v,
want %v", got.Build(), tt.want.Build())
+ }
+ })
+ }
+}
+
+func TestSetupCompilerBuilder(t *testing.T) {
+ wantExecutor := executors.NewExecutorBuilder().
+ WithCompiler().
+ WithCommand(sdkEnv.ExecutorConfig.CompileCmd).
+ WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
+ WithArgs(sdkEnv.ExecutorConfig.CompileArgs).
+ WithFileName(lc.GetAbsoluteSourceFilePath())
+
+ type args struct {
+ lc *fs_tool.LifeCycle
+ sdkEnv *environment.BeamEnvs
+ }
+ tests := []struct {
+ name string
+ args args
+ want *executors.ExecutorBuilder
+ }{
+ {
+ // Test case with calling Setup with correct data.
+ // As a result, want to receive an expected compiler
builder.
+ name: "Test correct compiler builder",
+ args: args{
+ lc: lc,
+ sdkEnv: sdkEnv,
+ },
+ want: &wantExecutor.ExecutorBuilder,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got := SetupCompilerBuilder(tt.args.lc, tt.args.sdkEnv)
+ if !reflect.DeepEqual(fmt.Sprint(got.Build()),
fmt.Sprint(tt.want.Build())) {
+ t.Errorf("SetupCompilerBuilder() = %v, want
%v", got.Build(), tt.want.Build())
+ }
+ })
+ }
+}
+
+func TestSetupRunBuilder(t *testing.T) {
+ wantExecutor := executors.NewExecutorBuilder().
+ WithRunner().
+ WithExecutableFileName(lc.GetAbsoluteExecutableFilePath()).
+ WithWorkingDir(lc.GetAbsoluteBaseFolderPath()).
+ WithCommand(sdkEnv.ExecutorConfig.RunCmd).
+ WithArgs(sdkEnv.ExecutorConfig.RunArgs).
+ WithPipelineOptions(strings.Split("", " "))
+
+ type args struct {
+ lc *fs_tool.LifeCycle
+ pipelineOptions string
+ sdkEnv *environment.BeamEnvs
+ }
+ tests := []struct {
+ name string
+ args args
+ want *executors.ExecutorBuilder
+ }{
+ {
+ // Test case with calling Setup with correct data.
+ // As a result, want to receive an expected run builder.
+ name: "Test correct run builder",
+ args: args{
+ lc: lc,
+ sdkEnv: sdkEnv,
+ },
+ want: &wantExecutor.ExecutorBuilder,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, _ := SetupRunBuilder(tt.args.lc,
tt.args.pipelineOptions, tt.args.sdkEnv)
+ if !reflect.DeepEqual(fmt.Sprint(got.Build()),
fmt.Sprint(tt.want.Build())) {
+ t.Errorf("SetupRunBuilder() got = %v, want %v",
got.Build(), tt.want.Build())
+ }
+ })
+ }
+}
+
+func TestSetupTestBuilder(t *testing.T) {
+ wantExecutor := executors.NewExecutorBuilder().
+ WithTestRunner().
+ WithExecutableFileName(lc.GetAbsoluteExecutableFilePath()).
+ WithCommand(sdkEnv.ExecutorConfig.TestCmd).
+ WithArgs(sdkEnv.ExecutorConfig.TestArgs).
+ WithWorkingDir(lc.GetAbsoluteSourceFolderPath())
+
+ type args struct {
+ lc *fs_tool.LifeCycle
+ sdkEnv *environment.BeamEnvs
+ }
+ tests := []struct {
+ name string
+ args args
+ want *executors.ExecutorBuilder
+ }{
+ {
+ // Test case with calling Setup with correct data.
+ // As a result, want to receive an expected test
builder.
+ name: "Test correct test builder",
+ args: args{
+ lc: lc,
+ sdkEnv: sdkEnv,
+ },
+ want: &wantExecutor.ExecutorBuilder,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, _ := SetupTestBuilder(tt.args.lc, tt.args.sdkEnv)
+ if !reflect.DeepEqual(fmt.Sprint(got.Build()),
fmt.Sprint(tt.want.Build())) {
+ t.Errorf("SetupTestBuilder() got = %v, want
%v", got.Build(), tt.want.Build())
+ }
+ })
+ }
+}
+
+func Test_replaceLogPlaceholder(t *testing.T) {
+ type args struct {
+ lc *fs_tool.LifeCycle
+ executorConfig *environment.ExecutorConfig
+ }
+ tests := []struct {
+ name string
+ args args
+ want []string
+ }{
+ {
+ name: "",
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@beam.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
