Merge pull request #1013 from hashicorp/fix-ssh-tests

Fix SSH tests

builtin/logical/ssh/backend_test.go

@@ -2,9 +2,7 @@ package ssh
 
 import (
 	"fmt"
-	"os"
 	"reflect"
-	"strings"
 	"testing"
 	"time"
 
@@ -17,7 +15,15 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
+// Before the following tests are run, a username going by the name 'vaultssh' has
+// to be created and its ~/.ssh/authorized_keys file should contain the below key.
+//
+// ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9i+hFxZHGo6KblVme4zrAcJstR6I0PTJozW286X4WyvPnkMYDQ5mnhEYC7UWCvjoTWbPEXPX7NjhRtwQTGD67bV+lrxgfyzK1JZbUXK4PwgKJvQD+XyyWYMzDgGSQY61KUSqCxymSm/9NZkPU3ElaQ9xQuTzPpztM4ROfb8f2Yv6/ZESZsTo0MTAkp8Pcy+WkioI/uJ1H7zqs0EA4OMY4aDJRu0UtP4rTVeYNEAuRXdX+eH4aW3KMvhzpFTjMbaJHJXlEeUm2SaX5TNQyTOvghCeQILfYIL/Ca2ij8iwCmulwdV6eQGfd4VDu40PvSnmfoaE38o6HaPnX0kUcnKiT
+
 const (
+	testIP               = "127.0.0.1"
+	testUserName         = "vaultssh"
+	testAdminUser        = "vaultssh"
 	testOTPKeyType       = "otp"
 	testDynamicKeyType   = "dynamic"
 	testCIDRList         = "127.0.0.1/32"
@@ -56,7 +62,10 @@ oOyBJU/HMVvBfv4g+OVFLVgSwwm6owwsouZ0+D/LasbuHqYyqYqdyPJQYzWA2Y+F
 )
 
 func testingFactory(conf *logical.BackendConfig) (logical.Backend, error) {
-	initTest()
+	_, err := vault.StartSSHHostTestServer()
+	if err != nil {
+		panic(fmt.Sprintf("error starting mock server:%s", err))
+	}
 	defaultLeaseTTLVal := 2 * time.Minute
 	maxLeaseTTLVal := 10 * time.Minute
 	return Factory(&logical.BackendConfig{
@@ -69,44 +78,19 @@ func testingFactory(conf *logical.BackendConfig) (logical.Backend, error) {
 	})
 }
 
-var testIP string
+func TestSSHBackend_Lookup(t *testing.T) {
-
+	testOTPRoleData := map[string]interface{}{
-var testUserName string
-var testAdminUser string
-var testOTPRoleData map[string]interface{}
-var testDynamicRoleData map[string]interface{}
-
-// Starts the server and initializes the servers IP address,
-// port and usernames to be used by the test cases.
-func initTest() {
-	addr, err := vault.StartSSHHostTestServer()
-	if err != nil {
-		panic(fmt.Sprintf("error starting mock server:%s", err))
-	}
-	input := strings.Split(addr, ":")
-	testIP = input[0]
-
-	testUserName := os.Getenv("VAULT_SSHTEST_USER")
-	if len(testUserName) == 0 {
-		panic("VAULT_SSHTEST_USER must be set to the desired user")
-	}
-	testAdminUser = testUserName
-
-	testOTPRoleData = map[string]interface{}{
 		"key_type":     testOTPKeyType,
 		"default_user": testUserName,
 		"cidr_list":    testCIDRList,
 	}
-	testDynamicRoleData = map[string]interface{}{
+	testDynamicRoleData := map[string]interface{}{
 		"key_type":     testDynamicKeyType,
 		"key":          testKeyName,
 		"admin_user":   testAdminUser,
 		"default_user": testAdminUser,
 		"cidr_list":    testCIDRList,
 	}
-}
-
-func TestSSHBackend_Lookup(t *testing.T) {
 	data := map[string]interface{}{
 		"ip": testIP,
 	}
@@ -132,6 +116,13 @@ func TestSSHBackend_Lookup(t *testing.T) {
 }
 
 func TestSSHBackend_DynamicKeyCreate(t *testing.T) {
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
 	data := map[string]interface{}{
 		"username": testUserName,
 		"ip":       testIP,
@@ -147,6 +138,11 @@ func TestSSHBackend_DynamicKeyCreate(t *testing.T) {
 }
 
 func TestSSHBackend_OTPRoleCrud(t *testing.T) {
+	testOTPRoleData := map[string]interface{}{
+		"key_type":     testOTPKeyType,
+		"default_user": testUserName,
+		"cidr_list":    testCIDRList,
+	}
 	respOTPRoleData := map[string]interface{}{
 		"key_type":     testOTPKeyType,
 		"port":         22,
@@ -165,6 +161,13 @@ func TestSSHBackend_OTPRoleCrud(t *testing.T) {
 }
 
 func TestSSHBackend_DynamicRoleCrud(t *testing.T) {
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
 	respDynamicRoleData := map[string]interface{}{
 		"cidr_list":      testCIDRList,
 		"port":           22,
@@ -198,6 +201,11 @@ func TestSSHBackend_NamedKeysCrud(t *testing.T) {
 }
 
 func TestSSHBackend_OTPCreate(t *testing.T) {
+	testOTPRoleData := map[string]interface{}{
+		"key_type":     testOTPKeyType,
+		"default_user": testUserName,
+		"cidr_list":    testCIDRList,
+	}
 	data := map[string]interface{}{
 		"username": testUserName,
 		"ip":       testIP,
@@ -227,6 +235,18 @@ func TestSSHBackend_VerifyEcho(t *testing.T) {
 }
 
 func TestSSHBackend_ConfigZeroAddressCRUD(t *testing.T) {
+	testOTPRoleData := map[string]interface{}{
+		"key_type":     testOTPKeyType,
+		"default_user": testUserName,
+		"cidr_list":    testCIDRList,
+	}
+	testDynamicRoleData := map[string]interface{}{
+		"key_type":     testDynamicKeyType,
+		"key":          testKeyName,
+		"admin_user":   testAdminUser,
+		"default_user": testAdminUser,
+		"cidr_list":    testCIDRList,
+	}
 	req1 := map[string]interface{}{
 		"roles": testOTPRoleName,
 	}