Skip to content

Touch up defaults and add target option #2

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

Merged
merged 4 commits into from
Jun 13, 2025
Merged

Touch up defaults and add target option #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a97afc
Use WithDefaultRegion instead of looking up the env var ourselves
odarbelaeze Jun 13, 2025
e98f601
Add target option
odarbelaeze Jun 13, 2025
2afd46c
Fix typos
odarbelaeze Jun 13, 2025
eadfc4a
Bump the version
odarbelaeze Jun 13, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ship-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
platforms: linux/amd64,linux/arm64
tags: |
nextroll/rightsizer:v3
nextroll/rightsizer:v3.0
nextroll/rightsizer:v3.0.0
nextroll/rightsizer:v3.1
nextroll/rightsizer:v3.1.0

- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
33 changes: 18 additions & 15 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ import (
"gopkg.in/yaml.v3"
)

const (
defaultTarget = 60.0
)

func main() {
defaultDuration, _ := time.ParseDuration("336h")

app := &cli.Command{
Name: "rigthsizer",
Usage: "Right size your AWS ECS services.",
Version: "3.0.0",
Version: "3.1.0",
HideHelpCommand: true,
ArgsUsage: "<cluster> <service>",
UseShortOptionHandling: true,
Expand All @@ -40,7 +44,13 @@ func main() {
&cli.StringFlag{
Name: "region",
Aliases: []string{"r"},
Usage: "AWS `REGION` to use",
Usage: "AWS region to use",
},
&cli.FloatFlag{
Name: "target",
Aliases: []string{"g"},
Value: defaultTarget,
Usage: "Target resource utilization percentage",
},
},

Expand All @@ -57,23 +67,15 @@ func main() {
return errors.New("cannot see into the future just yet")
}

region := cmd.String("region")
if region == "" {
region = os.Getenv("AWS_REGION")
}

if region == "" {
return errors.New("cannot determine AWS region, checked the --region flag and the AWS_REGION environment variable")
}

cfg, err := config.LoadDefaultConfig(ctx, config.WithRegion(region))
defaultRegion := cmd.String("region")
cfg, err := config.LoadDefaultConfig(ctx, config.WithDefaultRegion(defaultRegion))
if err != nil {
return fmt.Errorf("unable to load SDK config, %v", err)
}

awsCloudwatchClient := cloudwatch.NewFromConfig(cfg)
cloutwatchClient := clients.NewCloudWatchClient(awsCloudwatchClient)
usageService := services.NewUsageService(cloutwatchClient)
cloudwatchClient := clients.NewCloudWatchClient(awsCloudwatchClient)
usageService := services.NewUsageService(cloudwatchClient)

awsEcsClient := ecs.NewFromConfig(cfg)
ecsClient := clients.NewECSClient(awsEcsClient)
Expand All @@ -98,7 +100,8 @@ func main() {
return fmt.Errorf("failed to get allocation: %w", err)
}

newAllocation := allocation.Fix(usage, &models.Usage{CPU: 90, Memory: 90})
target := cmd.Float("target")
newAllocation := allocation.Fix(usage, &models.Usage{CPU: target, Memory: target})

bytes, err := yaml.Marshal(newAllocation)
if err != nil {
Expand Down