Restructure

cmd/main.go

@@ -12,6 +12,7 @@ import (
 
 	"cloud.google.com/go/compute/metadata"
 	"github.com/connectedcars/auth-wrapper/gcemetadata"
+	"github.com/connectedcars/auth-wrapper/kms/google"
 	"github.com/connectedcars/auth-wrapper/server"
 	"github.com/connectedcars/auth-wrapper/sshagent"
 	"golang.org/x/crypto/ssh"
@@ -78,6 +79,10 @@ func main() {
 	os.Unsetenv("SSH_CA_KEY_PATH")
 	os.Unsetenv("SSH_CA_KEY_PASSWORD")
 
+	if sshCaKeyPath != "" {
+
+	}
+
 	// Run command with SSH Agent
 	var exitCode int
 	var err error
@@ -149,11 +154,11 @@ func createSSHAgent(config *SSHAgentConfig) (sshAgent agent.Agent, err error) {
 		caPrivateKeyPath := config.caPrivateKeyPath[6:]
 
 		// Start the signing server
-		caPrivateKey, err := sshagent.NewKMSSigner(caPrivateKeyPath, false)
+		caPrivateKey, err := google.NewKMSSigner(caPrivateKeyPath, false)
 		if err != nil {
 			return nil, err
 		}
-		caSSHSigner, err := sshagent.NewSSHSignerFromKMSSigner(caPrivateKey)
+		caSSHSigner, err := google.NewSSHSignerFromKMSSigner(caPrivateKey)
 		if err != nil {
 			return nil, fmt.Errorf("failed NewSignerFromSigner from: %v", err)
 		}
@@ -162,7 +167,7 @@ func createSSHAgent(config *SSHAgentConfig) (sshAgent agent.Agent, err error) {
 		}()
 
 		// Setup sshAgent
-		sshAgent, err = sshagent.NewKMSKeyring(userPrivateKeyPath, caPrivateKeyPath, "http://localhost:3080")
+		sshAgent, err = google.NewKMSKeyring(userPrivateKeyPath, caPrivateKeyPath, "http://localhost:3080")
 		if err != nil {
 			return nil, fmt.Errorf("Failed to setup KMS Keyring %s: %v", userPrivateKeyPath, err)
 		}

sshagent/kms-keyring.go → kms/google/kms-keyring.go

@@ -1,4 +1,4 @@
-package sshagent
+package google
 
 // TODO: Make generic so it can be used with other key implementation
 

sshagent/kms-signer.go → kms/google/kms-signer.go

@@ -1,4 +1,4 @@
-package sshagent
+package google
 
 // TODO: Move to google kms package instead
 

sshagent/kms-ssh-signer.go → kms/google/kms-ssh-signer.go

@@ -1,4 +1,4 @@
-package sshagent
+package google
 
 import (
 	"crypto"