Skip to content

Commit e5884e8

Browse files
nicolaiortnicolaiort
committed
style(services): format and clean up Ginkgo tests for DefaultSSHService
1 parent c920d7b commit e5884e8

1 file changed

Lines changed: 95 additions & 95 deletions

File tree

‎internal/services/sshservice_test.go‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
11
package services
22

33
import (
4-
"crypto/rsa"
5-
"strings"
6-
"testing"
4+
"crypto/rsa"
5+
"strings"
6+
"testing"
77

8-
. "github.com/onsi/ginkgo/v2"
9-
. "github.com/onsi/gomega"
8+
. "github.com/onsi/ginkgo/v2"
9+
. "github.com/onsi/gomega"
1010

11-
"golang.org/x/crypto/ssh"
11+
"golang.org/x/crypto/ssh"
1212
)
1313

1414
var _ = Describe("DefaultSSHService", func() {
15-
Describe("GenerateRSAKeyPair", func() {
16-
It("generates non-empty private and public keys", func() {
17-
svc := &DefaultSSHService{RSAKeyLength: 2048}
18-
privateKey, publicKey, err := svc.GenerateRSAKeyPair()
19-
20-
Expect(err).NotTo(HaveOccurred())
21-
Expect(privateKey).NotTo(BeEmpty())
22-
Expect(publicKey).NotTo(BeEmpty())
23-
})
15+
Describe("GenerateRSAKeyPair", func() {
16+
It("generates non-empty private and public keys", func() {
17+
svc := &DefaultSSHService{RSAKeyLength: 2048}
18+
privateKey, publicKey, err := svc.GenerateRSAKeyPair()
2419

25-
It("returns a valid PEM-encoded RSA private key", func() {
26-
svc := &DefaultSSHService{RSAKeyLength: 2048}
27-
privateKey, _, err := svc.GenerateRSAKeyPair()
20+
Expect(err).NotTo(HaveOccurred())
21+
Expect(privateKey).NotTo(BeEmpty())
22+
Expect(publicKey).NotTo(BeEmpty())
23+
})
2824

29-
Expect(err).NotTo(HaveOccurred())
30-
Expect(strings.Contains(privateKey, "-----BEGIN RSA PRIVATE KEY-----")).To(BeTrue())
31-
Expect(strings.Contains(privateKey, "-----END RSA PRIVATE KEY-----")).To(BeTrue())
32-
})
25+
It("returns a valid PEM-encoded RSA private key", func() {
26+
svc := &DefaultSSHService{RSAKeyLength: 2048}
27+
privateKey, _, err := svc.GenerateRSAKeyPair()
3328

34-
It("returns a public key with ssh-rsa prefix", func() {
35-
svc := &DefaultSSHService{RSAKeyLength: 2048}
36-
_, publicKey, err := svc.GenerateRSAKeyPair()
29+
Expect(err).NotTo(HaveOccurred())
30+
Expect(strings.Contains(privateKey, "-----BEGIN RSA PRIVATE KEY-----")).To(BeTrue())
31+
Expect(strings.Contains(privateKey, "-----END RSA PRIVATE KEY-----")).To(BeTrue())
32+
})
3733

38-
Expect(err).NotTo(HaveOccurred())
39-
Expect(publicKey).To(HavePrefix("ssh-rsa "))
40-
})
34+
It("returns a public key with ssh-rsa prefix", func() {
35+
svc := &DefaultSSHService{RSAKeyLength: 2048}
36+
_, publicKey, err := svc.GenerateRSAKeyPair()
4137

42-
It("returns keys that can be parsed back and are usable", func() {
43-
svc := &DefaultSSHService{RSAKeyLength: 2048}
44-
privateKey, publicKey, err := svc.GenerateRSAKeyPair()
38+
Expect(err).NotTo(HaveOccurred())
39+
Expect(publicKey).To(HavePrefix("ssh-rsa "))
40+
})
4541

46-
Expect(err).NotTo(HaveOccurred())
42+
It("returns keys that can be parsed back and are usable", func() {
43+
svc := &DefaultSSHService{RSAKeyLength: 2048}
44+
privateKey, publicKey, err := svc.GenerateRSAKeyPair()
4745

48-
parsedPrivateKey, err := ssh.ParseRawPrivateKey([]byte(privateKey))
49-
Expect(err).NotTo(HaveOccurred())
46+
Expect(err).NotTo(HaveOccurred())
5047

51-
rsaKey, ok := parsedPrivateKey.(*rsa.PrivateKey)
52-
Expect(ok).To(BeTrue())
53-
Expect(rsaKey.N).NotTo(BeNil())
48+
parsedPrivateKey, err := ssh.ParseRawPrivateKey([]byte(privateKey))
49+
Expect(err).NotTo(HaveOccurred())
5450

55-
_, _, _, _, err = ssh.ParseAuthorizedKey([]byte(publicKey))
56-
Expect(err).NotTo(HaveOccurred())
57-
})
51+
rsaKey, ok := parsedPrivateKey.(*rsa.PrivateKey)
52+
Expect(ok).To(BeTrue())
53+
Expect(rsaKey.N).NotTo(BeNil())
5854

59-
It("returns an error when key length is zero", func() {
60-
svc := &DefaultSSHService{RSAKeyLength: 0}
61-
_, _, err := svc.GenerateRSAKeyPair()
55+
_, _, _, _, err = ssh.ParseAuthorizedKey([]byte(publicKey))
56+
Expect(err).NotTo(HaveOccurred())
57+
})
6258

63-
Expect(err).To(HaveOccurred())
64-
})
59+
It("returns an error when key length is zero", func() {
60+
svc := &DefaultSSHService{RSAKeyLength: 0}
61+
_, _, err := svc.GenerateRSAKeyPair()
6562

66-
It("returns an error when key length is below the minimum", func() {
67-
svc := &DefaultSSHService{RSAKeyLength: 256}
68-
_, _, err := svc.GenerateRSAKeyPair()
63+
Expect(err).To(HaveOccurred())
64+
})
6965

70-
Expect(err).To(HaveOccurred())
71-
})
72-
})
66+
It("returns an error when key length is below the minimum", func() {
67+
svc := &DefaultSSHService{RSAKeyLength: 256}
68+
_, _, err := svc.GenerateRSAKeyPair()
7369

74-
Describe("GenerateED25519KeyPair", func() {
75-
It("generates non-empty private and public keys", func() {
76-
svc := &DefaultSSHService{}
77-
privateKey, publicKey, err := svc.GenerateED25519KeyPair()
70+
Expect(err).To(HaveOccurred())
71+
})
72+
})
7873

79-
Expect(err).NotTo(HaveOccurred())
80-
Expect(privateKey).NotTo(BeEmpty())
81-
Expect(publicKey).NotTo(BeEmpty())
82-
})
74+
Describe("GenerateED25519KeyPair", func() {
75+
It("generates non-empty private and public keys", func() {
76+
svc := &DefaultSSHService{}
77+
privateKey, publicKey, err := svc.GenerateED25519KeyPair()
8378

84-
It("returns a valid PEM-encoded OpenSSH private key", func() {
85-
svc := &DefaultSSHService{}
86-
privateKey, _, err := svc.GenerateED25519KeyPair()
79+
Expect(err).NotTo(HaveOccurred())
80+
Expect(privateKey).NotTo(BeEmpty())
81+
Expect(publicKey).NotTo(BeEmpty())
82+
})
8783

88-
Expect(err).NotTo(HaveOccurred())
89-
Expect(strings.Contains(privateKey, "-----BEGIN OPENSSH PRIVATE KEY-----")).To(BeTrue())
90-
Expect(strings.Contains(privateKey, "-----END OPENSSH PRIVATE KEY-----")).To(BeTrue())
91-
})
84+
It("returns a valid PEM-encoded OpenSSH private key", func() {
85+
svc := &DefaultSSHService{}
86+
privateKey, _, err := svc.GenerateED25519KeyPair()
9287

93-
It("returns a public key with ssh-ed25519 prefix", func() {
94-
svc := &DefaultSSHService{}
95-
_, publicKey, err := svc.GenerateED25519KeyPair()
88+
Expect(err).NotTo(HaveOccurred())
89+
Expect(strings.Contains(privateKey, "-----BEGIN OPENSSH PRIVATE KEY-----")).To(BeTrue())
90+
Expect(strings.Contains(privateKey, "-----END OPENSSH PRIVATE KEY-----")).To(BeTrue())
91+
})
9692

97-
Expect(err).NotTo(HaveOccurred())
98-
Expect(publicKey).To(HavePrefix("ssh-ed25519 "))
99-
})
93+
It("returns a public key with ssh-ed25519 prefix", func() {
94+
svc := &DefaultSSHService{}
95+
_, publicKey, err := svc.GenerateED25519KeyPair()
10096

101-
It("returns keys that can be parsed and used as a valid pair", func() {
102-
svc := &DefaultSSHService{}
103-
privateKey, publicKey, err := svc.GenerateED25519KeyPair()
97+
Expect(err).NotTo(HaveOccurred())
98+
Expect(publicKey).To(HavePrefix("ssh-ed25519 "))
99+
})
104100

105-
Expect(err).NotTo(HaveOccurred())
101+
It("returns keys that can be parsed and used as a valid pair", func() {
102+
svc := &DefaultSSHService{}
103+
privateKey, publicKey, err := svc.GenerateED25519KeyPair()
106104

107-
signer, err := ssh.ParsePrivateKey([]byte(privateKey))
108-
Expect(err).NotTo(HaveOccurred())
105+
Expect(err).NotTo(HaveOccurred())
109106

110-
pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(publicKey))
111-
Expect(err).NotTo(HaveOccurred())
107+
signer, err := ssh.ParsePrivateKey([]byte(privateKey))
108+
Expect(err).NotTo(HaveOccurred())
112109

113-
Expect(string(signer.PublicKey().Marshal())).To(Equal(string(pubKey.Marshal())))
114-
})
110+
pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(publicKey))
111+
Expect(err).NotTo(HaveOccurred())
115112

116-
It("produces signatures in ssh-ed25519 format", func() {
117-
svc := &DefaultSSHService{}
118-
privateKey, _, err := svc.GenerateED25519KeyPair()
119-
Expect(err).NotTo(HaveOccurred())
113+
Expect(string(signer.PublicKey().Marshal())).To(Equal(string(pubKey.Marshal())))
114+
})
120115

121-
signer, err := ssh.ParsePrivateKey([]byte(privateKey))
122-
Expect(err).NotTo(HaveOccurred())
116+
It("produces signatures in ssh-ed25519 format", func() {
117+
svc := &DefaultSSHService{}
118+
privateKey, _, err := svc.GenerateED25519KeyPair()
119+
Expect(err).NotTo(HaveOccurred())
123120

124-
sig, err := signer.Sign(nil, []byte("test data"))
125-
Expect(err).NotTo(HaveOccurred())
126-
Expect(sig.Format).To(Equal("ssh-ed25519"))
127-
})
128-
})
121+
signer, err := ssh.ParsePrivateKey([]byte(privateKey))
122+
Expect(err).NotTo(HaveOccurred())
123+
124+
sig, err := signer.Sign(nil, []byte("test data"))
125+
Expect(err).NotTo(HaveOccurred())
126+
Expect(sig.Format).To(Equal("ssh-ed25519"))
127+
})
128+
})
129129
})
130130

131131
func TestSSHService(t *testing.T) {
132-
RegisterFailHandler(Fail)
133-
RunSpecs(t, "SSH Service Suite")
132+
RegisterFailHandler(Fail)
133+
RunSpecs(t, "SSH Service Suite")
134134
}

0 commit comments

Comments
 (0)