DEVOPS-3141 teleport changes

Makefile

@@ -12,11 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+TSH_VERSION = 10.1.4
+
 # Build command binary, for macOS
 build_macos:
+	wget https://get.gravitational.com/teleport-v$(TSH_VERSION)-darwin-amd64-bin.tar.gz
+	tar -xf teleport-v$(TSH_VERSION)-darwin-amd64-bin.tar.gz
+	cp teleport/tsh pkg/exec/bin/
+	# Adding double $ in awk command to escape single $
+	md5sum teleport/tsh | awk '{ print $$1 }'| tr -d '\n' > pkg/exec/bin/tsh.md5
 	GOOS=darwin GOARCH=amd64 go build -o bin/ridectl.macos -ldflags "-X github.com/Ridecell/ridectl/pkg/cmd.version=$(shell git describe --tags)" -tags release github.com/Ridecell/ridectl/cmd/ridectl
 
 # Build command binary, for Linux
 build_linux:
+	wget https://get.gravitational.com/teleport-v$(TSH_VERSION)-linux-amd64-bin.tar.gz
+	tar -xf teleport-v$(TSH_VERSION)-linux-amd64-bin.tar.gz
+	cp teleport/tsh pkg/exec/bin/
+	# Adding double $ in awk command to escape single $
+	md5sum teleport/tsh | awk '{ print $$1 }'| tr -d '\n' > pkg/exec/bin/tsh.md5
 	GOOS=linux GOARCH=amd64 go build -o bin/ridectl.linux -ldflags "-X github.com/Ridecell/ridectl/pkg/cmd.version=$(shell git describe --tags)" -tags release github.com/Ridecell/ridectl/cmd/ridectl
-

pkg/cmd/dbshell.go

@@ -16,8 +16,8 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"os"
 	"reflect"
+	"strings"
 
 	"github.com/Ridecell/ridectl/pkg/exec"
 	"github.com/pterm/pterm"
@@ -49,8 +49,7 @@ var dbShellCmd = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		utils.CheckPsql()
 		return nil
 	},
@@ -59,23 +58,29 @@ var dbShellCmd = &cobra.Command{
 		kubeconfig := utils.GetKubeconfig()
 		target, err := kubernetes.ParseSubject(args[0])
 		if err != nil {
-			pterm.Error.Println(err, "Its not a valid Summonplatform or Microservice")
-			os.Exit(1)
+			return fmt.Errorf("Its not a valid Summonplatform or Microservice: %s", err)
 		}
 		kubeObj := kubernetes.GetAppropriateObjectWithContext(*kubeconfig, args[0], target, inCluster)
 		if reflect.DeepEqual(kubeObj, kubernetes.Kubeobject{}) {
-			pterm.Error.Printf("No instance found %s\n", args[0])
-			os.Exit(1)
+			return fmt.Errorf("No instance found %s\n", args[0])
 		}
 		secretObj := &corev1.Secret{}
-		err = kubeObj.Client.Get(context.Background(), types.NamespacedName{Name: target.Name + ".postgres-user-password", Namespace: target.Namespace}, secretObj)
+		err = kubeObj.Client.Get(context.Background(), types.NamespacedName{Name: target.Name + "-rdsiam-readonly.postgres-user-password", Namespace: target.Namespace}, secretObj)
 		if err != nil {
-			pterm.Error.Printf("instance not found in %s", kubeObj.Context.Cluster)
-			os.Exit(1)
+			return fmt.Errorf("Error getting secret for instance %s", err)
 		}
 
-		psqlCmd := []string{"psql", "-h", string(secretObj.Data["host"]), "-U", string(secretObj.Data["username"]), string(secretObj.Data["dbname"])}
-		os.Setenv("PGPASSWORD", string(secretObj.Data["password"]))
-		return exec.Exec(psqlCmd)
+		// Derive RDS instance name using hostname
+		rdsInstanceName := strings.Split(string(secretObj.Data["host"]), ".")[0]
+
+		pterm.Info.Println("Getting database login credentials")
+		dbLoginArgs := []string{"db", "login", "--db-user=" + string(secretObj.Data["username"]), "--db-name=" + string(secretObj.Data["dbname"]), rdsInstanceName}
+		err = exec.ExecuteCommand("tsh", dbLoginArgs, false)
+		if err != nil {
+			return fmt.Errorf("Could not login to database, %s", err)
+		}
+		pterm.Info.Println("Logging in into database")
+		dbConnectCmd := []string{"db", "connect", rdsInstanceName}
+		return exec.ExecuteCommand("tsh", dbConnectCmd, true)
 	},
 }

