Allow EC2 instances to specify a key name

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
inlets · Aug 31, 2023 · d1f5c7a · d1f5c7a
1 parent 5d460da
commit d1f5c7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/provision/ec2.go b/provision/ec2.go
@@ -46,6 +46,8 @@ func (p *EC2Provisioner) Provision(host BasicHost) (*ProvisionedHost, error) {
 
 	ports := host.Additional["ports"]
 
+	keyName := host.Additional["key-name"]
+
 	extraPorts, err := parsePorts(ports)
 	if err != nil {
 		return nil, err
@@ -69,8 +71,7 @@ func (p *EC2Provisioner) Provision(host BasicHost) (*ProvisionedHost, error) {
 	if len(subnetID) > 0 {
 		networkSpec.SubnetId = aws.String(subnetID)
 	}
-
-	runResult, err := p.ec2Provisioner.RunInstances(&ec2.RunInstancesInput{
+	runInput := &ec2.RunInstancesInput{
 		ImageId:      image,
 		InstanceType: aws.String(host.Plan),
 		MinCount:     aws.Int64(1),
@@ -79,7 +80,13 @@ func (p *EC2Provisioner) Provision(host BasicHost) (*ProvisionedHost, error) {
 		NetworkInterfaces: []*ec2.InstanceNetworkInterfaceSpecification{
 			&networkSpec,
 		},
-	})
+	}
+
+	if len(keyName) > 0 {
+		runInput.KeyName = aws.String(keyName)
+	}
+
+	runResult, err := p.ec2Provisioner.RunInstances(runInput)
 	if err != nil {
 		// clean up SG if there was an issue provisioning the EC2 instance
 		input := ec2.DeleteSecurityGroupInput{

diff --git a/provision/packet.go → provision/equinix_metal.go b/provision/packet.go → provision/equinix_metal.go