See how Boundary would look with gofumpt applied (#853)

* See how Boundary would look with https://github.com/mvdan/gofumpt applied

Results of running `gofumpt -w -s .`

* Update tools file and Makefile for gofumpt

Co-authored-by: Jeff Mitchell <jeffrey.mitchell@gmail.com>

internal/gen/controller/api/resources/accounts/account.pb.go

@@ -7,6 +7,9 @@
 package accounts
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -14,8 +17,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -299,15 +300,18 @@ func file_controller_api_resources_accounts_v1_account_proto_rawDescGZIP() []byt
 	return file_controller_api_resources_accounts_v1_account_proto_rawDescData
 }
 
-var file_controller_api_resources_accounts_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_accounts_v1_account_proto_goTypes = []interface{}{
-	(*Account)(nil),                   // 0: controller.api.resources.accounts.v1.Account
-	(*PasswordAccountAttributes)(nil), // 1: controller.api.resources.accounts.v1.PasswordAccountAttributes
-	(*scopes.ScopeInfo)(nil),          // 2: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil),      // 3: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),       // 4: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),            // 5: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_accounts_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_accounts_v1_account_proto_goTypes  = []interface{}{
+		(*Account)(nil),                   // 0: controller.api.resources.accounts.v1.Account
+		(*PasswordAccountAttributes)(nil), // 1: controller.api.resources.accounts.v1.PasswordAccountAttributes
+		(*scopes.ScopeInfo)(nil),          // 2: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil),      // 3: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),       // 4: google.protobuf.Timestamp
+		(*_struct.Struct)(nil),            // 5: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_accounts_v1_account_proto_depIdxs = []int32{
 	2, // 0: controller.api.resources.accounts.v1.Account.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	3, // 1: controller.api.resources.accounts.v1.Account.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/authmethods/auth_method.pb.go

@@ -7,6 +7,9 @@
 package authmethods
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -14,8 +17,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -305,15 +306,18 @@ func file_controller_api_resources_authmethods_v1_auth_method_proto_rawDescGZIP(
 	return file_controller_api_resources_authmethods_v1_auth_method_proto_rawDescData
 }
 
-var file_controller_api_resources_authmethods_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_authmethods_v1_auth_method_proto_goTypes = []interface{}{
-	(*AuthMethod)(nil),                   // 0: controller.api.resources.authmethods.v1.AuthMethod
-	(*PasswordAuthMethodAttributes)(nil), // 1: controller.api.resources.authmethods.v1.PasswordAuthMethodAttributes
-	(*scopes.ScopeInfo)(nil),             // 2: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil),         // 3: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),          // 4: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),               // 5: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_authmethods_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_authmethods_v1_auth_method_proto_goTypes  = []interface{}{
+		(*AuthMethod)(nil),                   // 0: controller.api.resources.authmethods.v1.AuthMethod
+		(*PasswordAuthMethodAttributes)(nil), // 1: controller.api.resources.authmethods.v1.PasswordAuthMethodAttributes
+		(*scopes.ScopeInfo)(nil),             // 2: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil),         // 3: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),          // 4: google.protobuf.Timestamp
+		(*_struct.Struct)(nil),               // 5: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_authmethods_v1_auth_method_proto_depIdxs = []int32{
 	2, // 0: controller.api.resources.authmethods.v1.AuthMethod.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	3, // 1: controller.api.resources.authmethods.v1.AuthMethod.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/authtokens/authtoken.pb.go

@@ -7,13 +7,14 @@
 package authtokens
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "github.com/golang/protobuf/ptypes/wrappers"
 	scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -232,12 +233,15 @@ func file_controller_api_resources_authtokens_v1_authtoken_proto_rawDescGZIP() [
 	return file_controller_api_resources_authtokens_v1_authtoken_proto_rawDescData
 }
 
-var file_controller_api_resources_authtokens_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_controller_api_resources_authtokens_v1_authtoken_proto_goTypes = []interface{}{
-	(*AuthToken)(nil),           // 0: controller.api.resources.authtokens.v1.AuthToken
-	(*scopes.ScopeInfo)(nil),    // 1: controller.api.resources.scopes.v1.ScopeInfo
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
-}
+var (
+	file_controller_api_resources_authtokens_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+	file_controller_api_resources_authtokens_v1_authtoken_proto_goTypes  = []interface{}{
+		(*AuthToken)(nil),           // 0: controller.api.resources.authtokens.v1.AuthToken
+		(*scopes.ScopeInfo)(nil),    // 1: controller.api.resources.scopes.v1.ScopeInfo
+		(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	}
+)
+
 var file_controller_api_resources_authtokens_v1_authtoken_proto_depIdxs = []int32{
 	1, // 0: controller.api.resources.authtokens.v1.AuthToken.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	2, // 1: controller.api.resources.authtokens.v1.AuthToken.created_time:type_name -> google.protobuf.Timestamp

internal/gen/controller/api/resources/groups/group.pb.go

@@ -7,14 +7,15 @@
 package groups
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes"
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -288,14 +289,17 @@ func file_controller_api_resources_groups_v1_group_proto_rawDescGZIP() []byte {
 	return file_controller_api_resources_groups_v1_group_proto_rawDescData
 }
 
-var file_controller_api_resources_groups_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_groups_v1_group_proto_goTypes = []interface{}{
-	(*Member)(nil),               // 0: controller.api.resources.groups.v1.Member
-	(*Group)(nil),                // 1: controller.api.resources.groups.v1.Group
-	(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
-}
+var (
+	file_controller_api_resources_groups_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_groups_v1_group_proto_goTypes  = []interface{}{
+		(*Member)(nil),               // 0: controller.api.resources.groups.v1.Member
+		(*Group)(nil),                // 1: controller.api.resources.groups.v1.Group
+		(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
+	}
+)
+
 var file_controller_api_resources_groups_v1_group_proto_depIdxs = []int32{
 	2, // 0: controller.api.resources.groups.v1.Group.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	3, // 1: controller.api.resources.groups.v1.Group.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go

@@ -7,6 +7,9 @@
 package hostcatalogs
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -14,8 +17,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -232,14 +233,17 @@ func file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_rawDescGZI
 	return file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_rawDescData
 }
 
-var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_goTypes = []interface{}{
-	(*HostCatalog)(nil),          // 0: controller.api.resources.hostcatalogs.v1.HostCatalog
-	(*scopes.ScopeInfo)(nil),     // 1: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),       // 4: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+	file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_goTypes  = []interface{}{
+		(*HostCatalog)(nil),          // 0: controller.api.resources.hostcatalogs.v1.HostCatalog
+		(*scopes.ScopeInfo)(nil),     // 1: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
+		(*_struct.Struct)(nil),       // 4: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_depIdxs = []int32{
 	1, // 0: controller.api.resources.hostcatalogs.v1.HostCatalog.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	2, // 1: controller.api.resources.hostcatalogs.v1.HostCatalog.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/hosts/host.pb.go

@@ -7,6 +7,9 @@
 package hosts
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -14,8 +17,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -297,15 +298,18 @@ func file_controller_api_resources_hosts_v1_host_proto_rawDescGZIP() []byte {
 	return file_controller_api_resources_hosts_v1_host_proto_rawDescData
 }
 
-var file_controller_api_resources_hosts_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_hosts_v1_host_proto_goTypes = []interface{}{
-	(*Host)(nil),                 // 0: controller.api.resources.hosts.v1.Host
-	(*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes
-	(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),       // 5: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_hosts_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_hosts_v1_host_proto_goTypes  = []interface{}{
+		(*Host)(nil),                 // 0: controller.api.resources.hosts.v1.Host
+		(*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes
+		(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
+		(*_struct.Struct)(nil),       // 5: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_hosts_v1_host_proto_depIdxs = []int32{
 	2, // 0: controller.api.resources.hosts.v1.Host.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	3, // 1: controller.api.resources.hosts.v1.Host.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/hostsets/host_set.pb.go

@@ -7,6 +7,9 @@
 package hostsets
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -15,8 +18,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -245,14 +246,17 @@ func file_controller_api_resources_hostsets_v1_host_set_proto_rawDescGZIP() []by
 	return file_controller_api_resources_hostsets_v1_host_set_proto_rawDescData
 }
 
-var file_controller_api_resources_hostsets_v1_host_set_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_controller_api_resources_hostsets_v1_host_set_proto_goTypes = []interface{}{
-	(*HostSet)(nil),              // 0: controller.api.resources.hostsets.v1.HostSet
-	(*scopes.ScopeInfo)(nil),     // 1: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),       // 4: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_hostsets_v1_host_set_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+	file_controller_api_resources_hostsets_v1_host_set_proto_goTypes  = []interface{}{
+		(*HostSet)(nil),              // 0: controller.api.resources.hostsets.v1.HostSet
+		(*scopes.ScopeInfo)(nil),     // 1: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
+		(*_struct.Struct)(nil),       // 4: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_hostsets_v1_host_set_proto_depIdxs = []int32{
 	1, // 0: controller.api.resources.hostsets.v1.HostSet.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	2, // 1: controller.api.resources.hostsets.v1.HostSet.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/roles/role.pb.go

@@ -7,14 +7,15 @@
 package roles
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes"
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -484,16 +485,19 @@ func file_controller_api_resources_roles_v1_role_proto_rawDescGZIP() []byte {
 	return file_controller_api_resources_roles_v1_role_proto_rawDescData
 }
 
-var file_controller_api_resources_roles_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_controller_api_resources_roles_v1_role_proto_goTypes = []interface{}{
-	(*Principal)(nil),            // 0: controller.api.resources.roles.v1.Principal
-	(*GrantJson)(nil),            // 1: controller.api.resources.roles.v1.GrantJson
-	(*Grant)(nil),                // 2: controller.api.resources.roles.v1.Grant
-	(*Role)(nil),                 // 3: controller.api.resources.roles.v1.Role
-	(*scopes.ScopeInfo)(nil),     // 4: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 6: google.protobuf.Timestamp
-}
+var (
+	file_controller_api_resources_roles_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+	file_controller_api_resources_roles_v1_role_proto_goTypes  = []interface{}{
+		(*Principal)(nil),            // 0: controller.api.resources.roles.v1.Principal
+		(*GrantJson)(nil),            // 1: controller.api.resources.roles.v1.GrantJson
+		(*Grant)(nil),                // 2: controller.api.resources.roles.v1.Grant
+		(*Role)(nil),                 // 3: controller.api.resources.roles.v1.Role
+		(*scopes.ScopeInfo)(nil),     // 4: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 6: google.protobuf.Timestamp
+	}
+)
+
 var file_controller_api_resources_roles_v1_role_proto_depIdxs = []int32{
 	1, // 0: controller.api.resources.roles.v1.Grant.json:type_name -> controller.api.resources.roles.v1.GrantJson
 	4, // 1: controller.api.resources.roles.v1.Role.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo

internal/gen/controller/api/resources/scopes/scope.pb.go

@@ -7,13 +7,14 @@
 package scopes
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -303,13 +304,16 @@ func file_controller_api_resources_scopes_v1_scope_proto_rawDescGZIP() []byte {
 	return file_controller_api_resources_scopes_v1_scope_proto_rawDescData
 }
 
-var file_controller_api_resources_scopes_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_scopes_v1_scope_proto_goTypes = []interface{}{
-	(*ScopeInfo)(nil),            // 0: controller.api.resources.scopes.v1.ScopeInfo
-	(*Scope)(nil),                // 1: controller.api.resources.scopes.v1.Scope
-	(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
-}
+var (
+	file_controller_api_resources_scopes_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_scopes_v1_scope_proto_goTypes  = []interface{}{
+		(*ScopeInfo)(nil),            // 0: controller.api.resources.scopes.v1.ScopeInfo
+		(*Scope)(nil),                // 1: controller.api.resources.scopes.v1.Scope
+		(*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
+	}
+)
+
 var file_controller_api_resources_scopes_v1_scope_proto_depIdxs = []int32{
 	0, // 0: controller.api.resources.scopes.v1.Scope.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	2, // 1: controller.api.resources.scopes.v1.Scope.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/sessions/session.pb.go

@@ -7,6 +7,9 @@
 package sessions
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_ "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "github.com/golang/protobuf/ptypes/wrappers"
@@ -15,8 +18,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -459,14 +460,17 @@ func file_controller_api_resources_sessions_v1_session_proto_rawDescGZIP() []byt
 	return file_controller_api_resources_sessions_v1_session_proto_rawDescData
 }
 
-var file_controller_api_resources_sessions_v1_session_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_controller_api_resources_sessions_v1_session_proto_goTypes = []interface{}{
-	(*WorkerInfo)(nil),          // 0: controller.api.resources.sessions.v1.WorkerInfo
-	(*SessionState)(nil),        // 1: controller.api.resources.sessions.v1.SessionState
-	(*Session)(nil),             // 2: controller.api.resources.sessions.v1.Session
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
-	(*scopes.ScopeInfo)(nil),    // 4: controller.api.resources.scopes.v1.ScopeInfo
-}
+var (
+	file_controller_api_resources_sessions_v1_session_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+	file_controller_api_resources_sessions_v1_session_proto_goTypes  = []interface{}{
+		(*WorkerInfo)(nil),          // 0: controller.api.resources.sessions.v1.WorkerInfo
+		(*SessionState)(nil),        // 1: controller.api.resources.sessions.v1.SessionState
+		(*Session)(nil),             // 2: controller.api.resources.sessions.v1.Session
+		(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+		(*scopes.ScopeInfo)(nil),    // 4: controller.api.resources.scopes.v1.ScopeInfo
+	}
+)
+
 var file_controller_api_resources_sessions_v1_session_proto_depIdxs = []int32{
 	3, // 0: controller.api.resources.sessions.v1.SessionState.start_time:type_name -> google.protobuf.Timestamp
 	3, // 1: controller.api.resources.sessions.v1.SessionState.end_time:type_name -> google.protobuf.Timestamp

internal/gen/controller/api/resources/targets/target.pb.go

@@ -7,6 +7,9 @@
 package targets
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
@@ -14,8 +17,6 @@ import (
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -786,21 +787,24 @@ func file_controller_api_resources_targets_v1_target_proto_rawDescGZIP() []byte
 	return file_controller_api_resources_targets_v1_target_proto_rawDescData
 }
 
-var file_controller_api_resources_targets_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_controller_api_resources_targets_v1_target_proto_goTypes = []interface{}{
-	(*HostSet)(nil),                  // 0: controller.api.resources.targets.v1.HostSet
-	(*Target)(nil),                   // 1: controller.api.resources.targets.v1.Target
-	(*TcpTargetAttributes)(nil),      // 2: controller.api.resources.targets.v1.TcpTargetAttributes
-	(*WorkerInfo)(nil),               // 3: controller.api.resources.targets.v1.WorkerInfo
-	(*SessionAuthorizationData)(nil), // 4: controller.api.resources.targets.v1.SessionAuthorizationData
-	(*SessionAuthorization)(nil),     // 5: controller.api.resources.targets.v1.SessionAuthorization
-	(*scopes.ScopeInfo)(nil),         // 6: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil),     // 7: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),      // 8: google.protobuf.Timestamp
-	(*wrappers.UInt32Value)(nil),     // 9: google.protobuf.UInt32Value
-	(*wrappers.Int32Value)(nil),      // 10: google.protobuf.Int32Value
-	(*_struct.Struct)(nil),           // 11: google.protobuf.Struct
-}
+var (
+	file_controller_api_resources_targets_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+	file_controller_api_resources_targets_v1_target_proto_goTypes  = []interface{}{
+		(*HostSet)(nil),                  // 0: controller.api.resources.targets.v1.HostSet
+		(*Target)(nil),                   // 1: controller.api.resources.targets.v1.Target
+		(*TcpTargetAttributes)(nil),      // 2: controller.api.resources.targets.v1.TcpTargetAttributes
+		(*WorkerInfo)(nil),               // 3: controller.api.resources.targets.v1.WorkerInfo
+		(*SessionAuthorizationData)(nil), // 4: controller.api.resources.targets.v1.SessionAuthorizationData
+		(*SessionAuthorization)(nil),     // 5: controller.api.resources.targets.v1.SessionAuthorization
+		(*scopes.ScopeInfo)(nil),         // 6: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil),     // 7: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),      // 8: google.protobuf.Timestamp
+		(*wrappers.UInt32Value)(nil),     // 9: google.protobuf.UInt32Value
+		(*wrappers.Int32Value)(nil),      // 10: google.protobuf.Int32Value
+		(*_struct.Struct)(nil),           // 11: google.protobuf.Struct
+	}
+)
+
 var file_controller_api_resources_targets_v1_target_proto_depIdxs = []int32{
 	6,  // 0: controller.api.resources.targets.v1.Target.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	7,  // 1: controller.api.resources.targets.v1.Target.name:type_name -> google.protobuf.StringValue

internal/gen/controller/api/resources/users/user.pb.go

@@ -7,14 +7,15 @@
 package users
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes"
 	_ "github.com/hashicorp/boundary/internal/gen/controller/protooptions"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -288,14 +289,17 @@ func file_controller_api_resources_users_v1_user_proto_rawDescGZIP() []byte {
 	return file_controller_api_resources_users_v1_user_proto_rawDescData
 }
 
-var file_controller_api_resources_users_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_controller_api_resources_users_v1_user_proto_goTypes = []interface{}{
-	(*Account)(nil),              // 0: controller.api.resources.users.v1.Account
-	(*User)(nil),                 // 1: controller.api.resources.users.v1.User
-	(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
-	(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
-	(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
-}
+var (
+	file_controller_api_resources_users_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+	file_controller_api_resources_users_v1_user_proto_goTypes  = []interface{}{
+		(*Account)(nil),              // 0: controller.api.resources.users.v1.Account
+		(*User)(nil),                 // 1: controller.api.resources.users.v1.User
+		(*scopes.ScopeInfo)(nil),     // 2: controller.api.resources.scopes.v1.ScopeInfo
+		(*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue
+		(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
+	}
+)
+
 var file_controller_api_resources_users_v1_user_proto_depIdxs = []int32{
 	2, // 0: controller.api.resources.users.v1.User.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo
 	3, // 1: controller.api.resources.users.v1.User.name:type_name -> google.protobuf.StringValue