pkg/cmd/password.go

@@ -54,7 +54,7 @@ var passwordCmd = &cobra.Command{
 	},
 
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		return nil
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -94,6 +94,7 @@ var passwordCmd = &cobra.Command{
 			}
 
 			pterm.Success.Printf("Password for %s: %s\n", args[0], string(secret.Data["password"]))
+			pterm.Warning.Printf("If someone has changed or reset the password manually, then above password will not work.\n")
 
 		case "postgresql":
 			// get a list of secrets which have readonly in their name

pkg/cmd/postgresdump.go

@@ -54,7 +54,7 @@ var postgresdumpCMD = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		return nil
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {

pkg/cmd/pyshell.go

@@ -53,8 +53,7 @@ var pyShellCmd = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		utils.CheckKubectl()
 		return nil
 	},
@@ -95,11 +94,11 @@ var pyShellCmd = &cobra.Command{
 		podList := &corev1.PodList{}
 		err = kubeObj.Client.List(context.Background(), podList, listOptions)
 		if err != nil {
-			pterm.Error.Printf("instance not found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("instance not found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 		if len(podList.Items) < 1 {
-			pterm.Error.Printf("instance not found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("instance not found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 
@@ -112,7 +111,7 @@ var pyShellCmd = &cobra.Command{
 			}
 		}
 		if pod.Name == "" {
-			pterm.Error.Printf("no running pod found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("no running pod found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 
@@ -122,8 +121,8 @@ var pyShellCmd = &cobra.Command{
 		// Warn people that this is a container.
 		pterm.Warning.Printf("Remember that this is a container and most changes will have no effect\n")
 
-		kubectlArgs := []string{"kubectl", "exec", "-it", "-n", pod.Namespace, pod.Name, "--context", kubeObj.Context.Cluster, "--", "bash", "-l", "-c", "python manage.py shell"}
-		return exec.Exec(kubectlArgs)
+		kubectlArgs := []string{"exec", "-it", "-n", pod.Namespace, pod.Name, "--context", kubeObj.Context, "--", "bash", "-l", "-c", "python manage.py shell"}
+		return exec.ExecuteCommand("kubectl", kubectlArgs, true)
 
 	},
 }

pkg/cmd/restart.go

@@ -63,7 +63,7 @@ var rollingRestartCmd = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		return nil
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {

pkg/cmd/shell.go

@@ -53,8 +53,7 @@ var shellCmd = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		utils.CheckKubectl()
 		return nil
 	},
@@ -95,11 +94,11 @@ var shellCmd = &cobra.Command{
 		podList := &corev1.PodList{}
 		err = kubeObj.Client.List(context.Background(), podList, listOptions)
 		if err != nil {
-			pterm.Error.Printf("instance not found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("instance not found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 		if len(podList.Items) < 1 {
-			pterm.Error.Printf("instance not found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("instance not found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 
@@ -112,7 +111,7 @@ var shellCmd = &cobra.Command{
 			}
 		}
 		if pod.Name == "" {
-			pterm.Error.Printf("no running pod found in %s", kubeObj.Context.Cluster)
+			pterm.Error.Printf("no running pod found in %s", kubeObj.Context)
 			os.Exit(1)
 		}
 
@@ -122,8 +121,8 @@ var shellCmd = &cobra.Command{
 		// Warn people that this is a container.
 		pterm.Warning.Printf("Remember that this is a container and most changes will have no effect\n")
 
-		kubectlArgs := []string{"kubectl", "exec", "-it", "-n", pod.Namespace, pod.Name, "--context", kubeObj.Context.Cluster, "--", "bash", "-l"}
-		return exec.Exec(kubectlArgs)
+		kubectlArgs := []string{"exec", "-it", "-n", pod.Namespace, pod.Name, "--context", kubeObj.Context, "--", "bash", "-l"}
+		return exec.ExecuteCommand("kubectl", kubectlArgs, true)
 
 	},
 }

pkg/cmd/status.go

@@ -93,7 +93,7 @@ var statusCmd = &cobra.Command{
 		return nil
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		utils.CheckVPN()
+		utils.CheckTshLogin()
 		utils.CheckKubectl()
 		return nil
 	},
@@ -138,16 +138,16 @@ var statusCmd = &cobra.Command{
 
 		var sData, dData, pData string
 		if statusType == "Summon Platform" {
-			sData, err = getData("summon", kubeObj.Context.Cluster, target.Namespace, name)
+			sData, err = getData("summon", kubeObj.Context, target.Namespace, name)
 			if err != nil {
 				return err
 			}
-			dData, err = getData("deployment", kubeObj.Context.Cluster, target.Namespace, name)
+			dData, err = getData("deployment", kubeObj.Context, target.Namespace, name)
 			if err != nil {
 				return err
 			}
 		} else {
-			pData, err = getData("postgresdump", kubeObj.Context.Cluster, target.Namespace, name)
+			pData, err = getData("postgresdump", kubeObj.Context, target.Namespace, name)
 			if err != nil {
 				return err
 			}
@@ -163,13 +163,13 @@ var statusCmd = &cobra.Command{
 					area.Update(sData, "\n", dData)
 					_, _ = p.Start()
 					p.Title = "Fetching data"
-					sData, err = getData("summon", kubeObj.Context.Cluster, target.Namespace, name)
+					sData, err = getData("summon", kubeObj.Context, target.Namespace, name)
 					if err != nil {
 						return err
 					}
 					p.Increment()
 
-					dData, err = getData("deployment", kubeObj.Context.Cluster, target.Namespace, name)
+					dData, err = getData("deployment", kubeObj.Context, target.Namespace, name)
 					if err != nil {
 						return err
 					}
@@ -179,7 +179,7 @@ var statusCmd = &cobra.Command{
 					area.Update(pData)
 					_, _ = p.Start()
 					p.Title = "Fetching data"
-					pData, err = getData("posgtresdump", kubeObj.Context.Cluster, target.Namespace, name)
+					pData, err = getData("posgtresdump", kubeObj.Context, target.Namespace, name)
 					if err != nil {
 						return err
 					}

pkg/exec/exec.go

@@ -14,17 +14,72 @@ limitations under the License.
 package exec
 
 import (
+	"bytes"
+	_ "embed"
+	"fmt"
 	"os"
 	"os/exec"
-	"syscall"
+	"path/filepath"
 )
 
-func Exec(command []string) error {
-	binary, err := exec.LookPath(command[0])
+var (
+	//go:embed bin/tsh
+	tsh []byte
+	//go:embed bin/tsh.md5
+	tshMD5 string
+)
+
+func InstallTsh() error {
+	executablePath, _ := os.Executable()
+	dir, err := filepath.Abs(filepath.Dir(executablePath))
 	if err != nil {
 		return err
 	}
-	err = syscall.Exec(binary, command, os.Environ())
-	// Panic rather than returning since this should never happen.
-	panic(err)
+	return os.WriteFile(dir+"/tsh", tsh, 0755)
+}
+
+func GetTshMd5Hash() string {
+	return tshMD5
+}
+
+func CheckBinary(binary string) (string, bool) {
+	binaryPath, err := exec.LookPath(binary)
+	return binaryPath, err == nil
+}
+
+// ExecuteCommand uses os/exec Command fucntion to execute command,
+// which returns the process output/error to parent process,
+// If detachProcess flag set to true, then ridectl will exit with
+// no error irrespective of given command's exit code.
+func ExecuteCommand(binary string, args []string, detachProcess bool) error {
+	binaryPath, err := exec.LookPath(binary)
+	if err != nil {
+		return err
+	}
+
+	c := exec.Command(binaryPath, args...)
+	c.Stdin = os.Stdin
+
+	// Execute a process by seperating it's Stderr and Stdout streams from ridectl code
+	// Here we will just execute the command, and complete ridectl command with no error
+	// Mainly used by "kubectl exec" and "psql" commands
+	if detachProcess {
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		_ = c.Run()
+		return nil
+	}
+
+	// Here we will capture Stderr from given command output
+	// Mainly used by "tsh status" and "tsh db login" commands
+	var stderr bytes.Buffer
+	c.Stderr = &stderr
+	err = c.Run()
+	if err != nil {
+		if stderr.String() != "" {
+			return fmt.Errorf(stderr.String())
+		}
+		return fmt.Errorf("Error while executing command: %s", err.Error())
+	}
+	return nil
 }