alpha: changed dns handling, self managed certs

Author: 23doors

go.mod

@@ -16,7 +16,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-20211207172419-7e917d12fa92
+	github.com/outblocks/outblocks-plugin-go v0.0.0-20211213135733-23547102ec07
 	github.com/pterm/pterm v0.12.33
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5

go.sum

@@ -686,8 +686,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-20211207172419-7e917d12fa92 h1:0AdUlXuACt65jL2vO2MBXM3r8XvOev7l96skx+X7tSY=
-github.com/outblocks/outblocks-plugin-go v0.0.0-20211207172419-7e917d12fa92/go.mod h1:YpdRDqsSy9b2WbUiTIv5aXcxr52Rw2WGrCzoFCj4B8Q=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20211213135733-23547102ec07 h1:6PwovmPdXNTQd2nc0/5Rzd3w2ahla2sohyrHMwgmZKU=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20211213135733-23547102ec07/go.mod h1:YpdRDqsSy9b2WbUiTIv5aXcxr52Rw2WGrCzoFCj4B8Q=
 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,10 +25,9 @@ import (
 const deployCommand = "deploy"
 
 type planParams struct {
-	appPlans  []*apiv1.AppPlan
-	depPlans  []*apiv1.DependencyPlan
-	args      map[string]interface{}
-	firstPass bool
+	appPlans []*apiv1.AppPlan
+	depPlans []*apiv1.DependencyPlan
+	args     map[string]interface{}
 }
 
 type Deploy struct {
@@ -99,10 +98,11 @@ func (d *Deploy) Run(ctx context.Context) error {
 		return nil
 	}
 
-	return d.showStateStatus(state.Apps, state.Dependencies)
+	return d.showStateStatus(state.Apps, state.Dependencies, state.DNSRecords)
 }
 
 func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.StateData, stateRes *apiv1.GetStateResponse_State) (canceled bool, err error) {
+	domains := d.cfg.DomainInfoProto()
 	stateBeforeStr, _ := json.Marshal(state)
 
 	// Plan and apply.
@@ -129,10 +129,10 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 	spinner, _ := d.log.Spinner().Start("Planning...")
 
 	// Proceed with plan - reset state apps and deps.
-	state.Apps = make(map[string]*apiv1.AppState)
-	state.Dependencies = make(map[string]*apiv1.DependencyState)
+	oldState := *state
+	state.Reset()
 
-	planRetMap, err := plan(ctx, state, planMap, verify, destroy)
+	planRetMap, err := plan(ctx, state, planMap, domains, verify, destroy)
 	if err != nil {
 		spinner.Stop()
 
@@ -141,11 +141,11 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 		return false, err
 	}
 
-	deployChanges, dnsChanges := computeChange(d.cfg, state, planRetMap)
+	deployChanges := computeChange(d.cfg, &oldState, state, planRetMap)
 
 	spinner.Stop()
 
-	empty, canceled := planPrompt(d.log, deployChanges, dnsChanges, d.opts.AutoApprove, d.opts.ForceApprove)
+	empty, canceled := planPrompt(d.log, deployChanges, nil, d.opts.AutoApprove, d.opts.ForceApprove)
 
 	shouldApply := !canceled && !empty
 
@@ -155,8 +155,8 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 
 	// Apply if needed.
 	if shouldApply {
-		callback := applyProgress(d.log, deployChanges, dnsChanges)
-		err = apply(context.Background(), state, planMap, destroy, callback)
+		callback := applyProgress(d.log, deployChanges, nil)
+		err = apply(context.Background(), state, planMap, domains, destroy, callback)
 	}
 
 	// Merge state with current apps/deps if needed (they might not have a state defined).
@@ -195,16 +195,11 @@ func (d *Deploy) planAndApply(ctx context.Context, verify bool, state *types.Sta
 	return canceled, err
 }
 
-type dnsSetup struct {
-	record string
-	dns    *apiv1.DNSState
-}
-
-func (d *Deploy) prepareAppDNSMap(appStates map[string]*apiv1.AppState) (map[string]*apiv1.DNSState, error) {
-	dnsMap := make(map[string]*apiv1.DNSState)
+func (d *Deploy) prepareAppSSLMap(appStates map[string]*apiv1.AppState) (map[string]*apiv1.DNSState, error) {
+	sslMap := make(map[string]*apiv1.DNSState)
 
 	for _, appState := range appStates {
-		if appState.Dns == nil || !appState.Dns.Manual || (appState.Dns.Cname == "" && appState.Dns.Ip == "") {
+		if appState.Dns == nil || appState.Dns.SslStatus == apiv1.DNSState_SSL_STATUS_UNSPECIFIED || (appState.Dns.Cname == "" && appState.Dns.Ip == "") {
 			continue
 		}
 
@@ -213,46 +208,38 @@ func (d *Deploy) prepareAppDNSMap(appStates map[string]*apiv1.AppState) (map[str
 			return nil, err
 		}
 
-		dnsMap[host] = appState.Dns
+		sslMap[host] = appState.Dns
 	}
 
-	return dnsMap, nil
+	return sslMap, nil
 }
 
-func (d *Deploy) showStateStatus(appStates map[string]*apiv1.AppState, dependencyStates map[string]*apiv1.DependencyState) error {
-	dnsMap, err := d.prepareAppDNSMap(appStates)
-	if err != nil {
-		return err
-	}
-
-	var dns []*dnsSetup
+func (d *Deploy) showStateStatus(appStates map[string]*apiv1.AppState, dependencyStates map[string]*apiv1.DependencyState, dnsRecords types.DNSRecordMap) error {
+	var dns []*apiv1.DNSRecord
 
-	for host, v := range dnsMap {
-		dns = append(dns, &dnsSetup{
-			record: host,
-			dns:    v,
-		})
+	for k, v := range dnsRecords {
+		if !v.Created {
+			dns = append(dns, &apiv1.DNSRecord{
+				Record: k.Record,
+				Type:   k.Type,
+				Value:  v.Value,
+			})
+		}
 	}
 
 	sort.Slice(dns, func(i, j int) bool {
-		return dns[i].record < dns[j].record
+		return dns[i].Record < dns[j].Record
 	})
 
-	// Show info about manual DNS setup.
+	// Show info about DNS records still requiring setup.
 	data := [][]string{
 		{"Record", "Type", "Value"},
 	}
 
 	for _, v := range dns {
-		typ := "A"
-		val := v.dns.Ip
-
-		if v.dns.Cname != "" {
-			typ = "CNAME"
-			val = v.dns.Cname
-		}
+		typ := v.Type.String()[len("TYPE_"):]
 
-		data = append(data, []string{pterm.Green(v.record), pterm.Yellow(typ), val})
+		data = append(data, []string{pterm.Green(v.Record), pterm.Yellow(typ), v.Value})
 	}
 
 	if len(dns) > 0 {
@@ -320,13 +307,16 @@ func (d *Deploy) showStateStatus(appStates map[string]*apiv1.AppState, dependenc
 	}
 
 	// Show info about SSL status.
-	if len(dnsMap) > 0 {
-		d.log.Section().Println("SSL Certificates")
+	sslMap, err := d.prepareAppSSLMap(appStates)
+	if err != nil {
+		return err
+	}
 
-		data := make([][]string, 0, len(dnsMap))
+	if len(sslMap) > 0 {
+		data := make([][]string, 0, len(sslMap))
 
-		for host, v := range dnsMap {
-			data = append(data, []string{pterm.Green(host), pterm.Yellow(v.SslStatus), v.SslStatusInfo})
+		for host, v := range sslMap {
+			data = append(data, []string{pterm.Green(host), pterm.Yellow(v.SslStatus.String()[len("SSL_STATUS_"):]), v.SslStatusInfo})
 		}
 
 		sort.Slice(data, func(i, j int) bool {
@@ -335,6 +325,7 @@ func (d *Deploy) showStateStatus(appStates map[string]*apiv1.AppState, dependenc
 
 		data = append([][]string{{"Domain", "Status", "Info"}}, data...)
 
+		d.log.Section().Println("SSL Certificates")
 		_ = d.log.Table().WithHasHeader().WithData(pterm.TableData(data)).Render()
 	}
 
@@ -394,8 +385,6 @@ func calculatePlanMap(cfg *config.Project, appStates []*apiv1.AppState, depState
 	planMap := make(map[*plugins.Plugin]*planParams)
 
 	for _, appState := range appStates {
-		includeDNS := appState.App.DnsPlugin != "" && appState.App.DnsPlugin == appState.App.DeployPlugin
-
 		deployPlugin := cfg.FindLoadedPlugin(appState.App.DeployPlugin)
 		if deployPlugin == nil {
 			return nil, fmt.Errorf("missing deploy plugin: %s used for app: %s", appState.App.DeployPlugin, appState.App.Name)
@@ -408,37 +397,10 @@ func calculatePlanMap(cfg *config.Project, appStates []*apiv1.AppState, depState
 		}
 
 		appReq := &apiv1.AppPlan{
-			State:    appState,
-			IsDeploy: true,
-			IsDns:    includeDNS,
+			State: appState,
 		}
 
 		planMap[deployPlugin].appPlans = append(planMap[deployPlugin].appPlans, appReq)
-		planMap[deployPlugin].firstPass = !includeDNS // if dns is handled by different plugin, plan this as a first pass
-
-		// Add DNS plugin if not already included (handled by same plugin).
-		if includeDNS || appState.App.DnsPlugin == "" {
-			continue
-		}
-
-		dnsPlugin := cfg.FindLoadedPlugin(appState.App.DnsPlugin)
-		if dnsPlugin == nil {
-			return nil, fmt.Errorf("missing dns plugin: %s used for app: %s", appState.App.DnsPlugin, appState.App.Name)
-		}
-
-		if _, ok := planMap[dnsPlugin]; !ok {
-			planMap[dnsPlugin] = &planParams{
-				args: dnsPlugin.CommandArgs(deployCommand),
-			}
-		}
-
-		appReq = &apiv1.AppPlan{
-			State:    appState,
-			IsDeploy: false,
-			IsDns:    true,
-		}
-
-		planMap[dnsPlugin].appPlans = append(planMap[dnsPlugin].appPlans, appReq)
 	}
 
 	// Process dependencies.
@@ -482,7 +444,7 @@ func addPlanTargetAndSkipApps(planMap map[*plugins.Plugin]*planParams, targetApp
 	return planMap
 }
 
-func mergeState(state *types.StateData, pluginName string, pluginState *apiv1.PluginState, appStates map[string]*apiv1.AppState, depStates map[string]*apiv1.DependencyState) {
+func mergeState(state *types.StateData, pluginName string, pluginState *apiv1.PluginState, appStates map[string]*apiv1.AppState, depStates map[string]*apiv1.DependencyState, dnsRecords []*apiv1.DNSRecord) {
 	state.Plugins[pluginName] = types.PluginStateFromProto(pluginState)
 
 	// Merge state with new changes.
@@ -493,9 +455,13 @@ func mergeState(state *types.StateData, pluginName string, pluginState *apiv1.Pl
 	for k, v := range depStates {
 		state.Dependencies[k] = v
 	}
+
+	for _, v := range dnsRecords {
+		state.AddDNSRecord(v)
+	}
 }
 
-func plan(ctx context.Context, state *types.StateData, planMap map[*plugins.Plugin]*planParams, verify, destroy bool) (retMap map[*plugins.Plugin]*apiv1.PlanResponse, err error) {
+func plan(ctx context.Context, state *types.StateData, planMap map[*plugins.Plugin]*planParams, domains []*apiv1.DomainInfo, verify, destroy bool) (retMap map[*plugins.Plugin]*apiv1.PlanResponse, err error) {
 	if state.Plugins == nil {
 		state.Plugins = make(map[string]*types.PluginState)
 	}
@@ -515,7 +481,7 @@ func plan(ctx context.Context, state *types.StateData, planMap map[*plugins.Plug
 		retMap[plug] = ret
 
 		// Merge state with new changes.
-		mergeState(state, plug.Name, ret.State, ret.AppStates, ret.DependencyStates)
+		mergeState(state, plug.Name, ret.State, ret.AppStates, ret.DependencyStates, ret.DnsRecords)
 
 		mu.Unlock()
 	}
@@ -526,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.appPlans, params.depPlans, params.args, verify, destroy)
+			ret, err := plug.Client().Plan(ctx, state, params.appPlans, params.depPlans, domains, params.args, verify, destroy)
 			if err != nil {
 				return err
 			}
@@ -539,15 +505,10 @@ func plan(ctx context.Context, state *types.StateData, planMap map[*plugins.Plug
 
 	err = g.Wait()
 
-	// Merge state with new changes.
-	for p, ret := range retMap {
-		mergeState(state, p.Name, ret.State, ret.AppStates, ret.DependencyStates)
-	}
-
 	return retMap, err
 }
 
-func apply(ctx context.Context, state *types.StateData, planMap map[*plugins.Plugin]*planParams, destroy bool, callback func(*apiv1.ApplyAction)) error {
+func apply(ctx context.Context, state *types.StateData, planMap map[*plugins.Plugin]*planParams, domains []*apiv1.DomainInfo, destroy bool, callback func(*apiv1.ApplyAction)) error {
 	g, _ := errgroup.WithConcurrency(ctx, defaultConcurrency)
 
 	if state.Plugins == nil {
@@ -564,45 +525,20 @@ func apply(ctx context.Context, state *types.StateData, planMap map[*plugins.Plu
 		mu.Lock()
 
 		// Merge state with new changes.
-		mergeState(state, plug.Name, ret.State, ret.AppStates, ret.DependencyStates)
+		mergeState(state, plug.Name, ret.State, ret.AppStates, ret.DependencyStates, ret.DnsRecords)
 
 		mu.Unlock()
 	}
 
-	// Apply first pass plan (deployments without DNS).
-	for plug, params := range planMap {
-		if !params.firstPass {
-			continue
-		}
-
-		g.Go(func() error {
-			ret, err := plug.Client().Apply(ctx, state, params.appPlans, params.depPlans, params.args, destroy, callback)
-			processResponse(plug, ret)
-
-			return err
-		})
-	}
-
-	err := g.Wait()
-	if err != nil {
-		return err
-	}
-
 	// Apply second pass plan (DNS and deployments with DNS).
 	for plug, params := range planMap {
-		if params.firstPass {
-			continue
-		}
-
 		g.Go(func() error {
-			ret, err := plug.Client().Apply(ctx, state, params.appPlans, params.depPlans, params.args, destroy, callback)
+			ret, err := plug.Client().Apply(ctx, state, params.appPlans, params.depPlans, domains, params.args, destroy, callback)
 			processResponse(plug, ret)
 
 			return err
 		})
 	}
 
-	err = g.Wait()
-
-	return err
+	return g.Wait()
 }

pkg/actions/util.go

@@ -128,18 +128,15 @@ func computeChangeInfo(cfg *config.Project, state *types.StateData, plugin *plug
 	return changes
 }
 
-func computeChange(cfg *config.Project, state *types.StateData, planMap map[*plugins.Plugin]*apiv1.PlanResponse) (deploy, dns []*change) {
-	for plugin, p := range planMap {
-		if p.Deploy != nil {
-			deploy = computeChangeInfo(cfg, state, plugin, p.Deploy.Actions)
-		}
+func computeChange(cfg *config.Project, oldState, state *types.StateData, planMap map[*plugins.Plugin]*apiv1.PlanResponse) []*change { // nolint:unparam
+	var changes []*change
 
-		if p.Dns != nil {
-			dns = computeChangeInfo(cfg, state, plugin, p.Deploy.Actions)
-		}
+	for plugin, p := range planMap {
+		chg := computeChangeInfo(cfg, state, plugin, p.Deploy.Actions)
+		changes = append(changes, chg...)
 	}
 
-	return deploy, dns
+	return changes
 }
 
 func calculateTotal(chg []*change) (add, change, process, destroy int) {
@@ -248,6 +245,7 @@ func planPrompt(log logger.Logger, deploy, dns []*change, approve, force bool) (
 	}
 
 	// DNS
+	// TODO: handle dns as a diff of records
 	dnsInfo, dnsCritical := planChangeInfo("DNS:", dns)
 	if dnsInfo != "" {
 		empty = false
@@ -275,7 +273,7 @@ func planPrompt(log logger.Logger, deploy, dns []*change, approve, force bool) (
 	}
 
 	if critical {
-		prompt.Message = "Some changes are potentially destructive. Are you really sure you want to perform these actions?"
+		prompt.Message = fmt.Sprintf("%s Some changes are potentially destructive! Are you really sure you want to perform these actions?", pterm.Red("Warning!"))
 	}
 
 	_ = survey.AskOne(prompt, &proceed)