Add and delete node command for automate HA

components/automate-cli/cmd/chef-automate/automateHADeployExistingInfra.go

@@ -240,14 +240,6 @@ func extractIPsFromCertsByIP(certsByIp []CertByIP) []string {
 	return ips
 }
 
-func extractIPsFromCertsByIPOpensearch(certsByIp []CertByIP) []string {
-	ips := []string{}
-	for _, el := range certsByIp {
-		ips = append(ips, el.IP)
-	}
-	return ips
-}
-
 func (e *existingInfra) validateCerts() *list.List {
 
 	errorList := list.New()
@@ -338,7 +330,7 @@ func (e *existingInfra) validateCerts() *list.List {
 				len(strings.TrimSpace(e.config.Opensearch.Config.AdminCert)) < 1 {
 				errorList.PushBack("Opensearch root_ca, admin_key or admin_cert is missing. Set custom_certs_enabled to false to continue without custom certificates.")
 			}
-			if !stringutils.SubSlice(e.config.ExistingInfra.Config.OpensearchPrivateIps, extractIPsFromCertsByIPOpensearch(e.config.Opensearch.Config.CertsByIP)) {
+			if !stringutils.SubSlice(e.config.ExistingInfra.Config.OpensearchPrivateIps, extractIPsFromCertsByIP(e.config.Opensearch.Config.CertsByIP)) {
 				errorList.PushBack("Missing certificates for some Opensearch private ips. Please make sure certificates for the following ips are provided in certs_by_ip: " + strings.Join(e.config.ExistingInfra.Config.OpensearchPrivateIps, ", "))
 			}
 			// check if all the certs are valid for given IPs

components/automate-cli/cmd/chef-automate/ha_node_add.go

@@ -0,0 +1,313 @@
+package main
+
+import (
+	"container/list"
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"errors"
+
+	"github.com/chef/automate/components/automate-cli/pkg/status"
+	cli "github.com/chef/automate/components/automate-deployment/pkg/cli"
+	"github.com/chef/automate/lib/io/fileutils"
+	"github.com/chef/automate/lib/stringutils"
+	ptoml "github.com/pelletier/go-toml"
+	"github.com/spf13/cobra"
+)
+
+const (
+	TYPE_ERROR = `Cannot %s OpenSearch or Postgresql nodes if external.database.type is either aws or self-managed.
+Please set external.database.type to empty if you want to add OpenSearch or Postgresql nodes`
+	TYPE_AWS          = "aws"
+	TYPE_SELF_MANAGED = "self-managed"
+)
+
+type AddDeleteNodeHACmdFlags struct {
+	automateIp   string
+	chefServerIp string
+	opensearchIp string
+	postgresqlIp string
+	autoAccept   bool
+}
+
+var nodeCmd = &cobra.Command{
+	Use:    "node COMMAND",
+	Short:  "This command is used to add or delete HA nodes",
+	Hidden: false,
+}
+
+func addNodeHACmd() *cobra.Command {
+	var addDeleteNodeHACmdFlags = AddDeleteNodeHACmdFlags{}
+	var addNodeHACmd = &cobra.Command{
+		Use:   "add",
+		Short: "Add new node in HA",
+		Long:  `Add new node in HA`,
+		RunE:  runAddNodeHACmd(&addDeleteNodeHACmdFlags),
+	}
+	addNodeHACmd.PersistentFlags().StringVarP(&addDeleteNodeHACmdFlags.automateIp, "automate", "a", "", "new automate ip addresses")
+	addNodeHACmd.PersistentFlags().StringVarP(&addDeleteNodeHACmdFlags.chefServerIp, "chef-server", "c", "", "new chef-server ip addresses")
+	addNodeHACmd.PersistentFlags().StringVarP(&addDeleteNodeHACmdFlags.opensearchIp, "opensearch", "o", "", "new opensearch ip addresses")
+	addNodeHACmd.PersistentFlags().StringVarP(&addDeleteNodeHACmdFlags.postgresqlIp, "postgresql", "p", "", "new postgres ip addresses")
+	addNodeHACmd.PersistentFlags().BoolVarP(&addDeleteNodeHACmdFlags.autoAccept, "auto-accept", "y", false, "auto-accept")
+
+	return addNodeHACmd
+}
+
+func runAddNodeHACmd(addDeleteNodeHACmdFlags *AddDeleteNodeHACmdFlags) func(c *cobra.Command, args []string) error {
+	return func(c *cobra.Command, args []string) error {
+		sshconfig := &SSHConfig{}
+		nodeAdder := NewAddNode(writer, *addDeleteNodeHACmdFlags, NewNodeUtils(), initConfigHabA2HAPathFlag.a2haDirPath, &fileutils.FileSystemUtils{}, NewSSHUtil(sshconfig))
+		return nodeAdder.Execute(c, args)
+	}
+}
+
+type AddNodeImpl struct {
+	config                  ExistingInfraConfigToml
+	copyConfigForUserPrompt ExistingInfraConfigToml
+	automateIpList          []string
+	chefServerIpList        []string
+	opensearchIpList        []string
+	postgresqlIp            []string
+	nodeUtils               NodeOpUtils
+	flags                   AddDeleteNodeHACmdFlags
+	configpath              string
+	terraformPath           string
+	writer                  *cli.Writer
+	fileutils               fileutils.FileUtils
+	sshUtil                 SSHUtil
+}
+
+func NewAddNode(writer *cli.Writer, flags AddDeleteNodeHACmdFlags, nodeUtils NodeOpUtils, haDirPath string, fileUtils fileutils.FileUtils, sshUtil SSHUtil) HAModifyAndDeploy {
+	return &AddNodeImpl{
+		flags:         flags,
+		writer:        writer,
+		nodeUtils:     nodeUtils,
+		configpath:    filepath.Join(haDirPath, "config.toml"),
+		terraformPath: filepath.Join(haDirPath, "terraform"),
+		fileutils:     fileUtils,
+		sshUtil:       sshUtil,
+	}
+}
+
+func (ani *AddNodeImpl) Execute(c *cobra.Command, args []string) error {
+	if !ani.nodeUtils.isA2HARBFileExist() {
+		return errors.New(AUTOMATE_HA_INVALID_BASTION)
+	}
+	if ani.flags.automateIp == "" &&
+		ani.flags.chefServerIp == "" &&
+		ani.flags.opensearchIp == "" &&
+		ani.flags.postgresqlIp == "" {
+		c.Help()
+		return status.New(status.InvalidCommandArgsError, "Please provide service name and ip address of the node which you want to add")
+	}
+	configFilePath := filepath.Join(ani.configpath)
+	if !ani.nodeUtils.checkIfFileExist(configFilePath) {
+		return status.New(status.FileAccessError, fmt.Sprintf("%s file not found.", configFilePath))
+	}
+	// check deployment type AWS or ExistingInfra
+	deployerType, err := ani.nodeUtils.getModeFromConfig(configFilePath)
+	if err != nil {
+		return err
+	}
+	if deployerType == EXISTING_INFRA_MODE {
+		err = ani.validate()
+		if err != nil {
+			return err
+		}
+		err = ani.modifyConfig()
+		if err != nil {
+			return err
+		}
+		if !ani.flags.autoAccept {
+			res, err := ani.promptUserConfirmation()
+			if err != nil {
+				return err
+			}
+			if !res {
+				return nil
+			}
+		}
+		ani.prepare()
+		err = ani.runDeploy()
+		if err != nil {
+			return err
+		}
+	} else {
+		return errors.New(fmt.Sprintf("Failed to get deployment type. Please check %s", configFilePath))
+	}
+	return nil
+}
+
+func (ani *AddNodeImpl) prepare() error {
+	return ani.nodeUtils.taintTerraform(ani.terraformPath)
+}
+
+func (ani *AddNodeImpl) validate() error {
+	var err error
+	ani.config, err = ani.nodeUtils.readConfig(ani.configpath)
+	if err != nil {
+		return err
+	}
+	ani.copyConfigForUserPrompt = ani.config
+	ani.automateIpList, ani.chefServerIpList, ani.opensearchIpList, ani.postgresqlIp = splitIPCSV(
+		ani.flags.automateIp,
+		ani.flags.chefServerIp,
+		ani.flags.opensearchIp,
+		ani.flags.postgresqlIp,
+	)
+	if ani.config.ExternalDB.Database.Type == TYPE_AWS || ani.config.ExternalDB.Database.Type == TYPE_SELF_MANAGED {
+		if len(ani.opensearchIpList) > 0 || len(ani.postgresqlIp) > 0 {
+			return status.New(status.ConfigError, fmt.Sprintf(TYPE_ERROR, "add"))
+		}
+	}
+	errorList := ani.validateCmdArgs(ani.automateIpList, ani.chefServerIpList, ani.postgresqlIp, ani.opensearchIpList, ani.config)
+	if errorList != nil && errorList.Len() > 0 {
+		return status.Wrap(getSingleErrorFromList(errorList), status.ConfigError, "IP address validation failed")
+	}
+	return nil
+}
+
+func (ani *AddNodeImpl) modifyConfig() error {
+	err := modifyConfigForAddNewNode(
+		&ani.config.Automate.Config.InstanceCount,
+		&ani.config.ExistingInfra.Config.AutomatePrivateIps,
+		ani.automateIpList,
+		&ani.config.Automate.Config.CertsByIP,
+	)
+	if err != nil {
+		return status.Wrap(err, status.ConfigError, "Error modifying automate instance count")
+	}
+	err = modifyConfigForAddNewNode(
+		&ani.config.ChefServer.Config.InstanceCount,
+		&ani.config.ExistingInfra.Config.ChefServerPrivateIps,
+		ani.chefServerIpList,
+		&ani.config.ChefServer.Config.CertsByIP,
+	)
+	if err != nil {
+		return status.Wrap(err, status.ConfigError, "Error modifying chef-server instance count")
+	}
+	err = modifyConfigForAddNewNode(
+		&ani.config.Opensearch.Config.InstanceCount,
+		&ani.config.ExistingInfra.Config.OpensearchPrivateIps,
+		ani.opensearchIpList,
+		&ani.config.Opensearch.Config.CertsByIP,
+	)
+	if err != nil {
+		return status.Wrap(err, status.ConfigError, "Error modifying opensearch instance count")
+	}
+	err = modifyConfigForAddNewNode(
+		&ani.config.Postgresql.Config.InstanceCount,
+		&ani.config.ExistingInfra.Config.PostgresqlPrivateIps,
+		ani.postgresqlIp,
+		&ani.config.Postgresql.Config.CertsByIP,
+	)
+	if err != nil {
+		return status.Wrap(err, status.ConfigError, "Error modifying postgresql instance count")
+	}
+	return nil
+}
+
+func (ani *AddNodeImpl) promptUserConfirmation() (bool, error) {
+	ani.writer.Println("Existing nodes:")
+	ani.writer.Println("================================================")
+	ani.writer.Println("Automate => " + strings.Join(ani.copyConfigForUserPrompt.ExistingInfra.Config.AutomatePrivateIps, ", "))
+	ani.writer.Println("Chef-Server => " + strings.Join(ani.copyConfigForUserPrompt.ExistingInfra.Config.ChefServerPrivateIps, ", "))
+	ani.writer.Println("OpenSearch => " + strings.Join(ani.copyConfigForUserPrompt.ExistingInfra.Config.OpensearchPrivateIps, ", "))
+	ani.writer.Println("Postgresql => " + strings.Join(ani.copyConfigForUserPrompt.ExistingInfra.Config.PostgresqlPrivateIps, ", "))
+	ani.writer.Println("")
+	ani.writer.Println("New nodes to be added:")
+	ani.writer.Println("================================================")
+	if len(ani.automateIpList) > 0 {
+		ani.writer.Println("Automate => " + strings.Join(ani.automateIpList, ", "))
+	}
+	if len(ani.chefServerIpList) > 0 {
+		ani.writer.Println("Chef-Server => " + strings.Join(ani.chefServerIpList, ", "))
+	}
+	if len(ani.opensearchIpList) > 0 {
+		ani.writer.Println("OpenSearch => " + strings.Join(ani.opensearchIpList, ", "))
+	}
+	if len(ani.postgresqlIp) > 0 {
+		ani.writer.Println("Postgresql => " + strings.Join(ani.postgresqlIp, ", "))
+	}
+	return ani.writer.Confirm("This will add the new nodes to your existing setup. It might take a while. Are you sure you want to continue?")
+}
+
+func (ani *AddNodeImpl) runDeploy() error {
+	tomlbytes, err := ptoml.Marshal(ani.config)
+	if err != nil {
+		return status.Wrap(err, status.ConfigError, "Error converting config to bytes")
+	}
+	err = ani.fileutils.WriteToFile(ani.configpath, tomlbytes)
+	if err != nil {
+		return err
+	}
+	err = ani.nodeUtils.genConfig(ani.configpath)
+	if err != nil {
+		return err
+	}
+	argsdeploy := []string{"-y"}
+	return ani.nodeUtils.executeAutomateClusterCtlCommandAsync("deploy", argsdeploy, upgradeHaHelpDoc)
+}
+
+func (ani *AddNodeImpl) validateCmdArgs(automateIpList, chefServerIpList, postgresqlIp, opensearchIpList []string, config ExistingInfraConfigToml) *list.List {
+	errorList := list.New()
+	if len(automateIpList) > 0 {
+		errorList.PushBackList(ani.validateIPAddresses(config, automateIpList, "Automate"))
+	}
+	if len(chefServerIpList) > 0 {
+		errorList.PushBackList(ani.validateIPAddresses(config, chefServerIpList, "Chef-Server"))
+	}
+	if len(opensearchIpList) > 0 {
+		errorList.PushBackList(ani.validateIPAddresses(config, opensearchIpList, "OpenSearch"))
+	}
+	if len(postgresqlIp) > 0 {
+		errorList.PushBackList(ani.validateIPAddresses(config, postgresqlIp, "Postgresql"))
+	}
+	return errorList
+}
+
+func (ani *AddNodeImpl) validateIPAddresses(config ExistingInfraConfigToml, ips []string, errorPrefix string) *list.List {
+	errorList := list.New()
+	prefixAdder := ""
+	if errorPrefix != "" {
+		prefixAdder = " "
+	}
+	for _, ip := range ips {
+		if stringutils.SliceContains(config.ExistingInfra.Config.AutomatePrivateIps, ip) ||
+			stringutils.SliceContains(config.ExistingInfra.Config.ChefServerPrivateIps, ip) ||
+			stringutils.SliceContains(config.ExistingInfra.Config.OpensearchPrivateIps, ip) ||
+			stringutils.SliceContains(config.ExistingInfra.Config.PostgresqlPrivateIps, ip) {
+			errorList.PushBack(fmt.Sprintf("%s%sIp %s is already configured for a node. Please use a different private ip.", errorPrefix, prefixAdder, ip))
+		}
+		err := checkIPAddress(ip)
+		if err != nil {
+			errorList.PushBack(fmt.Sprintf("Incorrect %s IP address format for ip %s", errorPrefix, ip))
+		}
+		err = ani.validateConnection(ip)
+		if err != nil {
+			errorList.PushBack(fmt.Sprintf("%s IP address %s is unreachable", errorPrefix, ip))
+		}
+	}
+	return errorList
+}
+
+func (ani *AddNodeImpl) validateConnection(ip string) error {
+	sshConfig, err := ani.nodeUtils.getHaInfraDetails()
+	if err != nil {
+		return err
+	}
+	sshConfig.hostIP = ip
+	ani.sshUtil.setSSHConfig(sshConfig)
+	_, err = ani.sshUtil.connectAndExecuteCommandOnRemote("sudo echo 1", true)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func init() {
+	nodeCmd.AddCommand(addNodeHACmd())
+	nodeCmd.AddCommand(deleteNodeHACmd())
+	RootCmd.AddCommand(nodeCmd)
+}