Refactored nits

Signed-off-by: t-kikuc <[email protected]>

pkg/app/pipectl/cmd/initialize/ecs.go

@@ -70,7 +70,7 @@ func generateECSConfig(p prompt.Prompt) (*genericConfig, error) {
 		},
 	}
 
-	err := p.Run(inputs)
+	err := p.RunSlice(inputs)
 	if err != nil {
 		return nil, err
 	}

pkg/app/pipectl/cmd/initialize/ecs_test.go

@@ -27,6 +27,8 @@ import (
 )
 
 func TestGenerateECSConfig(t *testing.T) {
+	t.Parallel()
+
 	testcases := []struct {
 		name         string
 		inputs       string // mock for user's input
@@ -56,6 +58,7 @@ func TestGenerateECSConfig(t *testing.T) {
 	}
 
 	for _, tc := range testcases {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			reader := strings.NewReader(tc.inputs)
 			prompt := prompt.NewPrompt(reader)

pkg/app/pipectl/cmd/initialize/initialize.go

@@ -34,14 +34,9 @@ type command struct {
 	// Add flags if needed.
 }
 
-var (
-	platform   int
-	exportPath string
-)
-
 const (
-	platformKubernetes = 0
-	platformECS        = 1
+	platformKubernetes string = "0"
+	platformECS        string = "1"
 )
 
 // Use genericConfigs in order to simplify using the spec.
@@ -90,8 +85,14 @@ func (c *command) run(ctx context.Context, input cli.Input) error {
 }
 
 func generateConfig(ctx context.Context, input cli.Input, p prompt.Prompt) error {
+	// user's inputs
+	var (
+		platform   string
+		exportPath string
+	)
+
 	platformInput := prompt.Input{
-		Message:       fmt.Sprintf("Which platform? Enter the number [%d]Kubernetes [%d]ECS", platformKubernetes, platformECS),
+		Message:       fmt.Sprintf("Which platform? Enter the number [%s]Kubernetes [%s]ECS", platformKubernetes, platformECS),
 		TargetPointer: &platform,
 		Required:      true,
 	}
@@ -101,20 +102,19 @@ func generateConfig(ctx context.Context, input cli.Input, p prompt.Prompt) error
 		Required:      false,
 	}
 
-	err := p.Run([]prompt.Input{platformInput})
+	err := p.Run(platformInput)
 	if err != nil {
 		return fmt.Errorf("invalid platform number: %v", err)
 	}
 
 	var cfg *genericConfig
 	switch platform {
 	case platformKubernetes:
-		// cfg, err = generateKubernetesConfig(...)
 		panic("not implemented")
 	case platformECS:
 		cfg, err = generateECSConfig(p)
 	default:
-		return fmt.Errorf("invalid platform number: %d", platform)
+		return fmt.Errorf("invalid platform number: %s", platform)
 	}
 
 	if err != nil {
@@ -127,21 +127,30 @@ func generateConfig(ctx context.Context, input cli.Input, p prompt.Prompt) error
 	}
 
 	fmt.Println("### The config model was successfully prepared. Move on to exporting. ###")
-	err = p.RunOne(exportPathInput)
+	err = p.Run(exportPathInput)
 	if err != nil {
+		printConfig(cfgBytes)
 		return err
 	}
+	err = export(cfgBytes, exportPath)
+	if err != nil {
+		return nil
+	}
+
+	return nil
+}
+
+func export(cfgBytes []byte, exportPath string) error {
 	if len(exportPath) == 0 {
+		// if the path is not specified, print to stdout
 		printConfig(cfgBytes)
 		return nil
 	}
-	err = exporter.Export(cfgBytes, exportPath)
+	err := exporter.Export(cfgBytes, exportPath)
 	if err != nil {
-		// fmt.Printf("Failed to export to %s: %v\n", exportPath, err)
 		printConfig(cfgBytes)
 		return err
 	}
-
 	return nil
 }
 

pkg/app/pipectl/exporter/exporter.go

@@ -50,7 +50,7 @@ func askOverwrite() (overwrite bool, err error) {
 		Required:      false,
 	}
 	p := prompt.NewPrompt(os.Stdin)
-	err = p.RunOne(overwriteInput)
+	err = p.Run(overwriteInput)
 	if err != nil {
 		return false, err
 	}

pkg/app/pipectl/prompt/prompt.go

@@ -38,18 +38,18 @@ func NewPrompt(in io.Reader) Prompt {
 	}
 }
 
-// Run sequentially asks for inputs and set the values to the target pointers.
-func (prompt *Prompt) Run(inputs []Input) error {
+// RunSlice sequentially asks for inputs and set the values to the target pointers.
+func (prompt *Prompt) RunSlice(inputs []Input) error {
 	for _, in := range inputs {
-		if e := prompt.RunOne(in); e != nil {
+		if e := prompt.Run(in); e != nil {
 			return e
 		}
 	}
 	return nil
 }
 
-// RunOne asks for an input and set the value to the target pointer.
-func (prompt *Prompt) RunOne(input Input) error {
+// Run asks for an input and set the value to the target pointer.
+func (prompt *Prompt) Run(input Input) error {
 	fmt.Printf("%s: ", input.Message)
 	line, e := prompt.bufReader.ReadString('\n')
 	if e != nil {

pkg/app/pipectl/prompt/prompt_test.go

@@ -83,7 +83,7 @@ func TestRunString(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			strReader := strings.NewReader(tc.str)
 			p := NewPrompt(strReader)
-			err := p.RunOne(tc.in)
+			err := p.Run(tc.in)
 			assert.Equal(t, tc.expectedErr, err)
 			assert.Equal(t, tc.expectedValue, *tc.in.TargetPointer.(*string))
 		})
@@ -140,7 +140,7 @@ func TestRunStringSlice(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			strReader := strings.NewReader(tc.str)
 			p := NewPrompt(strReader)
-			err := p.RunOne(tc.in)
+			err := p.Run(tc.in)
 			assert.Equal(t, tc.expectedErr, err)
 			assert.Equal(t, tc.expectedValue, *tc.in.TargetPointer.(*[]string))
 		})
@@ -219,7 +219,7 @@ func TestRunInt(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			strReader := strings.NewReader(tc.str)
 			p := NewPrompt(strReader)
-			err := p.RunOne(tc.in)
+			err := p.Run(tc.in)
 			assert.Equal(t, tc.expectedErr, err)
 			assert.Equal(t, tc.expectedValue, *tc.in.TargetPointer.(*int))
 		})
@@ -320,7 +320,7 @@ func TestRunBool(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			strReader := strings.NewReader(tc.str)
 			p := NewPrompt(strReader)
-			err := p.RunOne(tc.in)
+			err := p.Run(tc.in)
 			assert.Equal(t, tc.expectedErr, err)
 			assert.Equal(t, tc.expectedValue, *tc.in.TargetPointer.(*bool))
 		})