iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 'Ssh' suffix from 'KeyPairType' constants.

Browse Source
This commit is contained in:
Stephen Fox 2019-02-04 12:23:42 -05:00
parent c6ae8654d9
commit 7f6b307dd6
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helper/ssh/sshkeypair.go
View File

@ -19,15 +19,15 @@ const (
// That's a lot of bits. // That's a lot of bits.
defaultRsaBits = 4096 defaultRsaBits = 4096
// RsaSsh is a SSH key pair of RSA type. // Rsa is a SSH key pair of RSA type.
RsaSsh KeyPairType = "rsa" Rsa KeyPairType = "rsa"
// EcdsaSsh is a SSH key pair of ECDSA type. // Ecdsa is a SSH key pair of ECDSA type.
EcdsaSsh KeyPairType = "ecdsa" Ecdsa KeyPairType = "ecdsa"
) )
// KeyPairType represents different types of SSH key pairs. // KeyPairType represents different types of SSH key pairs.
// For example, RSA. // See the 'const' block for details.
type KeyPairType string type KeyPairType string
func (o KeyPairType) String() string { func (o KeyPairType) String() string {
@ -108,9 +108,9 @@ func (o *defaultKeyPairBuilder) SetName(name string) KeyPairBuilder {
func (o *defaultKeyPairBuilder) Build() (KeyPair, error) { func (o *defaultKeyPairBuilder) Build() (KeyPair, error) {
switch o.kind { switch o.kind {
case RsaSsh: case Rsa:
return o.newRsaSshKeyPair() return o.newRsaSshKeyPair()
case EcdsaSsh: case Ecdsa:
// Default case. // Default case.
} }
@ -156,7 +156,7 @@ func (o *defaultKeyPairBuilder) newEcdsaSshKeyPair() (KeyPair, error) {
} }
return &defaultKeyPair{ return &defaultKeyPair{
kind: EcdsaSsh, kind: Ecdsa,
bits: o.bits, bits: o.bits,
name: o.name, name: o.name,
privateKeyDerBytes: raw, privateKeyDerBytes: raw,
@ -181,7 +181,7 @@ func (o *defaultKeyPairBuilder) newRsaSshKeyPair() (KeyPair, error) {
} }
return &defaultKeyPair{ return &defaultKeyPair{
kind: RsaSsh, kind: Rsa,
bits: o.bits, bits: o.bits,
name: o.name, name: o.name,
privateKeyDerBytes: x509.MarshalPKCS1PrivateKey(privateKey), privateKeyDerBytes: x509.MarshalPKCS1PrivateKey(privateKey),
@ -254,9 +254,9 @@ func (o defaultKeyPair) PrivateKeyPemBlock() []byte {
t := "UNKNOWN PRIVATE KEY" t := "UNKNOWN PRIVATE KEY"
switch o.kind { switch o.kind {
case EcdsaSsh: case Ecdsa:
t = "EC PRIVATE KEY" t = "EC PRIVATE KEY"
case RsaSsh: case Rsa:
t = "RSA PRIVATE KEY" t = "RSA PRIVATE KEY"
} }

18
helper/ssh/sshkeypair_test.go
View File

@ -147,7 +147,7 @@ func TestDefaultKeyPairBuilder_Build_Default(t *testing.T) {
} }
err = expected{ err = expected{
kind: EcdsaSsh, kind: Ecdsa,
bits: 521, bits: 521,
desc: "ecdsa 521", desc: "ecdsa 521",
data: []byte(uuid.TimeOrderedUUID()), data: []byte(uuid.TimeOrderedUUID()),
@ -159,14 +159,14 @@ func TestDefaultKeyPairBuilder_Build_Default(t *testing.T) {
func TestDefaultKeyPairBuilder_Build_EcdsaDefault(t *testing.T) { func TestDefaultKeyPairBuilder_Build_EcdsaDefault(t *testing.T) {
kp, err := NewKeyPairBuilder(). kp, err := NewKeyPairBuilder().
SetType(EcdsaSsh). SetType(Ecdsa).
Build() Build()
if err != nil { if err != nil {
t.Fatal(err.Error()) t.Fatal(err.Error())
} }
err = expected{ err = expected{
kind: EcdsaSsh, kind: Ecdsa,
bits: 521, bits: 521,
desc: "ecdsa 521", desc: "ecdsa 521",
data: []byte(uuid.TimeOrderedUUID()), data: []byte(uuid.TimeOrderedUUID()),
@ -178,14 +178,14 @@ func TestDefaultKeyPairBuilder_Build_EcdsaDefault(t *testing.T) {
func TestDefaultKeyPairBuilder_Build_RsaDefault(t *testing.T) { func TestDefaultKeyPairBuilder_Build_RsaDefault(t *testing.T) {
kp, err := NewKeyPairBuilder(). kp, err := NewKeyPairBuilder().
SetType(RsaSsh). SetType(Rsa).
Build() Build()
if err != nil { if err != nil {
t.Fatal(err.Error()) t.Fatal(err.Error())
} }
err = expected{ err = expected{
kind: RsaSsh, kind: Rsa,
bits: 4096, bits: 4096,
desc: "rsa 4096", desc: "rsa 4096",
data: []byte(uuid.TimeOrderedUUID()), data: []byte(uuid.TimeOrderedUUID()),
@ -199,7 +199,7 @@ func TestDefaultKeyPairBuilder_Build_NamedEcdsa(t *testing.T) {
name := uuid.TimeOrderedUUID() name := uuid.TimeOrderedUUID()
kp, err := NewKeyPairBuilder(). kp, err := NewKeyPairBuilder().
SetType(EcdsaSsh). SetType(Ecdsa).
SetName(name). SetName(name).
Build() Build()
if err != nil { if err != nil {
@ -207,7 +207,7 @@ func TestDefaultKeyPairBuilder_Build_NamedEcdsa(t *testing.T) {
} }
err = expected{ err = expected{
kind: EcdsaSsh, kind: Ecdsa,
bits: 521, bits: 521,
desc: "ecdsa 521", desc: "ecdsa 521",
data: []byte(uuid.TimeOrderedUUID()), data: []byte(uuid.TimeOrderedUUID()),
@ -222,7 +222,7 @@ func TestDefaultKeyPairBuilder_Build_NamedRsa(t *testing.T) {
name := uuid.TimeOrderedUUID() name := uuid.TimeOrderedUUID()
kp, err := NewKeyPairBuilder(). kp, err := NewKeyPairBuilder().
SetType(RsaSsh). SetType(Rsa).
SetName(name). SetName(name).
Build() Build()
if err != nil { if err != nil {
@ -230,7 +230,7 @@ func TestDefaultKeyPairBuilder_Build_NamedRsa(t *testing.T) {
} }
err = expected{ err = expected{
kind: RsaSsh, kind: Rsa,
bits: 4096, bits: 4096,
desc: "rsa 4096", desc: "rsa 4096",
data: []byte(uuid.TimeOrderedUUID()), data: []byte(uuid.TimeOrderedUUID()),