Consolidate EBS and VPC tags

ebs_tags.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"github.com/bporter816/aws-tui/repo"
+	"github.com/bporter816/aws-tui/ui"
+	"github.com/bporter816/aws-tui/view"
+)
+
+type EBSTags struct {
+	*ui.Table
+	view.EBS
+	resourceId string
+	repo       *repo.EC2
+	app        *Application
+}
+
+func NewEBSTags(resourceId string, repo *repo.EC2, app *Application) *EBSTags {
+	e := &EBSTags{
+		Table: ui.NewTable([]string{
+			"KEY",
+			"VALUE",
+		}, 1, 0),
+		resourceId: resourceId,
+		repo:       repo,
+		app:        app,
+	}
+	return e
+}
+
+func (e EBSTags) GetLabels() []string {
+	return []string{e.resourceId, "Tags"}
+}
+
+func (e EBSTags) GetKeyActions() []KeyAction {
+	return []KeyAction{}
+}
+
+func (e EBSTags) Render() {
+	model, err := e.repo.ListTags(e.resourceId)
+	if err != nil {
+		panic(err)
+	}
+
+	var data [][]string
+	for _, v := range model {
+		data = append(data, []string{
+			v.Key,
+			v.Value,
+		})
+	}
+	e.SetData(data)
+}

ebs_volumes.go

@@ -44,7 +44,7 @@ func (e EBSVolumes) tagsHandler() {
 	if err != nil {
 		return
 	}
-	tagsView := NewEBSVolumeTags(id, e.repo, e.app)
+	tagsView := NewEBSTags(id, e.repo, e.app)
 	e.app.AddAndSwitch(tagsView)
 }
 

repo/ec2.go

@@ -220,46 +220,6 @@ func (e EC2) ListReservedInstances(filters []ec2Types.Filter) ([]model.EC2Reserv
 	return reservedInstances, nil
 }
 
-func (e EC2) ListVPCTags(vpcId string) (model.Tags, error) {
-	out, err := e.ec2Client.DescribeVpcs(
-		context.TODO(),
-		&ec2.DescribeVpcsInput{
-			VpcIds: []string{vpcId},
-		},
-	)
-	if err != nil {
-		return model.Tags{}, err
-	}
-	if len(out.Vpcs) != 1 {
-		return model.Tags{}, errors.New("should get exactly 1 vpc")
-	}
-	var tags model.Tags
-	for _, v := range out.Vpcs[0].Tags {
-		tags = append(tags, model.Tag{Key: *v.Key, Value: *v.Value})
-	}
-	return tags, nil
-}
-
-func (e EC2) ListSubnetTags(subnetId string) (model.Tags, error) {
-	out, err := e.ec2Client.DescribeSubnets(
-		context.TODO(),
-		&ec2.DescribeSubnetsInput{
-			SubnetIds: []string{subnetId},
-		},
-	)
-	if err != nil {
-		return model.Tags{}, err
-	}
-	if len(out.Subnets) != 1 {
-		return model.Tags{}, errors.New("should get exactly 1 subnet")
-	}
-	var tags model.Tags
-	for _, v := range out.Subnets[0].Tags {
-		tags = append(tags, model.Tag{Key: *v.Key, Value: *v.Value})
-	}
-	return tags, nil
-}
-
 func (e EC2) ListInternetGateways() ([]model.EC2InternetGateway, error) {
 	pg := ec2.NewDescribeInternetGatewaysPaginator(
 		e.ec2Client,
@@ -298,26 +258,6 @@ func (e EC2) ListInternetGatewayAttachments(internetGatewayId string) ([]model.E
 	return attachments, nil
 }
 
-func (e EC2) ListInternetGatewayTags(internetGatewayId string) (model.Tags, error) {
-	out, err := e.ec2Client.DescribeInternetGateways(
-		context.TODO(),
-		&ec2.DescribeInternetGatewaysInput{
-			InternetGatewayIds: []string{internetGatewayId},
-		},
-	)
-	if err != nil {
-		return model.Tags{}, err
-	}
-	if len(out.InternetGateways) != 1 {
-		return model.Tags{}, errors.New("should get exactly 1 internet gateway")
-	}
-	var tags model.Tags
-	for _, v := range out.InternetGateways[0].Tags {
-		tags = append(tags, model.Tag{Key: *v.Key, Value: *v.Value})
-	}
-	return tags, nil
-}
-
 func (e EC2) ListVolumes(filters []ec2Types.Filter) ([]model.EC2Volume, error) {
 	pg := ec2.NewDescribeVolumesPaginator(
 		e.ec2Client,

vpc_internet_gateways.go

@@ -48,7 +48,7 @@ func (e VPCInternetGateways) tagsHandler() {
 	if err != nil {
 		return
 	}
-	tagsView := NewVPCInternetGatewayTags(e.repo, internetGatewayId, e.app)
+	tagsView := NewVPCTags(e.repo, internetGatewayId, e.app)
 	e.app.AddAndSwitch(tagsView)
 }
 

vpc_subnets.go

@@ -50,7 +50,7 @@ func (e VPCSubnets) tagsHandler() {
 	if err != nil {
 		return
 	}
-	tagsView := NewVPCSubnetTags(e.repo, subnetId, e.app)
+	tagsView := NewVPCTags(e.repo, subnetId, e.app)
 	e.app.AddAndSwitch(tagsView)
 }
 

vpc_tags.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"github.com/bporter816/aws-tui/repo"
+	"github.com/bporter816/aws-tui/ui"
+	"github.com/bporter816/aws-tui/view"
+)
+
+type VPCTags struct {
+	*ui.Table
+	view.VPC
+	repo       *repo.EC2
+	resourceId string
+	app        *Application
+}
+
+func NewVPCTags(repo *repo.EC2, resourceId string, app *Application) *VPCTags {
+	e := &VPCTags{
+		Table: ui.NewTable([]string{
+			"KEY",
+			"VALUE",
+		}, 1, 0),
+		repo:       repo,
+		resourceId: resourceId,
+		app:        app,
+	}
+	return e
+}
+
+func (e VPCTags) GetLabels() []string {
+	return []string{e.resourceId, "Tags"}
+}
+
+func (e VPCTags) GetKeyActions() []KeyAction {
+	return []KeyAction{}
+}
+
+func (e VPCTags) Render() {
+	model, err := e.repo.ListTags(e.resourceId)
+	if err != nil {
+		panic(err)
+	}
+
+	var data [][]string
+	for _, v := range model {
+		data = append(data, []string{
+			v.Key,
+			v.Value,
+		})
+	}
+	e.SetData(data)
+}