Merge pull request #533 from hazelops/IZE-674-ssh-public-key-and-ssh-…

…private-key-present-in-schema-as-env-vars-parmeters
hazelops · Nov 11, 2022 · d660a10 · d660a10
2 parents 4bf9ad9 + ccd9972
commit d660a10
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/internal/commands/tunnel_up.go b/internal/commands/tunnel_up.go
@@ -137,6 +137,14 @@ func (o *TunnelUpOptions) Complete() error {
 		os.Exit(0)
 	}
 
+	if o.PrivateKeyFile == "" && o.Config.Tunnel != nil {
+		o.PrivateKeyFile = o.Config.Tunnel.SSHPrivateKey
+	}
+
+	if o.PublicKeyFile == "" && o.Config.Tunnel != nil {
+		o.PublicKeyFile = o.Config.Tunnel.SSHPublicKey
+	}
+
 	if o.PrivateKeyFile == "" {
 		home, _ := os.UserHomeDir()
 		o.PrivateKeyFile = fmt.Sprintf("%s/.ssh/id_rsa", home)

diff --git a/internal/config/infra.go b/internal/config/infra.go
@@ -20,4 +20,6 @@ type Terraform struct {
 type Tunnel struct {
 	BastionInstanceID string   `mapstructure:"bastion_instance_id,omitempty"`
 	ForwardHost       []string `mapstructure:"forward_host,omitempty"`
+	SSHPublicKey      string   `mapstructure:"ssh_public_key,omitempty"`
+	SSHPrivateKey     string   `mapstructure:"ssh_private_key,omitempty"`
 }
diff --git a/internal/schema/ize-spec.json b/internal/schema/ize-spec.json
@@ -105,6 +105,14 @@
                         "type": "string",
                         "description": "Forward host."
                     }
+                },
+                "ssh_private_key": {
+                    "type": "string",
+                    "description": "(optional) Path to SSH private key. Default: {user_home_directory}/.ssh/id_rsa"
+                },
+                "ssh_public_key": {
+                    "type": "string",
+                    "description": "(optional) Path to SSH public key. Default: {user_home_directory}/.ssh/id_rsa.pub"
                 }
             },
             "description": "Tunnel configuration.",