From 74a3fd12d052e719b8374b52f94b70310933605f Mon Sep 17 00:00:00 2001
From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:12:15 -0400
Subject: [PATCH] Fix typos, remove TODOs, upgrade version

---
 builtin/aws/ecs/plugin.pb.go | 3 +--
 builtin/aws/ecs/plugin.proto | 3 +--
 builtin/docker/plugin.pb.go  | 9 ++-------
 builtin/pack/plugin.pb.go    | 9 ++-------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/builtin/aws/ecs/plugin.pb.go b/builtin/aws/ecs/plugin.pb.go
index 114a18de62f..0fafd53bde5 100644
--- a/builtin/aws/ecs/plugin.pb.go
+++ b/builtin/aws/ecs/plugin.pb.go
@@ -172,7 +172,6 @@ func (x *Release) GetLoadBalancerArn() string {
 }
 
 // Resource contains the internal resource states.
-// TODO(izaak): Audit these - make sure we're using all of it.
 type Resource struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -732,7 +731,7 @@ type Resource_Subnets struct {
 	unknownFields protoimpl.UnknownFields
 
 	Subnets []*Resource_Subnets_Subnet `protobuf:"bytes,1,rep,name=subnets,proto3" json:"subnets,omitempty"`
-	// Currently, the subnet resource is responsible for discovering which VPC we;re running in,
+	// Currently, the subnet resource is responsible for discovering which VPC we're running in,
 	// because we determine it by describing either the default subnets or the user-specified subnets.
 	VpcId string `protobuf:"bytes,2,opt,name=vpc_id,json=vpcId,proto3" json:"vpc_id,omitempty"`
 }
diff --git a/builtin/aws/ecs/plugin.proto b/builtin/aws/ecs/plugin.proto
index 2bfff1450cd..a64d20f2da9 100644
--- a/builtin/aws/ecs/plugin.proto
+++ b/builtin/aws/ecs/plugin.proto
@@ -22,7 +22,6 @@ message Release {
 }
 
 // Resource contains the internal resource states.
-// TODO(izaak): Audit these - make sure we're using all of it.
 message Resource {
   message Cluster {
     string name = 1;
@@ -83,7 +82,7 @@ message Resource {
       string id = 1;
     }
 
-    // Currently, the subnet resource is responsible for discovering which VPC we;re running in,
+    // Currently, the subnet resource is responsible for discovering which VPC we're running in,
     // because we determine it by describing either the default subnets or the user-specified subnets.
     string vpc_id = 2;
   }
diff --git a/builtin/docker/plugin.pb.go b/builtin/docker/plugin.pb.go
index 31056d1677f..f531e50df84 100644
--- a/builtin/docker/plugin.pb.go
+++ b/builtin/docker/plugin.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.17.3
+// 	protoc-gen-go v1.26.0
+// 	protoc        v3.15.8
 // source: waypoint/builtin/docker/plugin.proto
 
 package docker
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	anypb "google.golang.org/protobuf/types/known/anypb"
@@ -23,10 +22,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 // Image is the artifact type for the registry.
 type Image struct {
 	state         protoimpl.MessageState
diff --git a/builtin/pack/plugin.pb.go b/builtin/pack/plugin.pb.go
index f1ba844b0e7..af35e01db52 100644
--- a/builtin/pack/plugin.pb.go
+++ b/builtin/pack/plugin.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.17.3
+// 	protoc-gen-go v1.26.0
+// 	protoc        v3.15.8
 // source: waypoint/builtin/pack/plugin.proto
 
 package pack
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 // DockerImage is the artifact type for the builder.
 type DockerImage struct {
 	state         protoimpl.MessageState