Merge pull request #429 from cpanato/GH-349

🏃tests: Load SSH public key from file via env var AZURE_SSH_PUBLIC_KEY_FILE

Author: k8s-ci-robot

docs/development.md

@@ -24,6 +24,7 @@
     - [Executing unit tests](#executing-unit-tests)
   - [Automated Testing](#automated-testing)
     - [Mocks](#mocks)
+    - [E2E Testing](#e2e-testing)
 
 <!-- /TOC -->
 
@@ -220,6 +221,16 @@ To generate the mocks you can run
 make generate-go
 ```
 
+#### E2E Testing
+
+To run E2E locally, set `AZURE_CLIENT_ID`, `AZURE_CLIENT_SECRET`, `AZURE_SUBSCRIPTION_ID`, `AZURE_TENANT_ID` and run:
+
+```bash
+./scripts/ci-e2e.sh
+```
+
+You can optionally set `AZURE_SSH_PUBLIC_KEY_FILE` to use your own ssh key.
+
 <!-- References -->
 
 [jq]: https://stedolan.github.io/jq/download/
@@ -232,4 +243,4 @@ make generate-go
 [pyenv]: https://github.com/pyenv/pyenv
 [kustomize]: https://github.com/kubernetes-sigs/kustomize
 [kustomizelinux]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/INSTALL.md
-[gomock]: https://github.com/golang/mock
+[gomock]: https://github.com/golang/mock

test/e2e/resource_generators.go

@@ -24,6 +24,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"log"
 	random "math/rand"
 	"os"
@@ -253,15 +254,30 @@ func cloudConfig(clusterName string, creds auth.Creds) string {
 }
 
 func sshkey() (string, error) {
-	// TODO Load from AZURE_SSH_PUBLIC_KEY_FILE if set
-	prv, err := rsa.GenerateKey(rand.Reader, 2048)
-	if err != nil {
-		return "", errors.Wrap(err, "Failed to generate private key")
-	}
-	pub, err := ssh.NewPublicKey(&prv.PublicKey)
-	if err != nil {
-		return "", errors.Wrap(err, "Failed to generate public key")
+	var pub ssh.PublicKey
+
+	if os.Getenv("AZURE_SSH_PUBLIC_KEY_FILE") != "" {
+		authorizedKeysBytes, err := ioutil.ReadFile(os.Getenv("AZURE_SSH_PUBLIC_KEY_FILE"))
+		if err != nil {
+			return "", errors.Wrap(err, "Failed to load public key provided via environment variable")
+		}
+
+		// double checking if the public key provided is valid
+		pub, _, _, _, err = ssh.ParseAuthorizedKey(authorizedKeysBytes)
+		if err != nil {
+			return "", errors.Wrap(err, "Failed to parse public key provided via environment variable")
+		}
+	} else {
+		prv, err := rsa.GenerateKey(rand.Reader, 2048)
+		if err != nil {
+			return "", errors.Wrap(err, "Failed to generate private key")
+		}
+		pub, err = ssh.NewPublicKey(&prv.PublicKey)
+		if err != nil {
+			return "", errors.Wrap(err, "Failed to generate public key")
+		}
 	}
+
 	return base64.StdEncoding.EncodeToString(ssh.MarshalAuthorizedKey(pub)), nil
 }