alpha: simplify resource skipping

Author: 23doors

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/otiai10/copy v1.6.0
-	github.com/outblocks/outblocks-plugin-go v0.0.0-20211106144905-90f0e0506308
+	github.com/outblocks/outblocks-plugin-go v0.0.0-20211106234251-c71bad7aa25c
 	github.com/pterm/pterm v0.12.33
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5

go.sum

@@ -681,8 +681,8 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
 github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=
 github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
-github.com/outblocks/outblocks-plugin-go v0.0.0-20211106144905-90f0e0506308 h1:UW2KpHVY34EmPCuY0z1NvOmkEAooIWzqKiS6B1ML654=
-github.com/outblocks/outblocks-plugin-go v0.0.0-20211106144905-90f0e0506308/go.mod h1:xosanOIc+3GlRA9b90/xRoYWzRgdhbew9T7+yTeI/TQ=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20211106234251-c71bad7aa25c h1:fRasRVoXHmFLlcagcE/6SHQM8lcaf5t96gphICbvBKw=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20211106234251-c71bad7aa25c/go.mod h1:xosanOIc+3GlRA9b90/xRoYWzRgdhbew9T7+yTeI/TQ=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=

pkg/actions/deploy.go

@@ -25,11 +25,10 @@ import (
 const deployCommand = "deploy"
 
 type planParams struct {
-	apps                 []*types.AppPlan
-	deps                 []*types.DependencyPlan
-	targetApps, skipApps []string
-	args                 map[string]interface{}
-	firstPass            bool
+	apps      []*types.AppPlan
+	deps      []*types.DependencyPlan
+	args      map[string]interface{}
+	firstPass bool
 }
 
 type Deploy struct {
@@ -468,12 +467,9 @@ func addPlanTargetAndSkipApps(planMap map[*plugins.Plugin]*planParams, targetApp
 
 	for _, planParam := range planMap {
 		for _, app := range planParam.apps {
-			if targetAppIDsMap[app.App.ID] {
-				planParam.targetApps = append(planParam.targetApps, app.App.ID)
-			}
+			if skipAppIDsMap[app.App.ID] || (len(targetAppIDsMap) > 0 && !targetAppIDsMap[app.App.ID]) {
+				app.Skip = true
 
-			if skipAppIDsMap[app.App.ID] {
-				planParam.skipApps = append(planParam.skipApps, app.App.ID)
 			}
 		}
 	}
@@ -496,7 +492,7 @@ func plan(ctx context.Context, state *types.StateData, planMap map[*plugins.Plug
 		params := params
 
 		g.Go(func() error {
-			ret, err := plug.Client().Plan(ctx, state, params.apps, params.deps, params.targetApps, params.skipApps, params.args, verify, destroy)
+			ret, err := plug.Client().Plan(ctx, state, params.apps, params.deps, params.args, verify, destroy)
 			if err != nil {
 				return err
 			}
@@ -568,7 +564,7 @@ func apply(ctx context.Context, state *types.StateData, planMap map[*plugins.Plu
 		}
 
 		g.Go(func() error {
-			ret, err := plug.Client().Apply(ctx, state, params.apps, params.deps, params.targetApps, params.skipApps, params.args, destroy, callback)
+			ret, err := plug.Client().Apply(ctx, state, params.apps, params.deps, params.args, destroy, callback)
 			processResponse(plug, ret)
 
 			return err
@@ -589,7 +585,7 @@ func apply(ctx context.Context, state *types.StateData, planMap map[*plugins.Plu
 		}
 
 		g.Go(func() error {
-			ret, err := plug.Client().Apply(ctx, state, params.apps, params.deps, params.targetApps, params.skipApps, params.args, destroy, callback)
+			ret, err := plug.Client().Apply(ctx, state, params.apps, params.deps, params.args, destroy, callback)
 			processResponse(plug, ret)
 
 			return err

pkg/plugins/client/apply.go

@@ -7,13 +7,11 @@ import (
 	"github.com/outblocks/outblocks-plugin-go/types"
 )
 
-func (c *Client) Apply(ctx context.Context, state *types.StateData, apps []*types.AppPlan, deps []*types.DependencyPlan, targetApps, skipApps []string, args map[string]interface{}, destroy bool, callback func(*types.ApplyAction)) (ret *plugin_go.ApplyDoneResponse, err error) {
+func (c *Client) Apply(ctx context.Context, state *types.StateData, apps []*types.AppPlan, deps []*types.DependencyPlan, args map[string]interface{}, destroy bool, callback func(*types.ApplyAction)) (ret *plugin_go.ApplyDoneResponse, err error) {
 	stream, err := c.lazyStartBiDi(ctx, &plugin_go.ApplyRequest{
 		DeployBaseRequest: plugin_go.DeployBaseRequest{
 			Apps:         apps,
 			Dependencies: deps,
-			TargetApps:   targetApps,
-			SkipApps:     skipApps,
 			Args:         args,
 
 			StateMap: state.PluginsMap[c.name],

pkg/plugins/client/plan.go

@@ -8,13 +8,11 @@ import (
 	"github.com/outblocks/outblocks-plugin-go/types"
 )
 
-func (c *Client) Plan(ctx context.Context, state *types.StateData, apps []*types.AppPlan, deps []*types.DependencyPlan, targetApps, skipApps []string, args map[string]interface{}, verify, destroy bool) (ret *plugin_go.PlanResponse, err error) {
+func (c *Client) Plan(ctx context.Context, state *types.StateData, apps []*types.AppPlan, deps []*types.DependencyPlan, args map[string]interface{}, verify, destroy bool) (ret *plugin_go.PlanResponse, err error) {
 	err = c.lazySendReceive(ctx, &plugin_go.PlanRequest{
 		DeployBaseRequest: plugin_go.DeployBaseRequest{
 			Apps:         apps,
 			Dependencies: deps,
-			TargetApps:   targetApps,
-			SkipApps:     skipApps,
 			Args:         args,
 
 			StateMap: state.PluginsMap[c.name],