add dedicated hosts pruning to aws-janitor

Co-authored-by: Julio Faerman <[email protected]>

Author: rvanderp3

aws-janitor/resources/dedicated_host.go

@@ -0,0 +1,109 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resources
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/pkg/errors"
+
+	"github.com/sirupsen/logrus"
+)
+
+// Dedicated Hosts: https://docs.aws.amazon.com/sdk-for-go/api/service/ec2/#EC2.DescribeDedicatedHosts
+
+type DedicatedHosts struct{}
+
+func (DedicatedHosts) MarkAndSweep(opts Options, set *Set) error {
+	logger := logrus.WithField("options", opts)
+	svc := ec2.New(opts.Session, aws.NewConfig().WithRegion(opts.Region))
+
+	inp := &ec2.DescribeHostsInput{}
+
+	var toDelete []*string // Paged call, defer deletion until we have the whole list.
+
+	pageFunc := func(page *ec2.DescribeHostsOutput, _ bool) bool {
+		for _, _host := range page.Hosts {
+			h := &host{
+				Account: opts.Account,
+				Region:  opts.Region,
+				HostID:  *_host.HostId,
+			}
+			tags := fromEC2Tags(_host.Tags)
+
+			if !set.Mark(opts, h, _host.AllocationTime, tags) {
+				continue
+			}
+
+			logger.Warningf("%s: deleting %T: %s (%s)", h.ARN(), _host, h.HostID, tags[NameTagKey])
+			if !opts.DryRun {
+				toDelete = append(toDelete, _host.HostId)
+			}
+		}
+		return true
+	}
+
+	if err := svc.DescribeHostsPages(inp, pageFunc); err != nil {
+		return err
+	}
+
+	if len(toDelete) > 0 {
+		if _, err := svc.ReleaseHosts(&ec2.ReleaseHostsInput{HostIds: toDelete}); err != nil {
+			logger.Warningf("Release failed for Hosts: %s : %v", strings.Join(aws.StringValueSlice(toDelete), ", "), err)
+		}
+	}
+	return nil
+}
+
+func (DedicatedHosts) ListAll(opts Options) (*Set, error) {
+	svc := ec2.New(opts.Session, aws.NewConfig().WithRegion(opts.Region))
+	set := NewSet(0)
+	inp := &ec2.DescribeHostsInput{}
+
+	err := svc.DescribeHostsPages(inp, func(Hosts *ec2.DescribeHostsOutput, _ bool) bool {
+		for _, _host := range Hosts.Hosts {
+			now := time.Now()
+			arn := instance{
+				Account:    opts.Account,
+				Region:     opts.Region,
+				InstanceID: *_host.HostId,
+			}.ARN()
+
+			set.firstSeen[arn] = now
+		}
+		return true
+	})
+	return set, errors.Wrapf(err, "couldn't describe DedicatedHosts for %q in %q", opts.Account, opts.Region)
+}
+
+type host struct {
+	Account string
+	Region  string
+	HostID  string
+}
+
+func (h host) ARN() string {
+	return fmt.Sprintf("arn:aws:ec2:%s:%s:host/%s", h.Region, h.Account, h.HostID)
+}
+
+func (h host) ResourceKey() string {
+	return h.ARN()
+}

aws-janitor/resources/list.go

@@ -104,6 +104,7 @@ var RegionalTypeList = []Type{
 	TargetGroups{},
 	KeyPairs{},
 	S3Bucket{},
+	DedicatedHosts{},
 }
 
 // Non-regional AWS resource types, in dependency order