alpha: add support for skip-dns and domains in state, re-add skip all apps

Author: 23doors

cmd/deploy.go

@@ -31,6 +31,10 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 				return merry.New("target-apps and skip-apps arguments are mutually exclusive modes")
 			}
 
+			if opts.SkipAllApps && opts.Destroy {
+				return merry.New("skip-all-apps and destroy are mutually exclusive modes")
+			}
+
 			for _, t := range targetApps {
 				tsplit := strings.SplitN(t, ".", 2)
 				if len(tsplit) != 2 {
@@ -40,13 +44,15 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 				opts.TargetApps = append(opts.TargetApps, config.ComputeAppID(tsplit[0], tsplit[1]))
 			}
 
-			for _, t := range skipApps {
-				tsplit := strings.SplitN(t, ".", 2)
-				if len(tsplit) != 2 {
-					return merry.Errorf("wrong format for skip '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
-				}
+			if !opts.SkipAllApps {
+				for _, t := range skipApps {
+					tsplit := strings.SplitN(t, ".", 2)
+					if len(tsplit) != 2 {
+						return merry.Errorf("wrong format for skip '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
+					}
 
-				opts.SkipApps = append(opts.SkipApps, config.ComputeAppID(tsplit[0], tsplit[1]))
+					opts.SkipApps = append(opts.SkipApps, config.ComputeAppID(tsplit[0], tsplit[1]))
+				}
 			}
 
 			if opts.Destroy {
@@ -67,6 +73,8 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 	f.BoolVar(&opts.ForceApprove, "force", false, "force approve even with critical changes")
 	f.StringSliceVarP(&targetApps, "target-apps", "t", nil, "target only specified apps, can specify multiple or separate values with comma in a form of <app type>.<name>, e.g.: static.website,service.api")
 	f.StringSliceVarP(&skipApps, "skip-apps", "s", nil, "skip specified apps (if they exist), can specify multiple or separate values with comma in a form of <app type>.<name>, e.g.: static.website,service.api")
+	f.BoolVar(&opts.SkipAllApps, "skip-all-apps", false, "skip all apps (if they exist)")
+	f.BoolVar(&opts.SkipDNS, "skip-dns", false, "skip DNS setup (including self managed certificates)")
 
 	return cmd
 }

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/otiai10/copy v1.7.0
-	github.com/outblocks/outblocks-plugin-go v0.0.0-20220114122950-1c90ed7fa3e7
+	github.com/outblocks/outblocks-plugin-go v0.0.0-20220117144659-320323566af7
 	github.com/pterm/pterm v0.12.33
 	github.com/r3labs/diff/v2 v2.14.5
 	github.com/spf13/cobra v1.3.0

go.sum

@@ -741,8 +741,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.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI=
 github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
-github.com/outblocks/outblocks-plugin-go v0.0.0-20220114122950-1c90ed7fa3e7 h1:vEb/7U8i+8wzPKnpuRmUtdto1COijVaVLKYMguAtg44=
-github.com/outblocks/outblocks-plugin-go v0.0.0-20220114122950-1c90ed7fa3e7/go.mod h1:MAxYiF/O+9jcmjHdDg0S0PUV5VLzVcYALlO8VWL+zd0=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20220117144659-320323566af7 h1:X//GgYp4zCean+ypS8eFEZyejqtVysLhS9gp8G72KW4=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20220117144659-320323566af7/go.mod h1:MAxYiF/O+9jcmjHdDg0S0PUV5VLzVcYALlO8VWL+zd0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

pkg/actions/deploy.go

@@ -53,6 +53,8 @@ type DeployOptions struct {
 	AutoApprove          bool
 	ForceApprove         bool
 	TargetApps, SkipApps []string
+	SkipAllApps          bool
+	SkipDNS              bool
 }
 
 func NewDeploy(log logger.Logger, cfg *config.Project, opts *DeployOptions) *Deploy {
@@ -92,7 +94,7 @@ func (d *Deploy) stateLockRun(ctx context.Context) error {
 
 	// Plan and apply.
 	stateBeforeStr, _ := json.Marshal(state)
-	empty, canceled, dur, _, err := d.planAndApply(ctx, verify, state, stateRes, nil)
+	empty, canceled, dur, _, err := d.planAndApply(ctx, verify, state, stateRes, nil, false)
 
 	// Proceed with saving.
 	stateAfterStr, _ := json.Marshal(state)
@@ -124,6 +126,10 @@ func (d *Deploy) stateLockRun(ctx context.Context) error {
 }
 
 func (d *Deploy) lockIDs(state *types.StateData, partialLock bool) []string {
+	if d.opts.SkipAllApps {
+		return nil
+	}
+
 	targetAppIDsMap := util.StringArrayToSet(d.opts.TargetApps)
 	skipAppIDsMap := util.StringArrayToSet(d.opts.SkipApps)
 	lockIDsMap := make(map[string]struct{})
@@ -247,7 +253,7 @@ func (d *Deploy) multilockRun(ctx context.Context) error { // nolint:gocyclo
 		// Plan and apply.
 		stateBefore = state.DeepCopy()
 
-		empty, canceled, dur, missingLocks, err = d.planAndApply(ctx, verify, state, stateRes, acquiredLocks)
+		empty, canceled, dur, missingLocks, err = d.planAndApply(ctx, verify, state, stateRes, acquiredLocks, true)
 		if err != nil {
 			_ = statePlugin.Client().ReleaseLocks(ctx, d.cfg.State.Other, acquiredLocks)
 			return err
@@ -331,16 +337,22 @@ func (d *Deploy) Run(ctx context.Context) error {
 	return d.stateLockRun(ctx)
 }
 
-func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.StateData, stateRes *apiv1.GetStateResponse_State, acquiredLocks map[string]string) (canceled, empty bool, dur time.Duration, missingLocks []string, err error) {
-	domains := d.cfg.DomainInfoProto()
+func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.StateData, stateRes *apiv1.GetStateResponse_State, acquiredLocks map[string]string, checkLocks bool) (canceled, empty bool, dur time.Duration, missingLocks []string, err error) {
+	var domains []*apiv1.DomainInfo
+
+	if d.opts.SkipDNS {
+		domains = state.DomainsInfo
+	} else {
+		domains = d.cfg.DomainInfoProto()
+	}
 
 	// Plan and apply.
-	appStates, skipAppIDs, destroy, err := filterApps(d.cfg, state, d.opts.TargetApps, d.opts.SkipApps, d.opts.Destroy)
+	appStates, skipAppIDs, destroy, err := filterApps(d.cfg, state, d.opts.TargetApps, d.opts.SkipApps, d.opts.SkipAllApps, d.opts.Destroy)
 	if err != nil {
 		return false, false, dur, nil, err
 	}
 
-	depStates := filterDependencies(d.cfg, state, d.opts.TargetApps, d.opts.SkipApps)
+	depStates := filterDependencies(d.cfg, state, d.opts.TargetApps, d.opts.SkipApps, d.opts.SkipAllApps)
 
 	planMap, err := calculatePlanMap(d.cfg, appStates, depStates, d.opts.TargetApps, skipAppIDs)
 	if err != nil {
@@ -374,7 +386,7 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 
 	spinner.Stop()
 
-	if acquiredLocks != nil {
+	if checkLocks {
 		var missingLocks []string
 
 		for _, chg := range deployChanges {
@@ -426,6 +438,8 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 		state.Dependencies[depState.Dependency.Id] = &apiv1.DependencyState{Dependency: depState.Dependency}
 	}
 
+	state.DomainsInfo = domains
+
 	return empty, canceled, time.Since(start), nil, err
 }
 

pkg/actions/deploy_filter.go

@@ -70,7 +70,19 @@ func filterAppsDestroy(state *types.StateData, targetAppIDsMap, skipAppIDsMap ma
 	return appsMap, skipAppIDs
 }
 
-func filterApps(cfg *config.Project, state *types.StateData, targetAppIDs, skipAppIDs []string, destroy bool) (apps []*apiv1.AppState, retSkipAppIDs []string, retDestroy bool, err error) {
+func filterApps(cfg *config.Project, state *types.StateData, targetAppIDs, skipAppIDs []string, skipAllApps, destroy bool) (apps []*apiv1.AppState, retSkipAppIDs []string, retDestroy bool, err error) {
+	if skipAllApps {
+		retSkipAppIDs := make([]string, 0, len(state.Apps))
+		apps = make([]*apiv1.AppState, 0, len(state.Apps))
+
+		for _, appState := range state.Apps {
+			apps = append(apps, appState)
+			retSkipAppIDs = append(retSkipAppIDs, appState.App.Id)
+		}
+
+		return apps, retSkipAppIDs, destroy, nil
+	}
+
 	// In non target and non skip mode, use config apps and deps.
 	if len(skipAppIDs) == 0 && len(targetAppIDs) == 0 {
 		apps = make([]*apiv1.AppState, 0, len(cfg.Apps))
@@ -125,7 +137,16 @@ func filterApps(cfg *config.Project, state *types.StateData, targetAppIDs, skipA
 	return apps, skipAppIDs, false, err
 }
 
-func filterDependencies(cfg *config.Project, state *types.StateData, targetAppIDs, skipAppIDs []string) (deps []*apiv1.DependencyState) {
+func filterDependencies(cfg *config.Project, state *types.StateData, targetAppIDs, skipAppIDs []string, skipAllApps bool) (deps []*apiv1.DependencyState) {
+	if skipAllApps {
+		deps = make([]*apiv1.DependencyState, 0, len(state.Dependencies))
+		for _, dep := range state.Dependencies {
+			deps = append(deps, dep)
+		}
+
+		return deps
+	}
+
 	// In non target and non skip mode, use config apps and deps.
 	if len(skipAppIDs) == 0 && len(targetAppIDs) == 0 {
 		deps = make([]*apiv1.DependencyState, 0, len(cfg.Dependencies))

pkg/actions/deploy_state.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"reflect"
 	"sort"
+	"strings"
 
 	"github.com/ansel1/merry/v2"
 	apiv1 "github.com/outblocks/outblocks-plugin-go/gen/api/v1"
@@ -19,6 +20,7 @@ type stateDiff struct {
 	dnsRecords      diff.Changelog
 	pluginsRegistry diff.Changelog
 	pluginsState    diff.Changelog
+	domainsInfo     diff.Changelog
 }
 
 func (s *stateDiff) IsEmpty() bool {
@@ -44,9 +46,24 @@ func (s *stateDiff) Apply(state *types.StateData) error {
 		return merry.New("error applying patch on state.dependencies")
 	}
 
+	// Domains info.
+	domainsInfo := domainsInfoAsMap(state.DomainsInfo)
+
+	ret = diff.Patch(s.domainsInfo, &domainsInfo)
+	if ret.HasErrors() {
+		return merry.New("error applying patch on state.domainsinfo")
+	}
+
+	state.DomainsInfo = make([]*apiv1.DomainInfo, 0, len(domainsInfo))
+
+	for _, d := range domainsInfo {
+		state.DomainsInfo = append(state.DomainsInfo, d)
+	}
+
+	// DNS Records.
 	dnsRecords := dnsRecordsAsMap(state.DNSRecords)
 
-	ret = diff.Patch(s.dnsRecords, dnsRecords)
+	ret = diff.Patch(s.dnsRecords, &dnsRecords)
 	if ret.HasErrors() {
 		return merry.New("error applying patch on state.dnsrecords")
 	}
@@ -57,6 +74,7 @@ func (s *stateDiff) Apply(state *types.StateData) error {
 		state.DNSRecords[rec.Key] = rec.Val
 	}
 
+	// Plugin state.
 	if state.Plugins == nil {
 		state.Plugins = make(map[string]*types.PluginState)
 	}
@@ -118,6 +136,10 @@ func (s *stateDiff) String() string {
 		out += fmt.Sprintf("DNS = %s\n", formatIndentedJSON(s.dnsRecords))
 	}
 
+	if len(s.domainsInfo) != 0 {
+		out += fmt.Sprintf("DomainsInfo = %s\n", formatIndentedJSON(s.domainsInfo))
+	}
+
 	if len(s.pluginsRegistry) != 0 {
 		out += fmt.Sprintf("Registry = %s\n", formatIndentedJSON(s.pluginsRegistry))
 	}
@@ -152,6 +174,16 @@ func pluginsRegistryAsMap(plugins map[string]*types.PluginState) (map[string]map
 	return pluginRegistry, nil
 }
 
+func domainsInfoAsMap(domains []*apiv1.DomainInfo) map[string]*apiv1.DomainInfo {
+	m := make(map[string]*apiv1.DomainInfo, len(domains))
+
+	for _, d := range domains {
+		m[strings.Join(d.Domains, ";")] = d
+	}
+
+	return m
+}
+
 type dnsRecordValue struct {
 	Val types.DNSRecordValue
 	Key types.DNSRecordKey
@@ -206,6 +238,14 @@ func computeStateDiff(state1, state2 *types.StateData) (*stateDiff, error) {
 		return nil, err
 	}
 
+	state1DomainsInfo := domainsInfoAsMap(state1.DomainsInfo)
+	state2DomainsInfo := domainsInfoAsMap(state2.DomainsInfo)
+
+	domainsInfo, err := computeDiff(state1DomainsInfo, state2DomainsInfo)
+	if err != nil {
+		return nil, err
+	}
+
 	state1PluginRegistry, err := pluginsRegistryAsMap(state1.Plugins)
 	if err != nil {
 		return nil, err
@@ -233,6 +273,7 @@ func computeStateDiff(state1, state2 *types.StateData) (*stateDiff, error) {
 		apps:            apps,
 		deps:            deps,
 		dnsRecords:      dnsRecords,
+		domainsInfo:     domainsInfo,
 		pluginsRegistry: pluginsRegistry,
 		pluginsState:    pluginsState,
 	}, nil

pkg/config/dns.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strings"
 
 	"github.com/outblocks/outblocks-cli/pkg/plugins"
@@ -43,11 +44,15 @@ func (s *DNS) Match(d string) bool {
 }
 
 func (s *DNS) Normalize(i int, cfg *Project) error {
-	s.Domains = append(s.Domains, s.Domain)
-	for i, v := range s.Domains {
-		s.Domains[i] = strings.ToLower(v)
+	if s.Domain != "" {
+		s.Domains = append(s.Domains, s.Domain)
+		for i, v := range s.Domains {
+			s.Domains[i] = strings.ToLower(v)
+		}
 	}
 
+	sort.Strings(s.Domains)
+
 	if len(s.Domains) == 0 {
 		return cfg.yamlError(fmt.Sprintf("$.dns[%d]", i), "at least one domain has to be specified")
 	}