Pass inputs to action

ohkrab · Dec 21, 2021 · ac7c881 · ac7c881
1 parent 484435a
commit ac7c881
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 29 deletions.
diff --git a/krab/action_migrate_down.go b/krab/action_migrate_down.go
@@ -62,9 +62,8 @@ func (a *ActionMigrateDown) Run(args []string) int {
 	cmd := &CmdMigrateDown{
 		Set:        a.Set,
 		Connection: a.Connection,
-		Inputs:     flags.Values(),
 	}
-	resp, err := cmd.Do(context.Background(), CmdOpts{})
+	resp, err := cmd.Do(context.Background(), CmdOpts{Inputs: flags.Values()})
 	result := resp.([]ResponseMigrateDown)
 
 	if err != nil {

diff --git a/krab/action_migrate_status.go b/krab/action_migrate_status.go
@@ -51,9 +51,8 @@ func (a *ActionMigrateStatus) Run(args []string) int {
 	cmd := &CmdMigrateStatus{
 		Set:        a.Set,
 		Connection: a.Connection,
-		Inputs:     flags.Values(),
 	}
-	resp, err := cmd.Do(context.Background(), CmdOpts{})
+	resp, err := cmd.Do(context.Background(), CmdOpts{Inputs: flags.Values()})
 
 	if err != nil {
 		ui.Error(err.Error())

diff --git a/krab/action_migrate_up.go b/krab/action_migrate_up.go
@@ -55,9 +55,8 @@ func (a *ActionMigrateUp) Run(args []string) int {
 	cmd := &CmdMigrateUp{
 		Set:        a.Set,
 		Connection: a.Connection,
-		Inputs:     flags.Values(),
 	}
-	resp, err := cmd.Do(context.Background(), CmdOpts{})
+	resp, err := cmd.Do(context.Background(), CmdOpts{Inputs: flags.Values()})
 	result := resp.([]ResponseMigrateUp)
 
 	if len(result) > 0 {

diff --git a/krab/cmd.go b/krab/cmd.go
@@ -17,4 +17,6 @@ type Cmd interface {
 }
 
 // CmdOpts are options passed to command.
-type CmdOpts struct{}
+type CmdOpts struct {
+	Inputs
+}
diff --git a/krab/cmd_migrate_down.go b/krab/cmd_migrate_down.go
@@ -15,7 +15,6 @@ import (
 type CmdMigrateDown struct {
 	Set        *MigrationSet
 	Connection krabdb.Connection
-	Inputs
 }
 
 // ResponseMigrateDown json
@@ -43,48 +42,48 @@ func (c *CmdMigrateDown) HttpMethod() string { return http.MethodPost }
 
 func (c *CmdMigrateDown) Do(ctx context.Context, o CmdOpts) (interface{}, error) {
 	for _, arg := range c.Set.Arguments.Args {
-		_, ok := c.Inputs[arg.Name]
+		_, ok := o.Inputs[arg.Name]
 		if !ok {
 			return nil, fmt.Errorf("Command is missing an input for argument `%s`", arg.Name)
 		}
 	}
 	// default arguments always take precedence over custom ones
 	for _, arg := range c.Arguments().Args {
-		_, ok := c.Inputs[arg.Name]
+		_, ok := o.Inputs[arg.Name]
 		if !ok {
 			return nil, fmt.Errorf("Command is missing an input for argument `%s`", arg.Name)
 		}
 	}
 
-	err := c.Set.Arguments.Validate(c.Inputs)
+	err := c.Set.Arguments.Validate(o.Inputs)
 	if err != nil {
 		return nil, err
 	}
-	err = c.Arguments().Validate(c.Inputs)
+	err = c.Arguments().Validate(o.Inputs)
 	if err != nil {
 		return nil, err
 	}
 
 	var result []ResponseMigrateDown
 	err = c.Connection.Get(func(db krabdb.DB) error {
-		resp, err := c.run(ctx, db)
+		resp, err := c.run(ctx, db, o.Inputs)
 		result = resp
 		return err
 	})
 
 	return result, err
 }
 
-func (c *CmdMigrateDown) run(ctx context.Context, db krabdb.DB) ([]ResponseMigrateDown, error) {
+func (c *CmdMigrateDown) run(ctx context.Context, db krabdb.DB, inputs Inputs) ([]ResponseMigrateDown, error) {
 	result := []ResponseMigrateDown{}
 
-	tpl := tpls.New(c.Inputs, krabtpl.Functions)
+	tpl := tpls.New(inputs, krabtpl.Functions)
 	versions := NewSchemaMigrationTable(tpl.Render(c.Set.Schema))
 
-	migration := c.Set.FindMigrationByVersion(c.Inputs["version"].(string))
+	migration := c.Set.FindMigrationByVersion(inputs["version"].(string))
 	if migration == nil {
 		return nil, fmt.Errorf("Migration `%s` not found in `%s` set",
-			c.Inputs["version"].(string),
+			inputs["version"].(string),
 			c.Set.RefName)
 	}
 	lockID := int64(1)

diff --git a/krab/cmd_migrate_status.go b/krab/cmd_migrate_status.go
@@ -16,7 +16,6 @@ import (
 type CmdMigrateStatus struct {
 	Set        *MigrationSet
 	Connection krabdb.Connection
-	Inputs
 }
 
 // ResponseMigrateStatus json
@@ -32,30 +31,30 @@ func (c *CmdMigrateStatus) HttpMethod() string { return http.MethodGet }
 
 func (c *CmdMigrateStatus) Do(ctx context.Context, o CmdOpts) (interface{}, error) {
 	for _, arg := range c.Set.Arguments.Args {
-		_, ok := c.Inputs[arg.Name]
+		_, ok := o.Inputs[arg.Name]
 		if !ok {
 			return nil, fmt.Errorf("Command is missing an input for argument `%s`", arg.Name)
 		}
 	}
-	err := c.Set.Arguments.Validate(c.Inputs)
+	err := c.Set.Arguments.Validate(o.Inputs)
 	if err != nil {
 		return nil, err
 	}
 
 	var result []ResponseMigrateStatus
 	err = c.Connection.Get(func(db krabdb.DB) error {
-		resp, err := c.run(ctx, db)
+		resp, err := c.run(ctx, db, o.Inputs)
 		result = resp
 		return err
 	})
 
 	return result, err
 }
 
-func (c *CmdMigrateStatus) run(ctx context.Context, db krabdb.DB) ([]ResponseMigrateStatus, error) {
+func (c *CmdMigrateStatus) run(ctx context.Context, db krabdb.DB, inputs Inputs) ([]ResponseMigrateStatus, error) {
 	result := []ResponseMigrateStatus{}
 
-	tpl := tpls.New(c.Inputs, krabtpl.Functions)
+	tpl := tpls.New(inputs, krabtpl.Functions)
 	versions := NewSchemaMigrationTable(tpl.Render(c.Set.Schema))
 
 	hooksRunner := HookRunner{}

diff --git a/krab/cmd_migrate_up.go b/krab/cmd_migrate_up.go
@@ -15,7 +15,6 @@ import (
 type CmdMigrateUp struct {
 	Set        *MigrationSet
 	Connection krabdb.Connection
-	Inputs
 }
 
 // ResponseMigrateUp json
@@ -31,31 +30,31 @@ func (c *CmdMigrateUp) HttpMethod() string { return http.MethodPost }
 
 func (c *CmdMigrateUp) Do(ctx context.Context, o CmdOpts) (interface{}, error) {
 	for _, arg := range c.Set.Arguments.Args {
-		_, ok := c.Inputs[arg.Name]
+		_, ok := o.Inputs[arg.Name]
 		if !ok {
 			return nil, fmt.Errorf("Command is missing an input for argument `%s`", arg.Name)
 		}
 	}
 
-	err := c.Set.Arguments.Validate(c.Inputs)
+	err := c.Set.Arguments.Validate(o.Inputs)
 	if err != nil {
 		return nil, err
 	}
 
 	var result []ResponseMigrateUp
 	err = c.Connection.Get(func(db krabdb.DB) error {
-		resp, err := c.run(ctx, db)
+		resp, err := c.run(ctx, db, o.Inputs)
 		result = resp
 		return err
 	})
 
 	return result, err
 }
 
-func (c *CmdMigrateUp) run(ctx context.Context, db krabdb.DB) ([]ResponseMigrateUp, error) {
+func (c *CmdMigrateUp) run(ctx context.Context, db krabdb.DB, inputs Inputs) ([]ResponseMigrateUp, error) {
 	result := []ResponseMigrateUp{}
 
-	tpl := tpls.New(c.Inputs, krabtpl.Functions)
+	tpl := tpls.New(inputs, krabtpl.Functions)
 	versions := NewSchemaMigrationTable(tpl.Render(c.Set.Schema))
 
 	// locking