fix: extract key value

salsadigitalauorg · May 7, 2022 · 2afb1e7 · 2afb1e7
1 parent a71e549
commit 2afb1e7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/pkg/rockpool/k3d.go b/pkg/rockpool/k3d.go
@@ -67,7 +67,7 @@ func (r *Rockpool) CreateRegistry() {
 		return
 	}
 
-	fmt.Println("[rockpool] creating registry...")
+	fmt.Println("[rockpool] creating registry")
 	_, err := exec.Command("k3d", "registry", "create", "rockpool-registry").Output()
 	if err != nil {
 		fmt.Println("[rockpool] unable to create registry: ", err)
@@ -122,7 +122,7 @@ func (r *Rockpool) StartCluster(cn string) {
 		fmt.Printf("[%s] cluster does not exist\n", cn)
 		return
 	}
-	fmt.Printf("[%s] starting cluster...\n", cn)
+	fmt.Printf("[%s] starting cluster\n", cn)
 	// _, err := exec.Command(r.State.BinaryPaths["k3d"], "cluster", "start", cn).Output()
 	_, err := internal.RunCmdWithProgress(exec.Command(r.State.BinaryPaths["k3d"], "cluster", "start", cn))
 	if err != nil {
@@ -142,7 +142,7 @@ func (r *Rockpool) StopCluster(cn string) {
 		fmt.Printf("[%s] cluster does not exist\n", cn)
 		return
 	}
-	fmt.Printf("[%s] stopping cluster...\n", cn)
+	fmt.Printf("[%s] stopping cluster\n", cn)
 	_, err := internal.RunCmdWithProgress(exec.Command(r.State.BinaryPaths["k3d"], "cluster", "stop", cn))
 	if err != nil {
 		fmt.Printf("[%s] unable to stop cluster: %s\n", cn, internal.GetCmdStdErr(err))
@@ -163,7 +163,7 @@ func (r *Rockpool) DeleteCluster(cn string) {
 		return
 	}
 	r.StopCluster(cn)
-	fmt.Printf("[%s] deleting cluster...\n", cn)
+	fmt.Printf("[%s] deleting cluster\n", cn)
 	_, err := exec.Command(r.State.BinaryPaths["k3d"], "cluster", "delete", cn).Output()
 	if err != nil {
 		fmt.Printf("[%s] unable to delete cluster: %s\n", cn, err)

diff --git a/pkg/rockpool/lagoon-api.go b/pkg/rockpool/lagoon-api.go
@@ -25,7 +25,7 @@ var lagoonUserinfo struct {
 }
 
 func (r *Rockpool) lagoonFetchApiToken() string {
-	fmt.Println("[rockpool] fetching lagoon api token...")
+	fmt.Println("[rockpool] fetching lagoon api token")
 	_, password := r.KubeGetSecret(r.ControllerClusterName(),
 		"lagoon-core",
 		"lagoon-core-keycloak",
@@ -97,6 +97,7 @@ func (r *Rockpool) LagoonApiAddSshKey() {
 	r.LagoonApiFetchUserInfo()
 	for _, k := range lagoonUserinfo.Me.SshKeys {
 		if k.KeyFingerprint == keyFingerpint {
+			fmt.Println("[rockpool] lagoon ssh key had already been added")
 			return
 		}
 	}
@@ -116,6 +117,7 @@ func (r *Rockpool) LagoonApiAddSshKey() {
 		"userEmail": graphql.String(lagoonUserinfo.Me.Email),
 		"userId":    graphql.String(lagoonUserinfo.Me.Id),
 	}
+	fmt.Println("[rockpool] adding lagoon ssh key")
 	err := r.GqlClient.Mutate(context.Background(), &m, vars)
 	if err != nil {
 		fmt.Printf("[rockpool] error adding Lagoon ssh key %s: %#v\n", cmt, err)

diff --git a/pkg/rockpool/lagoon-components.go b/pkg/rockpool/lagoon-components.go
@@ -162,7 +162,7 @@ func (r *Rockpool) AddHarborHostEntries(cn string) {
 
 		hostsContent, _ := r.DockerExec(n.Name, "cat /etc/hosts")
 		if !strings.Contains(string(hostsContent), entry) {
-			fmt.Printf("[%s] adding harbor host entries...\n", n.Name)
+			fmt.Printf("[%s] adding harbor host entries\n", n.Name)
 			_, err := r.DockerExec(n.Name, entryCmdStr)
 			if err != nil {
 				fmt.Printf("[%s] error adding harbor host entry: %s\n", cn, internal.GetCmdStdErr(err))

diff --git a/pkg/rockpool/ssh.go b/pkg/rockpool/ssh.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -30,10 +31,9 @@ func (r *Rockpool) SshGetPublicKey() []byte {
 
 func (r *Rockpool) SshGetPublicKeyFingerprint() (string, string, string, string) {
 	key := r.SshGetPublicKey()
-
 	pk, comment, _, _, err := ssh.ParseAuthorizedKey(key)
 	if err != nil {
 		panic(err)
 	}
-	return string(key), pk.Type(), ssh.FingerprintSHA256(pk), comment
+	return strings.Split(string(key), " ")[1], pk.Type(), ssh.FingerprintSHA256(pk), comment
 }