fixed wrong code with shaka-packager

Author: M4urici0GM

pkg/executor_test.go

@@ -33,7 +33,7 @@ func TestShakaExecutorRun(t *testing.T) {
 	ctx := context.Background()
 
 	mockRunner := &MockCommandRunner{}
-	mockRunner.On("CommandContext", ctx, "mock_binary", []string{}).
+	mockRunner.On("CommandContext", ctx, "mock_binary", []string{""}).
 		Return(exec.Command("echo", "hello world"))
 
 	shaka := NewShakaPackager("mock_binary")
@@ -48,15 +48,15 @@ func TestShakaExecutorRun(t *testing.T) {
 
 	// then
 	require.NoError(t, err)
-	mockRunner.AssertCalled(t, "CommandContext", ctx, "mock_binary", []string{})
+	mockRunner.AssertCalled(t, "CommandContext", ctx, "mock_binary", []string{""})
 }
 
 func TestShakaExecutorRunError(t *testing.T) {
 	// given
 	ctx := context.Background()
 
 	mockRunner := &MockCommandRunner{}
-	mockRunner.On("CommandContext", ctx, "shaka-packager", []string{}).
+	mockRunner.On("CommandContext", ctx, "shaka-packager", []string{""}).
 		Return(exec.Command("false"))
 
 	shaka := NewShakaPackager("shaka-packager")

pkg/shaka.go

@@ -73,32 +73,15 @@ func (r *ShakaPackager) BuildAndValidate() ([]string, error) {
 	args := []string{}
 	validationErrors := []string{}
 
-	for i, stream := range r.StreamOptions {
-        streamDescriptor := []string{}
-		for j, opt := range stream.Options {
-			if err := opt.Validate(); err != nil {
-				validationErrors = append(validationErrors, fmt.Sprintf("stream[%d].option[%d]: %v", i, j, err))
-				continue
-			}
-
-			streamDescriptor = append(streamDescriptor, opt.Parse())
-		}
-
-        args = append(args, strings.Join(streamDescriptor, ","))
-	}
+    args, argsError := buildStreamDescriptors(r.StreamOptions...)
+    flags, flagError := buildFlags(r.Flags)
 
-	for i, flag := range r.Flags.Flags {
-		if err := flag.Validate(); err != nil {
-			validationErrors = append(validationErrors, fmt.Sprintf("flag[%d]: %v", i, err))
-			continue
-		}
+    if argsError != nil || flagError != nil {
+		return nil, fmt.Errorf("validation errors: %s", validationErrors)
+    }
 
-		args = append(args, flag.Parse())
-	}
+    args = append(args, flags)
 
-	if len(validationErrors) > 0 {
-		return nil, fmt.Errorf("validation errors: %s", validationErrors)
-	}
 
 	return args, nil
 }