Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configuration of spot instances #5

Merged
merged 6 commits into from
Jun 20, 2022
Merged

Configuration of spot instances #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5a0b89
Added security groups and subnet to launch template allowing spot ins…
Jun 16, 2022
d33c831
Merge branch 'main' of https://github.com/GavinBurris42/aws-simple-ec…
Jun 16, 2022
7c5ffd9
Merge branch 'main' of https://github.com/GavinBurris42/aws-simple-ec…
Jun 16, 2022
423e546
Configured spot instances to include VPC, subnet, security groups, EB…
Jun 17, 2022
14753de
Revised duplicate code with data configuration struct
Jun 20, 2022
96b76cf
Refactored Request Instance configuration struct
Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cmd/launch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,15 @@ func launchNonInteractive(h *ec2helper.EC2Helper) {
}

// Launch On-Demand or Spot instance based on capacity type
func LaunchCapacityInstance(h *ec2helper.EC2Helper, simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo, confirmation string) (err error) {
func LaunchCapacityInstance(h *ec2helper.EC2Helper, simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo,
confirmation string) error {
var err error
if simpleConfig.CapacityType == question.DefaultCapacityTypeText.OnDemand {
_, err = h.LaunchInstance(simpleConfig, detailedConfig, confirmation == cli.ResponseYes)
} else {
err = h.LaunchSpotInstance(simpleConfig, detailedConfig, confirmation == cli.ResponseYes, nil)
err = h.LaunchSpotInstance(simpleConfig, detailedConfig, confirmation == cli.ResponseYes)
}
return
return err
}

// Validate flags using some simple rules. Return true if the flags are validated, false otherwise
Expand Down
13 changes: 13 additions & 0 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ type DetailedInfo struct {
TagSpecs []*ec2.TagSpecification
}

type RequestInstanceInfo struct {
ImageId *string
InstanceType *string
SubnetId *string
SecurityGroupIds []*string
IamInstanceProfile *ec2.IamInstanceProfileSpecification
LaunchTemplate *ec2.LaunchTemplateSpecification
BlockDeviceMappings []*ec2.BlockDeviceMapping
LaunchTemplateBlockMappings []*ec2.LaunchTemplateBlockDeviceMappingRequest
InstanceInitiatedShutdownBehavior *string
UserData *string
}

func NewSimpleInfo() *SimpleInfo {
var s SimpleInfo
s.UserTags = make(map[string]string)
Expand Down
223 changes: 127 additions & 96 deletions pkg/ec2helper/ec2helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,77 +992,20 @@ func (h *EC2Helper) ParseConfig(simpleConfig *config.SimpleInfo) (*config.Detail

// Get a RunInstanceInput given a structured config
func getRunInstanceInput(simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo) *ec2.RunInstancesInput {
input := &ec2.RunInstancesInput{
MaxCount: aws.Int64(1),
MinCount: aws.Int64(1),
dataConfig := createRequestInstanceConfig(simpleConfig, detailedConfig)
return &ec2.RunInstancesInput{
MaxCount: aws.Int64(1),
MinCount: aws.Int64(1),
LaunchTemplate: dataConfig.LaunchTemplate,
ImageId: dataConfig.ImageId,
InstanceType: dataConfig.InstanceType,
SubnetId: dataConfig.SubnetId,
SecurityGroupIds: dataConfig.SecurityGroupIds,
IamInstanceProfile: dataConfig.IamInstanceProfile,
BlockDeviceMappings: dataConfig.BlockDeviceMappings,
InstanceInitiatedShutdownBehavior: dataConfig.InstanceInitiatedShutdownBehavior,
UserData: dataConfig.UserData,
}

// Add launch template if present
if simpleConfig.LaunchTemplateId != "" {
input.LaunchTemplate = &ec2.LaunchTemplateSpecification{
LaunchTemplateId: aws.String(simpleConfig.LaunchTemplateId),
Version: aws.String(simpleConfig.LaunchTemplateVersion),
}
}

//Override settings if applicable
if simpleConfig.ImageId != "" {
input.ImageId = aws.String(simpleConfig.ImageId)
}
if simpleConfig.InstanceType != "" {
input.InstanceType = aws.String(simpleConfig.InstanceType)
}
if simpleConfig.SubnetId != "" {
input.SubnetId = aws.String(simpleConfig.SubnetId)
}
if simpleConfig.SecurityGroupIds != nil && len(simpleConfig.SecurityGroupIds) > 0 {
input.SecurityGroupIds = aws.StringSlice(simpleConfig.SecurityGroupIds)
}
if simpleConfig.IamInstanceProfile != "" {
input.IamInstanceProfile = &ec2.IamInstanceProfileSpecification{
Name: aws.String(simpleConfig.IamInstanceProfile),
}
}

setAutoTermination := false
if detailedConfig != nil {
// Set all EBS volumes not to be deleted, if specified
if HasEbsVolume(detailedConfig.Image) && simpleConfig.KeepEbsVolumeAfterTermination {
input.BlockDeviceMappings = detailedConfig.Image.BlockDeviceMappings
for _, block := range input.BlockDeviceMappings {
if block.Ebs != nil {
block.Ebs.DeleteOnTermination = aws.Bool(false)
}
}
}
setAutoTermination = IsLinux(*detailedConfig.Image.PlatformDetails) && simpleConfig.AutoTerminationTimerMinutes > 0
}

if setAutoTermination {
input.InstanceInitiatedShutdownBehavior = aws.String("terminate")
autoTermCmd := fmt.Sprintf("#!/bin/bash\necho \"sudo poweroff\" | at now + %d minutes\n",
simpleConfig.AutoTerminationTimerMinutes)
if simpleConfig.BootScriptFilePath == "" {
input.UserData = aws.String(base64.StdEncoding.EncodeToString([]byte(autoTermCmd)))
} else {
bootScriptRaw, _ := ioutil.ReadFile(simpleConfig.BootScriptFilePath)
bootScriptLines := strings.Split(string(bootScriptRaw), "\n")
//if #!/bin/bash is first, then replace first line otherwise, prepend termination
if len(bootScriptLines) >= 1 && bootScriptLines[0] == "#!/bin/bash" {
bootScriptLines[0] = autoTermCmd
} else {
bootScriptLines = append([]string{autoTermCmd}, bootScriptLines...)
}
bootScriptRaw = []byte(strings.Join(bootScriptLines, "\n"))
input.UserData = aws.String(base64.StdEncoding.EncodeToString(bootScriptRaw))
}
} else {
if simpleConfig.BootScriptFilePath != "" {
bootScriptRaw, _ := ioutil.ReadFile(simpleConfig.BootScriptFilePath)
input.UserData = aws.String(base64.StdEncoding.EncodeToString(bootScriptRaw))
}
}
return input
}

// Get the default string config
Expand Down Expand Up @@ -1166,21 +1109,21 @@ func (h *EC2Helper) LaunchInstance(simpleConfig *config.SimpleInfo, detailedConf
}
}

func (h *EC2Helper) LaunchSpotInstance(simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo, confirmation bool,
template *ec2.LaunchTemplate) (err error) {
func (h *EC2Helper) LaunchSpotInstance(simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo, confirmation bool) error {
var err error
if confirmation {
fmt.Println("Options confirmed! Launching spot instance...")
if template != nil {
_, err = h.LaunchFleet(template.LaunchTemplateId)
if simpleConfig.LaunchTemplateId != "" {
_, err = h.LaunchFleet(aws.String(simpleConfig.LaunchTemplateId))
} else {
template, err = h.CreateLaunchTemplate(simpleConfig)
template, err := h.CreateLaunchTemplate(simpleConfig, detailedConfig)
if err != nil {
if aerr, ok := err.(awserr.Error); ok {
fmt.Println(aerr.Error())
} else {
fmt.Println(err.Error())
}
return
return err
}
_, err = h.LaunchFleet(template.LaunchTemplateId)
err = h.DeleteLaunchTemplate(template.LaunchTemplateId)
Expand All @@ -1190,7 +1133,7 @@ func (h *EC2Helper) LaunchSpotInstance(simpleConfig *config.SimpleInfo, detailed
return errors.New("Options not confirmed")
}

return
return err
}

// Create a new stack and update simpleConfig for config saving
Expand Down Expand Up @@ -1363,49 +1306,137 @@ func HasEbsVolume(image *ec2.Image) bool {
return false
}

func (h *EC2Helper) CreateLaunchTemplate(simpleConfig *config.SimpleInfo) (template *ec2.LaunchTemplate, err error) {
func (h *EC2Helper) CreateLaunchTemplate(simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo) (*ec2.LaunchTemplate, error) {
launchIdentifier := uuid.New()

fmt.Println("Creating Launch Template...")

dataConfig := createRequestInstanceConfig(simpleConfig, detailedConfig)
input := &ec2.CreateLaunchTemplateInput{
LaunchTemplateData: &ec2.RequestLaunchTemplateData{
ImageId: &simpleConfig.ImageId,
InstanceType: &simpleConfig.InstanceType,
NetworkInterfaces: []*ec2.LaunchTemplateInstanceNetworkInterfaceSpecificationRequest{
{
AssociatePublicIpAddress: aws.Bool(true),
DeviceIndex: aws.Int64(0),
Groups: dataConfig.SecurityGroupIds,
SubnetId: dataConfig.SubnetId,
},
},
},
TagSpecifications: []*ec2.TagSpecification{
{
ResourceType: aws.String("launch-template"),
Tags: []*ec2.Tag{
{
Key: aws.String("Name"),
Value: aws.String("Ec2-LaunchTemplate"),
},
},
},
IamInstanceProfile: (*ec2.LaunchTemplateIamInstanceProfileSpecificationRequest)(dataConfig.IamInstanceProfile),
ImageId: dataConfig.ImageId,
InstanceType: dataConfig.InstanceType,
BlockDeviceMappings: dataConfig.LaunchTemplateBlockMappings,
InstanceInitiatedShutdownBehavior: dataConfig.InstanceInitiatedShutdownBehavior,
UserData: dataConfig.UserData,
},
LaunchTemplateName: aws.String(fmt.Sprintf("SimpleEC2LaunchTemplate-%s", launchIdentifier)),
VersionDescription: aws.String(fmt.Sprintf("Launch Template %s", launchIdentifier)),
}

result, err := h.Svc.CreateLaunchTemplate(input)
template = result.LaunchTemplate
return
return result.LaunchTemplate, err
}

func createRequestInstanceConfig(simpleConfig *config.SimpleInfo, detailedConfig *config.DetailedInfo) config.RequestInstanceInfo {
requestInstanceConfig := config.RequestInstanceInfo{}

if simpleConfig.LaunchTemplateId != "" {
requestInstanceConfig.LaunchTemplate = &ec2.LaunchTemplateSpecification{
LaunchTemplateId: aws.String(simpleConfig.LaunchTemplateId),
Version: aws.String(simpleConfig.LaunchTemplateVersion),
}
}

if simpleConfig.ImageId != "" {
requestInstanceConfig.ImageId = aws.String(simpleConfig.ImageId)
}
if simpleConfig.InstanceType != "" {
requestInstanceConfig.InstanceType = aws.String(simpleConfig.InstanceType)
}
if simpleConfig.SubnetId != "" {
requestInstanceConfig.SubnetId = aws.String(simpleConfig.SubnetId)
}
if simpleConfig.SecurityGroupIds != nil && len(simpleConfig.SecurityGroupIds) > 0 {
requestInstanceConfig.SecurityGroupIds = aws.StringSlice(simpleConfig.SecurityGroupIds)
}
if simpleConfig.IamInstanceProfile != "" {
requestInstanceConfig.IamInstanceProfile = &ec2.IamInstanceProfileSpecification{
Name: aws.String(simpleConfig.IamInstanceProfile),
}
}

setAutoTermination := false
if detailedConfig != nil {
// Set all EBS volumes not to be deleted, if specified
if HasEbsVolume(detailedConfig.Image) && simpleConfig.KeepEbsVolumeAfterTermination {
requestInstanceConfig.BlockDeviceMappings = detailedConfig.Image.BlockDeviceMappings
for _, block := range requestInstanceConfig.BlockDeviceMappings {
if block.Ebs != nil {
block.Ebs.DeleteOnTermination = aws.Bool(false)
}
}
blockDevices := []*ec2.LaunchTemplateBlockDeviceMappingRequest{}
for index, block := range detailedConfig.Image.BlockDeviceMappings {
blockDevices = append(blockDevices, &ec2.LaunchTemplateBlockDeviceMappingRequest{
DeviceName: block.DeviceName,
NoDevice: block.NoDevice,
VirtualName: block.VirtualName,
})
if block.Ebs != nil {
blockDeviceEbs := &ec2.LaunchTemplateEbsBlockDeviceRequest{
DeleteOnTermination: aws.Bool(false),
Encrypted: block.Ebs.Encrypted,
Iops: block.Ebs.Iops,
KmsKeyId: block.Ebs.KmsKeyId,
SnapshotId: block.Ebs.SnapshotId,
Throughput: block.Ebs.Throughput,
VolumeSize: block.Ebs.VolumeSize,
VolumeType: block.Ebs.VolumeType,
}
blockDevices[index].SetEbs(blockDeviceEbs)
}
}
requestInstanceConfig.LaunchTemplateBlockMappings = blockDevices
}
setAutoTermination = IsLinux(*detailedConfig.Image.PlatformDetails) && simpleConfig.AutoTerminationTimerMinutes > 0
}

if setAutoTermination {
GavinBurris42 marked this conversation as resolved.
Show resolved Hide resolved
requestInstanceConfig.InstanceInitiatedShutdownBehavior = aws.String("terminate")
autoTermCmd := fmt.Sprintf("#!/bin/bash\necho \"sudo poweroff\" | at now + %d minutes\n",
simpleConfig.AutoTerminationTimerMinutes)
if simpleConfig.BootScriptFilePath == "" {
requestInstanceConfig.UserData = aws.String(base64.StdEncoding.EncodeToString([]byte(autoTermCmd)))
} else {
bootScriptRaw, _ := ioutil.ReadFile(simpleConfig.BootScriptFilePath)
bootScriptLines := strings.Split(string(bootScriptRaw), "\n")
//if #!/bin/bash is first, then replace first line otherwise, prepend termination
if len(bootScriptLines) >= 1 && bootScriptLines[0] == "#!/bin/bash" {
bootScriptLines[0] = autoTermCmd
} else {
bootScriptLines = append([]string{autoTermCmd}, bootScriptLines...)
}
bootScriptRaw = []byte(strings.Join(bootScriptLines, "\n"))
requestInstanceConfig.UserData = aws.String(base64.StdEncoding.EncodeToString(bootScriptRaw))
}
} else {
if simpleConfig.BootScriptFilePath != "" {
bootScriptRaw, _ := ioutil.ReadFile(simpleConfig.BootScriptFilePath)
requestInstanceConfig.UserData = aws.String(base64.StdEncoding.EncodeToString(bootScriptRaw))
}
}

return requestInstanceConfig
}

func (h *EC2Helper) DeleteLaunchTemplate(templateId *string) (err error) {
func (h *EC2Helper) DeleteLaunchTemplate(templateId *string) error {
fmt.Println("Deleting Launch Template...")
input := &ec2.DeleteLaunchTemplateInput{
LaunchTemplateId: templateId,
}

_, err = h.Svc.DeleteLaunchTemplate(input)
return
_, err := h.Svc.DeleteLaunchTemplate(input)
return err
}

func (h *EC2Helper) LaunchFleet(templateId *string) (*ec2.CreateFleetOutput, error) {
Expand Down
20 changes: 15 additions & 5 deletions pkg/ec2helper/ec2helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package ec2helper_test

import (
"errors"
"fmt"
"io/ioutil"
"os"
"testing"
Expand Down Expand Up @@ -230,12 +231,21 @@ func TestGetLaunchTemplateById_DescribeLaunchTemplatesPagesError(t *testing.T) {
}

func TestCreateLaunchTemplate(t *testing.T) {
config := config.NewSimpleInfo()
config.ImageId = "ami-12345"
config.InstanceType = "t2.micro"
config.SubnetId = "subnet-12345"
simpleConfig := &config.SimpleInfo{
ImageId: "ami-12345",
InstanceType: "t2.micro",
SubnetId: "subnet-12345",
}
detailedConfig := &config.DetailedInfo{
Image: &ec2.Image{
ImageId: aws.String("ami-12345"),
PlatformDetails: aws.String("test deatils"),
},
}
fmt.Println(*detailedConfig)
fmt.Println(*detailedConfig.Image)
testEC2.Svc = &th.MockedEC2Svc{}
testEC2.CreateLaunchTemplate(config)
testEC2.CreateLaunchTemplate(simpleConfig, detailedConfig)

templates := []*ec2.LaunchTemplate{}

Expand Down