Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-18 11:37:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

use cobra.Command

Browse source
This commit is contained in:
miampf 2025-01-16 16:27:16 +01:00
parent 21c9cd6a26
commit 8577d23e5c
No known key found for this signature in database
GPG key ID: EF039364B5B6886C
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/internal/cmd/ssh.go
View file

@ -7,7 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-only
package cmd package cmd
import ( import (
"context"
"crypto/ed25519" "crypto/ed25519"
"crypto/rand" "crypto/rand"
"fmt" "fmt"
@ -51,10 +50,10 @@ func runSSH(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("retrieving path to public key from flags: %s", err) return fmt.Errorf("retrieving path to public key from flags: %s", err)
} }
return generateKey(cmd.Context(), keyPath, fh, debugLogger) return generateKey(cmd, keyPath, fh, debugLogger)
} }
func generateKey(ctx context.Context, keyPath string, fh file.Handler, debugLogger debugLog) error { func generateKey(cmd *cobra.Command, keyPath string, fh file.Handler, debugLogger debugLog) error {
_, err := fh.Stat(constants.TerraformWorkingDir) _, err := fh.Stat(constants.TerraformWorkingDir)
if os.IsNotExist(err) { if os.IsNotExist(err) {
return fmt.Errorf("directory %q does not exist", constants.TerraformWorkingDir) return fmt.Errorf("directory %q does not exist", constants.TerraformWorkingDir)
@ -70,11 +69,11 @@ func generateKey(ctx context.Context, keyPath string, fh file.Handler, debugLogg
} }
mastersecretURI := uri.MasterSecret{Key: mastersecret.Key, Salt: mastersecret.Salt} mastersecretURI := uri.MasterSecret{Key: mastersecret.Key, Salt: mastersecret.Salt}
kms, err := setup.KMS(ctx, uri.NoStoreURI, mastersecretURI.EncodeToURI()) kms, err := setup.KMS(cmd.Context(), uri.NoStoreURI, mastersecretURI.EncodeToURI())
if err != nil { if err != nil {
return fmt.Errorf("setting up KMS: %s", err) return fmt.Errorf("setting up KMS: %s", err)
} }
sshCAKeySeed, err := kms.GetDEK(ctx, crypto.DEKPrefix+constants.SSHCAKeySuffix, ed25519.SeedSize) sshCAKeySeed, err := kms.GetDEK(cmd.Context(), crypto.DEKPrefix+constants.SSHCAKeySuffix, ed25519.SeedSize)
if err != nil { if err != nil {
return fmt.Errorf("retrieving key from KMS: %s", err) return fmt.Errorf("retrieving key from KMS: %s", err)
} }
@ -117,7 +116,7 @@ func generateKey(ctx context.Context, keyPath string, fh file.Handler, debugLogg
if err := fh.Write(fmt.Sprintf("%s/ca_cert.pub", constants.TerraformWorkingDir), ssh.MarshalAuthorizedKey(&certificate), file.OptOverwrite); err != nil { if err := fh.Write(fmt.Sprintf("%s/ca_cert.pub", constants.TerraformWorkingDir), ssh.MarshalAuthorizedKey(&certificate), file.OptOverwrite); err != nil {
return fmt.Errorf("writing certificate: %s", err) return fmt.Errorf("writing certificate: %s", err)
} }
fmt.Printf("You can now connect to a node using 'ssh -F %s/ssh_config -i <your private key> <node ip>'.\nYou can obtain the private node IP via the web UI of your CSP.\n", constants.TerraformWorkingDir) cmd.Printf("You can now connect to a node using 'ssh -F %s/ssh_config -i <your private key> <node ip>'.\nYou can obtain the private node IP via the web UI of your CSP.\n", constants.TerraformWorkingDir)
return nil return nil
} }

9
cli/internal/cmd/ssh_test.go
View file

@ -1,7 +1,7 @@
package cmd package cmd
import ( import (
"context" "bytes"
"fmt" "fmt"
"testing" "testing"
@ -88,7 +88,12 @@ func TestSSH(t *testing.T) {
require.NoError(tc.fh.Write(constants.MasterSecretFilename, []byte(tc.masterSecret))) require.NoError(tc.fh.Write(constants.MasterSecretFilename, []byte(tc.masterSecret)))
} }
err := generateKey(context.Background(), someSSHPubKeyPath, tc.fh, logger.NewTest(t)) cmd := NewSSHCmd()
cmd.SetOut(&bytes.Buffer{})
cmd.SetErr(&bytes.Buffer{})
cmd.SetIn(&bytes.Buffer{})
err := generateKey(cmd, someSSHPubKeyPath, tc.fh, logger.NewTest(t))
if tc.wantErr { if tc.wantErr {
assert.Error(err) assert.Error(err)
} else { } else {