Run make gen after the gofumpt update

Makefile

@@ -74,7 +74,7 @@ endif
 perms-table:
 	@go run internal/website/permstable/permstable.go
 
-gen: cleangen proto api migrations
+gen: cleangen proto api migrations fmt
 
 migrations:
 	$(MAKE) --environment-overrides -C internal/db/migrations/genmigrations migrations

internal/auth/password/store/argon2.pb.go

@@ -9,12 +9,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -371,15 +370,12 @@ func file_controller_storage_auth_password_store_v1_argon2_proto_rawDescGZIP() [
 	return file_controller_storage_auth_password_store_v1_argon2_proto_rawDescData
 }
 
-var (
-	file_controller_storage_auth_password_store_v1_argon2_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_auth_password_store_v1_argon2_proto_goTypes  = []interface{}{
-		(*Argon2Configuration)(nil), // 0: controller.storage.auth.password.store.v1.Argon2Configuration
-		(*Argon2Credential)(nil),    // 1: controller.storage.auth.password.store.v1.Argon2Credential
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_auth_password_store_v1_argon2_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_auth_password_store_v1_argon2_proto_goTypes = []interface{}{
+	(*Argon2Configuration)(nil), // 0: controller.storage.auth.password.store.v1.Argon2Configuration
+	(*Argon2Credential)(nil),    // 1: controller.storage.auth.password.store.v1.Argon2Credential
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_auth_password_store_v1_argon2_proto_depIdxs = []int32{
 	2, // 0: controller.storage.auth.password.store.v1.Argon2Configuration.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.auth.password.store.v1.Argon2Credential.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/auth/password/store/password.pb.go

@@ -9,13 +9,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -460,16 +459,13 @@ func file_controller_storage_auth_password_store_v1_password_proto_rawDescGZIP()
 	return file_controller_storage_auth_password_store_v1_password_proto_rawDescData
 }
 
-var (
-	file_controller_storage_auth_password_store_v1_password_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-	file_controller_storage_auth_password_store_v1_password_proto_goTypes  = []interface{}{
-		(*AuthMethod)(nil),          // 0: controller.storage.auth.password.store.v1.AuthMethod
-		(*Account)(nil),             // 1: controller.storage.auth.password.store.v1.Account
-		(*Credential)(nil),          // 2: controller.storage.auth.password.store.v1.Credential
-		(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_auth_password_store_v1_password_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_controller_storage_auth_password_store_v1_password_proto_goTypes = []interface{}{
+	(*AuthMethod)(nil),          // 0: controller.storage.auth.password.store.v1.AuthMethod
+	(*Account)(nil),             // 1: controller.storage.auth.password.store.v1.Account
+	(*Credential)(nil),          // 2: controller.storage.auth.password.store.v1.Credential
+	(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_auth_password_store_v1_password_proto_depIdxs = []int32{
 	3, // 0: controller.storage.auth.password.store.v1.AuthMethod.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	3, // 1: controller.storage.auth.password.store.v1.AuthMethod.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/auth/store/account.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -143,13 +142,10 @@ func file_controller_storage_auth_store_v1_account_proto_rawDescGZIP() []byte {
 	return file_controller_storage_auth_store_v1_account_proto_rawDescData
 }
 
-var (
-	file_controller_storage_auth_store_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_auth_store_v1_account_proto_goTypes  = []interface{}{
-		(*Account)(nil), // 0: controller.storage.auth.store.v1.Account
-	}
-)
-
+var file_controller_storage_auth_store_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_auth_store_v1_account_proto_goTypes = []interface{}{
+	(*Account)(nil), // 0: controller.storage.auth.store.v1.Account
+}
 var file_controller_storage_auth_store_v1_account_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/auth/store/auth_method.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -200,14 +199,11 @@ func file_controller_storage_auth_store_v1_auth_method_proto_rawDescGZIP() []byt
 	return file_controller_storage_auth_store_v1_auth_method_proto_rawDescData
 }
 
-var (
-	file_controller_storage_auth_store_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_auth_store_v1_auth_method_proto_goTypes  = []interface{}{
-		(*AuthMethod)(nil),  // 0: controller.storage.auth.store.v1.AuthMethod
-		(*AuthAccount)(nil), // 1: controller.storage.auth.store.v1.AuthAccount
-	}
-)
-
+var file_controller_storage_auth_store_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_auth_store_v1_auth_method_proto_goTypes = []interface{}{
+	(*AuthMethod)(nil),  // 0: controller.storage.auth.store.v1.AuthMethod
+	(*AuthAccount)(nil), // 1: controller.storage.auth.store.v1.AuthAccount
+}
 var file_controller_storage_auth_store_v1_auth_method_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/authtoken/store/authtoken.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -255,14 +254,11 @@ func file_controller_storage_authtoken_store_v1_authtoken_proto_rawDescGZIP() []
 	return file_controller_storage_authtoken_store_v1_authtoken_proto_rawDescData
 }
 
-var (
-	file_controller_storage_authtoken_store_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_authtoken_store_v1_authtoken_proto_goTypes  = []interface{}{
-		(*AuthToken)(nil),           // 0: controller.storage.authtoken.store.v1.AuthToken
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_authtoken_store_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_authtoken_store_v1_authtoken_proto_goTypes = []interface{}{
+	(*AuthToken)(nil),           // 0: controller.storage.authtoken.store.v1.AuthToken
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_authtoken_store_v1_authtoken_proto_depIdxs = []int32{
 	1, // 0: controller.storage.authtoken.store.v1.AuthToken.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.storage.authtoken.store.v1.AuthToken.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/db/db_test/db_test.pb.go

@@ -11,12 +11,11 @@
 package db_test
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -556,17 +555,14 @@ func file_controller_storage_db_db_test_v1_db_test_proto_rawDescGZIP() []byte {
 	return file_controller_storage_db_db_test_v1_db_test_proto_rawDescData
 }
 
-var (
-	file_controller_storage_db_db_test_v1_db_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-	file_controller_storage_db_db_test_v1_db_test_proto_goTypes  = []interface{}{
-		(*StoreTestUser)(nil),       // 0: controller.storage.db.db_test.v1.StoreTestUser
-		(*StoreTestCar)(nil),        // 1: controller.storage.db.db_test.v1.StoreTestCar
-		(*StoreTestRental)(nil),     // 2: controller.storage.db.db_test.v1.StoreTestRental
-		(*StoreTestScooter)(nil),    // 3: controller.storage.db.db_test.v1.StoreTestScooter
-		(*timestamp.Timestamp)(nil), // 4: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_db_db_test_v1_db_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_controller_storage_db_db_test_v1_db_test_proto_goTypes = []interface{}{
+	(*StoreTestUser)(nil),       // 0: controller.storage.db.db_test.v1.StoreTestUser
+	(*StoreTestCar)(nil),        // 1: controller.storage.db.db_test.v1.StoreTestCar
+	(*StoreTestRental)(nil),     // 2: controller.storage.db.db_test.v1.StoreTestRental
+	(*StoreTestScooter)(nil),    // 3: controller.storage.db.db_test.v1.StoreTestScooter
+	(*timestamp.Timestamp)(nil), // 4: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_db_db_test_v1_db_test_proto_depIdxs = []int32{
 	4, // 0: controller.storage.db.db_test.v1.StoreTestUser.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	4, // 1: controller.storage.db.db_test.v1.StoreTestUser.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/db/timestamp/timestamp.pb.go

@@ -7,12 +7,11 @@
 package timestamp
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -108,14 +107,11 @@ func file_controller_storage_timestamp_v1_timestamp_proto_rawDescGZIP() []byte {
 	return file_controller_storage_timestamp_v1_timestamp_proto_rawDescData
 }
 
-var (
-	file_controller_storage_timestamp_v1_timestamp_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_timestamp_v1_timestamp_proto_goTypes  = []interface{}{
-		(*Timestamp)(nil),           // 0: controller.storage.timestamp.v1.Timestamp
-		(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
-	}
-)
-
+var file_controller_storage_timestamp_v1_timestamp_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_timestamp_v1_timestamp_proto_goTypes = []interface{}{
+	(*Timestamp)(nil),           // 0: controller.storage.timestamp.v1.Timestamp
+	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+}
 var file_controller_storage_timestamp_v1_timestamp_proto_depIdxs = []int32{
 	1, // 0: controller.storage.timestamp.v1.Timestamp.timestamp:type_name -> google.protobuf.Timestamp
 	1, // [1:1] is the sub-list for method output_type

internal/gen/controller/api/error.pb.go

@@ -7,11 +7,10 @@
 package api
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -321,16 +320,13 @@ func file_controller_api_v1_error_proto_rawDescGZIP() []byte {
 	return file_controller_api_v1_error_proto_rawDescData
 }
 
-var (
-	file_controller_api_v1_error_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-	file_controller_api_v1_error_proto_goTypes  = []interface{}{
-		(*WrappedError)(nil), // 0: controller.api.v1.WrappedError
-		(*ErrorDetails)(nil), // 1: controller.api.v1.ErrorDetails
-		(*FieldError)(nil),   // 2: controller.api.v1.FieldError
-		(*Error)(nil),        // 3: controller.api.v1.Error
-	}
-)
-
+var file_controller_api_v1_error_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_controller_api_v1_error_proto_goTypes = []interface{}{
+	(*WrappedError)(nil), // 0: controller.api.v1.WrappedError
+	(*ErrorDetails)(nil), // 1: controller.api.v1.ErrorDetails
+	(*FieldError)(nil),   // 2: controller.api.v1.FieldError
+	(*Error)(nil),        // 3: controller.api.v1.Error
+}
 var file_controller_api_v1_error_proto_depIdxs = []int32{
 	2, // 0: controller.api.v1.ErrorDetails.request_fields:type_name -> controller.api.v1.FieldError
 	0, // 1: controller.api.v1.ErrorDetails.wrapped_errors:type_name -> controller.api.v1.WrappedError

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

@@ -7,9 +7,6 @@
 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"
@@ -17,6 +14,8 @@ 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 (
@@ -300,18 +299,15 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -17,6 +14,8 @@ 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 (
@@ -306,18 +305,15 @@ 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)
-	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)
+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_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,14 +7,13 @@
 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 (
@@ -233,15 +232,12 @@ 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)
-	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)
+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_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,15 +7,14 @@
 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 (
@@ -289,17 +288,14 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -17,6 +14,8 @@ 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 (
@@ -233,17 +232,14 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -17,6 +14,8 @@ 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 (
@@ -298,18 +297,15 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -18,6 +15,8 @@ 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 (
@@ -246,17 +245,14 @@ 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)
-	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)
+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_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,15 +7,14 @@
 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 (
@@ -485,19 +484,16 @@ 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)
-	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)
+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_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,14 +7,13 @@
 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 (
@@ -304,16 +303,13 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -18,6 +15,8 @@ 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 (
@@ -460,17 +459,14 @@ 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)
-	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)
+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_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,9 +7,6 @@
 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"
@@ -17,6 +14,8 @@ 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 (
@@ -787,24 +786,21 @@ 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)
-	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)
+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_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,15 +7,14 @@
 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 (
@@ -289,17 +288,14 @@ 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)
-	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)
+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_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

internal/gen/controller/api/services/account_service.pb.go

@@ -7,9 +7,6 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/golang/protobuf/ptypes/wrappers"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	accounts "github.com/hashicorp/boundary/internal/gen/controller/api/resources/accounts"
@@ -17,6 +14,8 @@ import (
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -946,28 +945,25 @@ func file_controller_api_services_v1_account_service_proto_rawDescGZIP() []byte
 	return file_controller_api_services_v1_account_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_account_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
-	file_controller_api_services_v1_account_service_proto_goTypes  = []interface{}{
-		(*GetAccountRequest)(nil),      // 0: controller.api.services.v1.GetAccountRequest
-		(*GetAccountResponse)(nil),     // 1: controller.api.services.v1.GetAccountResponse
-		(*ListAccountsRequest)(nil),    // 2: controller.api.services.v1.ListAccountsRequest
-		(*ListAccountsResponse)(nil),   // 3: controller.api.services.v1.ListAccountsResponse
-		(*CreateAccountRequest)(nil),   // 4: controller.api.services.v1.CreateAccountRequest
-		(*CreateAccountResponse)(nil),  // 5: controller.api.services.v1.CreateAccountResponse
-		(*UpdateAccountRequest)(nil),   // 6: controller.api.services.v1.UpdateAccountRequest
-		(*UpdateAccountResponse)(nil),  // 7: controller.api.services.v1.UpdateAccountResponse
-		(*DeleteAccountRequest)(nil),   // 8: controller.api.services.v1.DeleteAccountRequest
-		(*DeleteAccountResponse)(nil),  // 9: controller.api.services.v1.DeleteAccountResponse
-		(*SetPasswordRequest)(nil),     // 10: controller.api.services.v1.SetPasswordRequest
-		(*SetPasswordResponse)(nil),    // 11: controller.api.services.v1.SetPasswordResponse
-		(*ChangePasswordRequest)(nil),  // 12: controller.api.services.v1.ChangePasswordRequest
-		(*ChangePasswordResponse)(nil), // 13: controller.api.services.v1.ChangePasswordResponse
-		(*accounts.Account)(nil),       // 14: controller.api.resources.accounts.v1.Account
-		(*field_mask.FieldMask)(nil),   // 15: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_account_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_controller_api_services_v1_account_service_proto_goTypes = []interface{}{
+	(*GetAccountRequest)(nil),      // 0: controller.api.services.v1.GetAccountRequest
+	(*GetAccountResponse)(nil),     // 1: controller.api.services.v1.GetAccountResponse
+	(*ListAccountsRequest)(nil),    // 2: controller.api.services.v1.ListAccountsRequest
+	(*ListAccountsResponse)(nil),   // 3: controller.api.services.v1.ListAccountsResponse
+	(*CreateAccountRequest)(nil),   // 4: controller.api.services.v1.CreateAccountRequest
+	(*CreateAccountResponse)(nil),  // 5: controller.api.services.v1.CreateAccountResponse
+	(*UpdateAccountRequest)(nil),   // 6: controller.api.services.v1.UpdateAccountRequest
+	(*UpdateAccountResponse)(nil),  // 7: controller.api.services.v1.UpdateAccountResponse
+	(*DeleteAccountRequest)(nil),   // 8: controller.api.services.v1.DeleteAccountRequest
+	(*DeleteAccountResponse)(nil),  // 9: controller.api.services.v1.DeleteAccountResponse
+	(*SetPasswordRequest)(nil),     // 10: controller.api.services.v1.SetPasswordRequest
+	(*SetPasswordResponse)(nil),    // 11: controller.api.services.v1.SetPasswordResponse
+	(*ChangePasswordRequest)(nil),  // 12: controller.api.services.v1.ChangePasswordRequest
+	(*ChangePasswordResponse)(nil), // 13: controller.api.services.v1.ChangePasswordResponse
+	(*accounts.Account)(nil),       // 14: controller.api.resources.accounts.v1.Account
+	(*field_mask.FieldMask)(nil),   // 15: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_account_service_proto_depIdxs = []int32{
 	14, // 0: controller.api.services.v1.GetAccountResponse.item:type_name -> controller.api.resources.accounts.v1.Account
 	14, // 1: controller.api.services.v1.ListAccountsResponse.items:type_name -> controller.api.resources.accounts.v1.Account

internal/gen/controller/api/services/account_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_AccountService_GetAccount_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetAccountRequest
@@ -56,6 +54,7 @@ func request_AccountService_GetAccount_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.GetAccount(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_GetAccount_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_AccountService_GetAccount_0(ctx context.Context, marshaler ru
 
 	msg, err := server.GetAccount(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_AccountService_ListAccounts_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_AccountService_ListAccounts_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_AccountService_ListAccounts_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListAccountsRequest
@@ -98,6 +100,7 @@ func request_AccountService_ListAccounts_0(ctx context.Context, marshaler runtim
 
 	msg, err := client.ListAccounts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_ListAccounts_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_AccountService_ListAccounts_0(ctx context.Context, marshaler
 
 	msg, err := server.ListAccounts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AccountService_CreateAccount_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_AccountService_CreateAccount_0(ctx context.Context, marshaler runti
 
 	msg, err := client.CreateAccount(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_CreateAccount_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_AccountService_CreateAccount_0(ctx context.Context, marshaler
 
 	msg, err := server.CreateAccount(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_AccountService_UpdateAccount_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_AccountService_UpdateAccount_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_AccountService_UpdateAccount_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateAccountRequest
@@ -194,6 +202,7 @@ func request_AccountService_UpdateAccount_0(ctx context.Context, marshaler runti
 
 	msg, err := client.UpdateAccount(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_UpdateAccount_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_AccountService_UpdateAccount_0(ctx context.Context, marshaler
 
 	msg, err := server.UpdateAccount(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AccountService_DeleteAccount_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_AccountService_DeleteAccount_0(ctx context.Context, marshaler runti
 
 	msg, err := client.DeleteAccount(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_DeleteAccount_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_AccountService_DeleteAccount_0(ctx context.Context, marshaler
 
 	msg, err := server.DeleteAccount(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AccountService_SetPassword_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_AccountService_SetPassword_0(ctx context.Context, marshaler runtime
 
 	msg, err := client.SetPassword(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_SetPassword_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_AccountService_SetPassword_0(ctx context.Context, marshaler r
 
 	msg, err := server.SetPassword(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AccountService_ChangePassword_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_AccountService_ChangePassword_0(ctx context.Context, marshaler runt
 
 	msg, err := client.ChangePassword(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AccountService_ChangePassword_0(ctx context.Context, marshaler runtime.Marshaler, server AccountServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_AccountService_ChangePassword_0(ctx context.Context, marshale
 
 	msg, err := server.ChangePassword(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterAccountServiceHandlerServer registers the http handlers for service AccountService to "mux".
@@ -430,6 +446,7 @@ func local_request_AccountService_ChangePassword_0(ctx context.Context, marshale
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterAccountServiceHandlerFromEndpoint instead.
 func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server AccountServiceServer) error {
+
 	mux.Handle("GET", pattern_AccountService_GetAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -450,6 +467,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_GetAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_GetAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AccountService_ListAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -472,6 +490,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_ListAccounts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_CreateAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -494,6 +513,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_CreateAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_CreateAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_AccountService_UpdateAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -516,6 +536,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_UpdateAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_UpdateAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AccountService_DeleteAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -538,6 +559,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_DeleteAccount_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_SetPassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -560,6 +582,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_SetPassword_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_SetPassword_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_ChangePassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -582,6 +605,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_ChangePassword_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_ChangePassword_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -624,6 +648,7 @@ func RegisterAccountServiceHandler(ctx context.Context, mux *runtime.ServeMux, c
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "AccountServiceClient" to call the correct interceptors.
 func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client AccountServiceClient) error {
+
 	mux.Handle("GET", pattern_AccountService_GetAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -641,6 +666,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_GetAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_GetAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AccountService_ListAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -660,6 +686,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_ListAccounts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_CreateAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -679,6 +706,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_CreateAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_CreateAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_AccountService_UpdateAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -698,6 +726,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_UpdateAccount_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_UpdateAccount_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AccountService_DeleteAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -717,6 +746,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_DeleteAccount_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_SetPassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -736,6 +766,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_SetPassword_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_SetPassword_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AccountService_ChangePassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -755,6 +786,7 @@ func RegisterAccountServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_AccountService_ChangePassword_0(ctx, mux, outboundMarshaler, w, req, response_AccountService_ChangePassword_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/account_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -171,32 +170,27 @@ type AccountServiceServer interface {
 }
 
 // UnimplementedAccountServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedAccountServiceServer struct{}
+type UnimplementedAccountServiceServer struct {
+}
 
 func (UnimplementedAccountServiceServer) GetAccount(context.Context, *GetAccountRequest) (*GetAccountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetAccount not implemented")
 }
-
 func (UnimplementedAccountServiceServer) ListAccounts(context.Context, *ListAccountsRequest) (*ListAccountsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAccounts not implemented")
 }
-
 func (UnimplementedAccountServiceServer) CreateAccount(context.Context, *CreateAccountRequest) (*CreateAccountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateAccount not implemented")
 }
-
 func (UnimplementedAccountServiceServer) UpdateAccount(context.Context, *UpdateAccountRequest) (*UpdateAccountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateAccount not implemented")
 }
-
 func (UnimplementedAccountServiceServer) DeleteAccount(context.Context, *DeleteAccountRequest) (*DeleteAccountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAccount not implemented")
 }
-
 func (UnimplementedAccountServiceServer) SetPassword(context.Context, *SetPasswordRequest) (*SetPasswordResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetPassword not implemented")
 }
-
 func (UnimplementedAccountServiceServer) ChangePassword(context.Context, *ChangePasswordRequest) (*ChangePasswordResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChangePassword not implemented")
 }

internal/gen/controller/api/services/auth_method_service.pb.go

@@ -7,9 +7,6 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	authmethods "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods"
@@ -18,6 +15,8 @@ import (
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -887,29 +886,26 @@ func file_controller_api_services_v1_auth_method_service_proto_rawDescGZIP() []b
 	return file_controller_api_services_v1_auth_method_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_auth_method_service_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
-	file_controller_api_services_v1_auth_method_service_proto_goTypes  = []interface{}{
-		(*GetAuthMethodRequest)(nil),     // 0: controller.api.services.v1.GetAuthMethodRequest
-		(*GetAuthMethodResponse)(nil),    // 1: controller.api.services.v1.GetAuthMethodResponse
-		(*ListAuthMethodsRequest)(nil),   // 2: controller.api.services.v1.ListAuthMethodsRequest
-		(*ListAuthMethodsResponse)(nil),  // 3: controller.api.services.v1.ListAuthMethodsResponse
-		(*CreateAuthMethodRequest)(nil),  // 4: controller.api.services.v1.CreateAuthMethodRequest
-		(*CreateAuthMethodResponse)(nil), // 5: controller.api.services.v1.CreateAuthMethodResponse
-		(*UpdateAuthMethodRequest)(nil),  // 6: controller.api.services.v1.UpdateAuthMethodRequest
-		(*UpdateAuthMethodResponse)(nil), // 7: controller.api.services.v1.UpdateAuthMethodResponse
-		(*DeleteAuthMethodRequest)(nil),  // 8: controller.api.services.v1.DeleteAuthMethodRequest
-		(*DeleteAuthMethodResponse)(nil), // 9: controller.api.services.v1.DeleteAuthMethodResponse
-		(*PasswordCredentials)(nil),      // 10: controller.api.services.v1.PasswordCredentials
-		(*AuthenticateRequest)(nil),      // 11: controller.api.services.v1.AuthenticateRequest
-		(*AuthenticateResponse)(nil),     // 12: controller.api.services.v1.AuthenticateResponse
-		(*authmethods.AuthMethod)(nil),   // 13: controller.api.resources.authmethods.v1.AuthMethod
-		(*field_mask.FieldMask)(nil),     // 14: google.protobuf.FieldMask
-		(*_struct.Struct)(nil),           // 15: google.protobuf.Struct
-		(*authtokens.AuthToken)(nil),     // 16: controller.api.resources.authtokens.v1.AuthToken
-	}
-)
-
+var file_controller_api_services_v1_auth_method_service_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_controller_api_services_v1_auth_method_service_proto_goTypes = []interface{}{
+	(*GetAuthMethodRequest)(nil),     // 0: controller.api.services.v1.GetAuthMethodRequest
+	(*GetAuthMethodResponse)(nil),    // 1: controller.api.services.v1.GetAuthMethodResponse
+	(*ListAuthMethodsRequest)(nil),   // 2: controller.api.services.v1.ListAuthMethodsRequest
+	(*ListAuthMethodsResponse)(nil),  // 3: controller.api.services.v1.ListAuthMethodsResponse
+	(*CreateAuthMethodRequest)(nil),  // 4: controller.api.services.v1.CreateAuthMethodRequest
+	(*CreateAuthMethodResponse)(nil), // 5: controller.api.services.v1.CreateAuthMethodResponse
+	(*UpdateAuthMethodRequest)(nil),  // 6: controller.api.services.v1.UpdateAuthMethodRequest
+	(*UpdateAuthMethodResponse)(nil), // 7: controller.api.services.v1.UpdateAuthMethodResponse
+	(*DeleteAuthMethodRequest)(nil),  // 8: controller.api.services.v1.DeleteAuthMethodRequest
+	(*DeleteAuthMethodResponse)(nil), // 9: controller.api.services.v1.DeleteAuthMethodResponse
+	(*PasswordCredentials)(nil),      // 10: controller.api.services.v1.PasswordCredentials
+	(*AuthenticateRequest)(nil),      // 11: controller.api.services.v1.AuthenticateRequest
+	(*AuthenticateResponse)(nil),     // 12: controller.api.services.v1.AuthenticateResponse
+	(*authmethods.AuthMethod)(nil),   // 13: controller.api.resources.authmethods.v1.AuthMethod
+	(*field_mask.FieldMask)(nil),     // 14: google.protobuf.FieldMask
+	(*_struct.Struct)(nil),           // 15: google.protobuf.Struct
+	(*authtokens.AuthToken)(nil),     // 16: controller.api.resources.authtokens.v1.AuthToken
+}
 var file_controller_api_services_v1_auth_method_service_proto_depIdxs = []int32{
 	13, // 0: controller.api.services.v1.GetAuthMethodResponse.item:type_name -> controller.api.resources.authmethods.v1.AuthMethod
 	13, // 1: controller.api.services.v1.ListAuthMethodsResponse.items:type_name -> controller.api.resources.authmethods.v1.AuthMethod

internal/gen/controller/api/services/auth_method_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_AuthMethodService_GetAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetAuthMethodRequest
@@ -56,6 +54,7 @@ func request_AuthMethodService_GetAuthMethod_0(ctx context.Context, marshaler ru
 
 	msg, err := client.GetAuthMethod(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_GetAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_AuthMethodService_GetAuthMethod_0(ctx context.Context, marsha
 
 	msg, err := server.GetAuthMethod(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_AuthMethodService_ListAuthMethods_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_AuthMethodService_ListAuthMethods_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_AuthMethodService_ListAuthMethods_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListAuthMethodsRequest
@@ -98,6 +100,7 @@ func request_AuthMethodService_ListAuthMethods_0(ctx context.Context, marshaler
 
 	msg, err := client.ListAuthMethods(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_ListAuthMethods_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_AuthMethodService_ListAuthMethods_0(ctx context.Context, mars
 
 	msg, err := server.ListAuthMethods(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, marshaler
 
 	msg, err := client.CreateAuthMethod(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, mar
 
 	msg, err := server.CreateAuthMethod(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_AuthMethodService_UpdateAuthMethod_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_AuthMethodService_UpdateAuthMethod_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateAuthMethodRequest
@@ -194,6 +202,7 @@ func request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, marshaler
 
 	msg, err := client.UpdateAuthMethod(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, mar
 
 	msg, err := server.UpdateAuthMethod(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AuthMethodService_DeleteAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_AuthMethodService_DeleteAuthMethod_0(ctx context.Context, marshaler
 
 	msg, err := client.DeleteAuthMethod(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_DeleteAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_AuthMethodService_DeleteAuthMethod_0(ctx context.Context, mar
 
 	msg, err := server.DeleteAuthMethod(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AuthMethodService_Authenticate_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_AuthMethodService_Authenticate_0(ctx context.Context, marshaler run
 
 	msg, err := client.Authenticate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthMethodService_Authenticate_0(ctx context.Context, marshaler runtime.Marshaler, server AuthMethodServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_AuthMethodService_Authenticate_0(ctx context.Context, marshal
 
 	msg, err := server.Authenticate(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterAuthMethodServiceHandlerServer registers the http handlers for service AuthMethodService to "mux".
@@ -364,6 +378,7 @@ func local_request_AuthMethodService_Authenticate_0(ctx context.Context, marshal
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterAuthMethodServiceHandlerFromEndpoint instead.
 func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server AuthMethodServiceServer) error {
+
 	mux.Handle("GET", pattern_AuthMethodService_GetAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -384,6 +399,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_GetAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_GetAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AuthMethodService_ListAuthMethods_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -406,6 +422,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_ListAuthMethods_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AuthMethodService_CreateAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -428,6 +445,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_CreateAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_CreateAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_AuthMethodService_UpdateAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -450,6 +468,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_UpdateAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_UpdateAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AuthMethodService_DeleteAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -472,6 +491,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_DeleteAuthMethod_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AuthMethodService_Authenticate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -494,6 +514,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_Authenticate_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_Authenticate_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -536,6 +557,7 @@ func RegisterAuthMethodServiceHandler(ctx context.Context, mux *runtime.ServeMux
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "AuthMethodServiceClient" to call the correct interceptors.
 func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client AuthMethodServiceClient) error {
+
 	mux.Handle("GET", pattern_AuthMethodService_GetAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -553,6 +575,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_GetAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_GetAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AuthMethodService_ListAuthMethods_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -572,6 +595,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_ListAuthMethods_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AuthMethodService_CreateAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -591,6 +615,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_CreateAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_CreateAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_AuthMethodService_UpdateAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -610,6 +635,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_UpdateAuthMethod_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_UpdateAuthMethod_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AuthMethodService_DeleteAuthMethod_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -629,6 +655,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_DeleteAuthMethod_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_AuthMethodService_Authenticate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -648,6 +675,7 @@ func RegisterAuthMethodServiceHandlerClient(ctx context.Context, mux *runtime.Se
 		}
 
 		forward_AuthMethodService_Authenticate_0(ctx, mux, outboundMarshaler, w, req, response_AuthMethodService_Authenticate_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/auth_method_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -146,28 +145,24 @@ type AuthMethodServiceServer interface {
 }
 
 // UnimplementedAuthMethodServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedAuthMethodServiceServer struct{}
+type UnimplementedAuthMethodServiceServer struct {
+}
 
 func (UnimplementedAuthMethodServiceServer) GetAuthMethod(context.Context, *GetAuthMethodRequest) (*GetAuthMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetAuthMethod not implemented")
 }
-
 func (UnimplementedAuthMethodServiceServer) ListAuthMethods(context.Context, *ListAuthMethodsRequest) (*ListAuthMethodsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAuthMethods not implemented")
 }
-
 func (UnimplementedAuthMethodServiceServer) CreateAuthMethod(context.Context, *CreateAuthMethodRequest) (*CreateAuthMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateAuthMethod not implemented")
 }
-
 func (UnimplementedAuthMethodServiceServer) UpdateAuthMethod(context.Context, *UpdateAuthMethodRequest) (*UpdateAuthMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateAuthMethod not implemented")
 }
-
 func (UnimplementedAuthMethodServiceServer) DeleteAuthMethod(context.Context, *DeleteAuthMethodRequest) (*DeleteAuthMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAuthMethod not implemented")
 }
-
 func (UnimplementedAuthMethodServiceServer) Authenticate(context.Context, *AuthenticateRequest) (*AuthenticateResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Authenticate not implemented")
 }

internal/gen/controller/api/services/authtokens_service.pb.go

@@ -7,14 +7,13 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	authtokens "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -390,19 +389,16 @@ func file_controller_api_services_v1_authtokens_service_proto_rawDescGZIP() []by
 	return file_controller_api_services_v1_authtokens_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_authtokens_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-	file_controller_api_services_v1_authtokens_service_proto_goTypes  = []interface{}{
-		(*GetAuthTokenRequest)(nil),     // 0: controller.api.services.v1.GetAuthTokenRequest
-		(*GetAuthTokenResponse)(nil),    // 1: controller.api.services.v1.GetAuthTokenResponse
-		(*ListAuthTokensRequest)(nil),   // 2: controller.api.services.v1.ListAuthTokensRequest
-		(*ListAuthTokensResponse)(nil),  // 3: controller.api.services.v1.ListAuthTokensResponse
-		(*DeleteAuthTokenRequest)(nil),  // 4: controller.api.services.v1.DeleteAuthTokenRequest
-		(*DeleteAuthTokenResponse)(nil), // 5: controller.api.services.v1.DeleteAuthTokenResponse
-		(*authtokens.AuthToken)(nil),    // 6: controller.api.resources.authtokens.v1.AuthToken
-	}
-)
-
+var file_controller_api_services_v1_authtokens_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_controller_api_services_v1_authtokens_service_proto_goTypes = []interface{}{
+	(*GetAuthTokenRequest)(nil),     // 0: controller.api.services.v1.GetAuthTokenRequest
+	(*GetAuthTokenResponse)(nil),    // 1: controller.api.services.v1.GetAuthTokenResponse
+	(*ListAuthTokensRequest)(nil),   // 2: controller.api.services.v1.ListAuthTokensRequest
+	(*ListAuthTokensResponse)(nil),  // 3: controller.api.services.v1.ListAuthTokensResponse
+	(*DeleteAuthTokenRequest)(nil),  // 4: controller.api.services.v1.DeleteAuthTokenRequest
+	(*DeleteAuthTokenResponse)(nil), // 5: controller.api.services.v1.DeleteAuthTokenResponse
+	(*authtokens.AuthToken)(nil),    // 6: controller.api.resources.authtokens.v1.AuthToken
+}
 var file_controller_api_services_v1_authtokens_service_proto_depIdxs = []int32{
 	6, // 0: controller.api.services.v1.GetAuthTokenResponse.item:type_name -> controller.api.resources.authtokens.v1.AuthToken
 	6, // 1: controller.api.services.v1.ListAuthTokensResponse.items:type_name -> controller.api.resources.authtokens.v1.AuthToken

internal/gen/controller/api/services/authtokens_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_AuthTokenService_GetAuthToken_0(ctx context.Context, marshaler runtime.Marshaler, client AuthTokenServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetAuthTokenRequest
@@ -56,6 +54,7 @@ func request_AuthTokenService_GetAuthToken_0(ctx context.Context, marshaler runt
 
 	msg, err := client.GetAuthToken(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthTokenService_GetAuthToken_0(ctx context.Context, marshaler runtime.Marshaler, server AuthTokenServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_AuthTokenService_GetAuthToken_0(ctx context.Context, marshale
 
 	msg, err := server.GetAuthToken(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_AuthTokenService_ListAuthTokens_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_AuthTokenService_ListAuthTokens_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_AuthTokenService_ListAuthTokens_0(ctx context.Context, marshaler runtime.Marshaler, client AuthTokenServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListAuthTokensRequest
@@ -98,6 +100,7 @@ func request_AuthTokenService_ListAuthTokens_0(ctx context.Context, marshaler ru
 
 	msg, err := client.ListAuthTokens(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthTokenService_ListAuthTokens_0(ctx context.Context, marshaler runtime.Marshaler, server AuthTokenServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_AuthTokenService_ListAuthTokens_0(ctx context.Context, marsha
 
 	msg, err := server.ListAuthTokens(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marshaler runtime.Marshaler, client AuthTokenServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -138,6 +142,7 @@ func request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marshaler r
 
 	msg, err := client.DeleteAuthToken(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marshaler runtime.Marshaler, server AuthTokenServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -163,6 +168,7 @@ func local_request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marsh
 
 	msg, err := server.DeleteAuthToken(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterAuthTokenServiceHandlerServer registers the http handlers for service AuthTokenService to "mux".
@@ -170,6 +176,7 @@ func local_request_AuthTokenService_DeleteAuthToken_0(ctx context.Context, marsh
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterAuthTokenServiceHandlerFromEndpoint instead.
 func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server AuthTokenServiceServer) error {
+
 	mux.Handle("GET", pattern_AuthTokenService_GetAuthToken_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -190,6 +197,7 @@ func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_GetAuthToken_0(ctx, mux, outboundMarshaler, w, req, response_AuthTokenService_GetAuthToken_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AuthTokenService_ListAuthTokens_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -212,6 +220,7 @@ func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_ListAuthTokens_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AuthTokenService_DeleteAuthToken_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -234,6 +243,7 @@ func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_DeleteAuthToken_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -276,6 +286,7 @@ func RegisterAuthTokenServiceHandler(ctx context.Context, mux *runtime.ServeMux,
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "AuthTokenServiceClient" to call the correct interceptors.
 func RegisterAuthTokenServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client AuthTokenServiceClient) error {
+
 	mux.Handle("GET", pattern_AuthTokenService_GetAuthToken_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -293,6 +304,7 @@ func RegisterAuthTokenServiceHandlerClient(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_GetAuthToken_0(ctx, mux, outboundMarshaler, w, req, response_AuthTokenService_GetAuthToken_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_AuthTokenService_ListAuthTokens_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -312,6 +324,7 @@ func RegisterAuthTokenServiceHandlerClient(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_ListAuthTokens_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_AuthTokenService_DeleteAuthToken_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -331,6 +344,7 @@ func RegisterAuthTokenServiceHandlerClient(ctx context.Context, mux *runtime.Ser
 		}
 
 		forward_AuthTokenService_DeleteAuthToken_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/authtokens_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -87,16 +86,15 @@ type AuthTokenServiceServer interface {
 }
 
 // UnimplementedAuthTokenServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedAuthTokenServiceServer struct{}
+type UnimplementedAuthTokenServiceServer struct {
+}
 
 func (UnimplementedAuthTokenServiceServer) GetAuthToken(context.Context, *GetAuthTokenRequest) (*GetAuthTokenResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetAuthToken not implemented")
 }
-
 func (UnimplementedAuthTokenServiceServer) ListAuthTokens(context.Context, *ListAuthTokensRequest) (*ListAuthTokensResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAuthTokens not implemented")
 }
-
 func (UnimplementedAuthTokenServiceServer) DeleteAuthToken(context.Context, *DeleteAuthTokenRequest) (*DeleteAuthTokenResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAuthToken not implemented")
 }

internal/gen/controller/api/services/group_service.pb.go

@@ -7,9 +7,6 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/golang/protobuf/ptypes/wrappers"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	groups "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups"
@@ -18,6 +15,8 @@ import (
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1071,30 +1070,27 @@ func file_controller_api_services_v1_group_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_group_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_group_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-	file_controller_api_services_v1_group_service_proto_goTypes  = []interface{}{
-		(*GetGroupRequest)(nil),            // 0: controller.api.services.v1.GetGroupRequest
-		(*GetGroupResponse)(nil),           // 1: controller.api.services.v1.GetGroupResponse
-		(*ListGroupsRequest)(nil),          // 2: controller.api.services.v1.ListGroupsRequest
-		(*ListGroupsResponse)(nil),         // 3: controller.api.services.v1.ListGroupsResponse
-		(*CreateGroupRequest)(nil),         // 4: controller.api.services.v1.CreateGroupRequest
-		(*CreateGroupResponse)(nil),        // 5: controller.api.services.v1.CreateGroupResponse
-		(*UpdateGroupRequest)(nil),         // 6: controller.api.services.v1.UpdateGroupRequest
-		(*UpdateGroupResponse)(nil),        // 7: controller.api.services.v1.UpdateGroupResponse
-		(*DeleteGroupRequest)(nil),         // 8: controller.api.services.v1.DeleteGroupRequest
-		(*DeleteGroupResponse)(nil),        // 9: controller.api.services.v1.DeleteGroupResponse
-		(*AddGroupMembersRequest)(nil),     // 10: controller.api.services.v1.AddGroupMembersRequest
-		(*AddGroupMembersResponse)(nil),    // 11: controller.api.services.v1.AddGroupMembersResponse
-		(*SetGroupMembersRequest)(nil),     // 12: controller.api.services.v1.SetGroupMembersRequest
-		(*SetGroupMembersResponse)(nil),    // 13: controller.api.services.v1.SetGroupMembersResponse
-		(*RemoveGroupMembersRequest)(nil),  // 14: controller.api.services.v1.RemoveGroupMembersRequest
-		(*RemoveGroupMembersResponse)(nil), // 15: controller.api.services.v1.RemoveGroupMembersResponse
-		(*groups.Group)(nil),               // 16: controller.api.resources.groups.v1.Group
-		(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_group_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_controller_api_services_v1_group_service_proto_goTypes = []interface{}{
+	(*GetGroupRequest)(nil),            // 0: controller.api.services.v1.GetGroupRequest
+	(*GetGroupResponse)(nil),           // 1: controller.api.services.v1.GetGroupResponse
+	(*ListGroupsRequest)(nil),          // 2: controller.api.services.v1.ListGroupsRequest
+	(*ListGroupsResponse)(nil),         // 3: controller.api.services.v1.ListGroupsResponse
+	(*CreateGroupRequest)(nil),         // 4: controller.api.services.v1.CreateGroupRequest
+	(*CreateGroupResponse)(nil),        // 5: controller.api.services.v1.CreateGroupResponse
+	(*UpdateGroupRequest)(nil),         // 6: controller.api.services.v1.UpdateGroupRequest
+	(*UpdateGroupResponse)(nil),        // 7: controller.api.services.v1.UpdateGroupResponse
+	(*DeleteGroupRequest)(nil),         // 8: controller.api.services.v1.DeleteGroupRequest
+	(*DeleteGroupResponse)(nil),        // 9: controller.api.services.v1.DeleteGroupResponse
+	(*AddGroupMembersRequest)(nil),     // 10: controller.api.services.v1.AddGroupMembersRequest
+	(*AddGroupMembersResponse)(nil),    // 11: controller.api.services.v1.AddGroupMembersResponse
+	(*SetGroupMembersRequest)(nil),     // 12: controller.api.services.v1.SetGroupMembersRequest
+	(*SetGroupMembersResponse)(nil),    // 13: controller.api.services.v1.SetGroupMembersResponse
+	(*RemoveGroupMembersRequest)(nil),  // 14: controller.api.services.v1.RemoveGroupMembersRequest
+	(*RemoveGroupMembersResponse)(nil), // 15: controller.api.services.v1.RemoveGroupMembersResponse
+	(*groups.Group)(nil),               // 16: controller.api.resources.groups.v1.Group
+	(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_group_service_proto_depIdxs = []int32{
 	16, // 0: controller.api.services.v1.GetGroupResponse.item:type_name -> controller.api.resources.groups.v1.Group
 	16, // 1: controller.api.services.v1.ListGroupsResponse.items:type_name -> controller.api.resources.groups.v1.Group

internal/gen/controller/api/services/group_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_GroupService_GetGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetGroupRequest
@@ -56,6 +54,7 @@ func request_GroupService_GetGroup_0(ctx context.Context, marshaler runtime.Mars
 
 	msg, err := client.GetGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_GetGroup_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_GroupService_GetGroup_0(ctx context.Context, marshaler runtim
 
 	msg, err := server.GetGroup(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_GroupService_ListGroups_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_GroupService_ListGroups_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_GroupService_ListGroups_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListGroupsRequest
@@ -98,6 +100,7 @@ func request_GroupService_ListGroups_0(ctx context.Context, marshaler runtime.Ma
 
 	msg, err := client.ListGroups(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_ListGroups_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_GroupService_ListGroups_0(ctx context.Context, marshaler runt
 
 	msg, err := server.ListGroups(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_GroupService_CreateGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_GroupService_CreateGroup_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.CreateGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_CreateGroup_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_GroupService_CreateGroup_0(ctx context.Context, marshaler run
 
 	msg, err := server.CreateGroup(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_GroupService_UpdateGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_GroupService_UpdateGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateGroupRequest
@@ -194,6 +202,7 @@ func request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.UpdateGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_GroupService_UpdateGroup_0(ctx context.Context, marshaler run
 
 	msg, err := server.UpdateGroup(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_GroupService_DeleteGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_GroupService_DeleteGroup_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.DeleteGroup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_DeleteGroup_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_GroupService_DeleteGroup_0(ctx context.Context, marshaler run
 
 	msg, err := server.DeleteGroup(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_GroupService_AddGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_GroupService_AddGroupMembers_0(ctx context.Context, marshaler runti
 
 	msg, err := client.AddGroupMembers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_AddGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_GroupService_AddGroupMembers_0(ctx context.Context, marshaler
 
 	msg, err := server.AddGroupMembers(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_GroupService_SetGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_GroupService_SetGroupMembers_0(ctx context.Context, marshaler runti
 
 	msg, err := client.SetGroupMembers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_SetGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_GroupService_SetGroupMembers_0(ctx context.Context, marshaler
 
 	msg, err := server.SetGroupMembers(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_GroupService_RemoveGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -456,6 +472,7 @@ func request_GroupService_RemoveGroupMembers_0(ctx context.Context, marshaler ru
 
 	msg, err := client.RemoveGroupMembers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_GroupService_RemoveGroupMembers_0(ctx context.Context, marshaler runtime.Marshaler, server GroupServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -489,6 +506,7 @@ func local_request_GroupService_RemoveGroupMembers_0(ctx context.Context, marsha
 
 	msg, err := server.RemoveGroupMembers(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterGroupServiceHandlerServer registers the http handlers for service GroupService to "mux".
@@ -496,6 +514,7 @@ func local_request_GroupService_RemoveGroupMembers_0(ctx context.Context, marsha
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterGroupServiceHandlerFromEndpoint instead.
 func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server GroupServiceServer) error {
+
 	mux.Handle("GET", pattern_GroupService_GetGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -516,6 +535,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_GetGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_GetGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_GroupService_ListGroups_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -538,6 +558,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_ListGroups_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_CreateGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -560,6 +581,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_CreateGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_CreateGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_GroupService_UpdateGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -582,6 +604,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_UpdateGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_UpdateGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_GroupService_DeleteGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -604,6 +627,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_DeleteGroup_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_AddGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -626,6 +650,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_AddGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_AddGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_SetGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -648,6 +673,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_SetGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_SetGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_RemoveGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -670,6 +696,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_RemoveGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_RemoveGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -712,6 +739,7 @@ func RegisterGroupServiceHandler(ctx context.Context, mux *runtime.ServeMux, con
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "GroupServiceClient" to call the correct interceptors.
 func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client GroupServiceClient) error {
+
 	mux.Handle("GET", pattern_GroupService_GetGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -729,6 +757,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_GetGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_GetGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_GroupService_ListGroups_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -748,6 +777,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_ListGroups_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_CreateGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -767,6 +797,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_CreateGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_CreateGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_GroupService_UpdateGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -786,6 +817,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_UpdateGroup_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_UpdateGroup_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_GroupService_DeleteGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -805,6 +837,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_DeleteGroup_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_AddGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -824,6 +857,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_AddGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_AddGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_SetGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -843,6 +877,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_SetGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_SetGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_GroupService_RemoveGroupMembers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -862,6 +897,7 @@ func RegisterGroupServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_GroupService_RemoveGroupMembers_0(ctx, mux, outboundMarshaler, w, req, response_GroupService_RemoveGroupMembers_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/group_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -194,36 +193,30 @@ type GroupServiceServer interface {
 }
 
 // UnimplementedGroupServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedGroupServiceServer struct{}
+type UnimplementedGroupServiceServer struct {
+}
 
 func (UnimplementedGroupServiceServer) GetGroup(context.Context, *GetGroupRequest) (*GetGroupResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetGroup not implemented")
 }
-
 func (UnimplementedGroupServiceServer) ListGroups(context.Context, *ListGroupsRequest) (*ListGroupsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListGroups not implemented")
 }
-
 func (UnimplementedGroupServiceServer) CreateGroup(context.Context, *CreateGroupRequest) (*CreateGroupResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateGroup not implemented")
 }
-
 func (UnimplementedGroupServiceServer) UpdateGroup(context.Context, *UpdateGroupRequest) (*UpdateGroupResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateGroup not implemented")
 }
-
 func (UnimplementedGroupServiceServer) DeleteGroup(context.Context, *DeleteGroupRequest) (*DeleteGroupResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteGroup not implemented")
 }
-
 func (UnimplementedGroupServiceServer) AddGroupMembers(context.Context, *AddGroupMembersRequest) (*AddGroupMembersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddGroupMembers not implemented")
 }
-
 func (UnimplementedGroupServiceServer) SetGroupMembers(context.Context, *SetGroupMembersRequest) (*SetGroupMembersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetGroupMembers not implemented")
 }
-
 func (UnimplementedGroupServiceServer) RemoveGroupMembers(context.Context, *RemoveGroupMembersRequest) (*RemoveGroupMembersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveGroupMembers not implemented")
 }

internal/gen/controller/api/services/host_catalog_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	hostcatalogs "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hostcatalogs"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -666,24 +665,21 @@ func file_controller_api_services_v1_host_catalog_service_proto_rawDescGZIP() []
 	return file_controller_api_services_v1_host_catalog_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_host_catalog_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-	file_controller_api_services_v1_host_catalog_service_proto_goTypes  = []interface{}{
-		(*GetHostCatalogRequest)(nil),     // 0: controller.api.services.v1.GetHostCatalogRequest
-		(*GetHostCatalogResponse)(nil),    // 1: controller.api.services.v1.GetHostCatalogResponse
-		(*ListHostCatalogsRequest)(nil),   // 2: controller.api.services.v1.ListHostCatalogsRequest
-		(*ListHostCatalogsResponse)(nil),  // 3: controller.api.services.v1.ListHostCatalogsResponse
-		(*CreateHostCatalogRequest)(nil),  // 4: controller.api.services.v1.CreateHostCatalogRequest
-		(*CreateHostCatalogResponse)(nil), // 5: controller.api.services.v1.CreateHostCatalogResponse
-		(*UpdateHostCatalogRequest)(nil),  // 6: controller.api.services.v1.UpdateHostCatalogRequest
-		(*UpdateHostCatalogResponse)(nil), // 7: controller.api.services.v1.UpdateHostCatalogResponse
-		(*DeleteHostCatalogRequest)(nil),  // 8: controller.api.services.v1.DeleteHostCatalogRequest
-		(*DeleteHostCatalogResponse)(nil), // 9: controller.api.services.v1.DeleteHostCatalogResponse
-		(*hostcatalogs.HostCatalog)(nil),  // 10: controller.api.resources.hostcatalogs.v1.HostCatalog
-		(*field_mask.FieldMask)(nil),      // 11: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_host_catalog_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_controller_api_services_v1_host_catalog_service_proto_goTypes = []interface{}{
+	(*GetHostCatalogRequest)(nil),     // 0: controller.api.services.v1.GetHostCatalogRequest
+	(*GetHostCatalogResponse)(nil),    // 1: controller.api.services.v1.GetHostCatalogResponse
+	(*ListHostCatalogsRequest)(nil),   // 2: controller.api.services.v1.ListHostCatalogsRequest
+	(*ListHostCatalogsResponse)(nil),  // 3: controller.api.services.v1.ListHostCatalogsResponse
+	(*CreateHostCatalogRequest)(nil),  // 4: controller.api.services.v1.CreateHostCatalogRequest
+	(*CreateHostCatalogResponse)(nil), // 5: controller.api.services.v1.CreateHostCatalogResponse
+	(*UpdateHostCatalogRequest)(nil),  // 6: controller.api.services.v1.UpdateHostCatalogRequest
+	(*UpdateHostCatalogResponse)(nil), // 7: controller.api.services.v1.UpdateHostCatalogResponse
+	(*DeleteHostCatalogRequest)(nil),  // 8: controller.api.services.v1.DeleteHostCatalogRequest
+	(*DeleteHostCatalogResponse)(nil), // 9: controller.api.services.v1.DeleteHostCatalogResponse
+	(*hostcatalogs.HostCatalog)(nil),  // 10: controller.api.resources.hostcatalogs.v1.HostCatalog
+	(*field_mask.FieldMask)(nil),      // 11: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_host_catalog_service_proto_depIdxs = []int32{
 	10, // 0: controller.api.services.v1.GetHostCatalogResponse.item:type_name -> controller.api.resources.hostcatalogs.v1.HostCatalog
 	10, // 1: controller.api.services.v1.ListHostCatalogsResponse.items:type_name -> controller.api.resources.hostcatalogs.v1.HostCatalog

internal/gen/controller/api/services/host_catalog_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_HostCatalogService_GetHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetHostCatalogRequest
@@ -56,6 +54,7 @@ func request_HostCatalogService_GetHostCatalog_0(ctx context.Context, marshaler
 
 	msg, err := client.GetHostCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostCatalogService_GetHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, server HostCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_HostCatalogService_GetHostCatalog_0(ctx context.Context, mars
 
 	msg, err := server.GetHostCatalog(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostCatalogService_ListHostCatalogs_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_HostCatalogService_ListHostCatalogs_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListHostCatalogsRequest
@@ -98,6 +100,7 @@ func request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, marshale
 
 	msg, err := client.ListHostCatalogs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, marshaler runtime.Marshaler, server HostCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, ma
 
 	msg, err := server.ListHostCatalogs(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, marshal
 
 	msg, err := client.CreateHostCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, server HostCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, m
 
 	msg, err := server.CreateHostCatalog(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostCatalogService_UpdateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_HostCatalogService_UpdateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateHostCatalogRequest
@@ -194,6 +202,7 @@ func request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, marshal
 
 	msg, err := client.UpdateHostCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, server HostCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, m
 
 	msg, err := server.UpdateHostCatalog(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, marshal
 
 	msg, err := client.DeleteHostCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, server HostCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, m
 
 	msg, err := server.DeleteHostCatalog(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterHostCatalogServiceHandlerServer registers the http handlers for service HostCatalogService to "mux".
@@ -298,6 +310,7 @@ func local_request_HostCatalogService_DeleteHostCatalog_0(ctx context.Context, m
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterHostCatalogServiceHandlerFromEndpoint instead.
 func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server HostCatalogServiceServer) error {
+
 	mux.Handle("GET", pattern_HostCatalogService_GetHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -318,6 +331,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_GetHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_GetHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostCatalogService_ListHostCatalogs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -340,6 +354,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_ListHostCatalogs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostCatalogService_CreateHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -362,6 +377,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_CreateHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_CreateHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostCatalogService_UpdateHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -384,6 +400,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_UpdateHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_UpdateHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostCatalogService_DeleteHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -406,6 +423,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_DeleteHostCatalog_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -448,6 +466,7 @@ func RegisterHostCatalogServiceHandler(ctx context.Context, mux *runtime.ServeMu
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "HostCatalogServiceClient" to call the correct interceptors.
 func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client HostCatalogServiceClient) error {
+
 	mux.Handle("GET", pattern_HostCatalogService_GetHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -465,6 +484,7 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_GetHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_GetHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostCatalogService_ListHostCatalogs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -484,6 +504,7 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_ListHostCatalogs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostCatalogService_CreateHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -503,6 +524,7 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_CreateHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_CreateHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostCatalogService_UpdateHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -522,6 +544,7 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_UpdateHostCatalog_0(ctx, mux, outboundMarshaler, w, req, response_HostCatalogService_UpdateHostCatalog_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostCatalogService_DeleteHostCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -541,6 +564,7 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S
 		}
 
 		forward_HostCatalogService_DeleteHostCatalog_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/host_catalog_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -133,24 +132,21 @@ type HostCatalogServiceServer interface {
 }
 
 // UnimplementedHostCatalogServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedHostCatalogServiceServer struct{}
+type UnimplementedHostCatalogServiceServer struct {
+}
 
 func (UnimplementedHostCatalogServiceServer) GetHostCatalog(context.Context, *GetHostCatalogRequest) (*GetHostCatalogResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetHostCatalog not implemented")
 }
-
 func (UnimplementedHostCatalogServiceServer) ListHostCatalogs(context.Context, *ListHostCatalogsRequest) (*ListHostCatalogsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListHostCatalogs not implemented")
 }
-
 func (UnimplementedHostCatalogServiceServer) CreateHostCatalog(context.Context, *CreateHostCatalogRequest) (*CreateHostCatalogResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateHostCatalog not implemented")
 }
-
 func (UnimplementedHostCatalogServiceServer) UpdateHostCatalog(context.Context, *UpdateHostCatalogRequest) (*UpdateHostCatalogResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateHostCatalog not implemented")
 }
-
 func (UnimplementedHostCatalogServiceServer) DeleteHostCatalog(context.Context, *DeleteHostCatalogRequest) (*DeleteHostCatalogResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteHostCatalog not implemented")
 }

internal/gen/controller/api/services/host_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	hosts "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -646,24 +645,21 @@ func file_controller_api_services_v1_host_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_host_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_host_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-	file_controller_api_services_v1_host_service_proto_goTypes  = []interface{}{
-		(*GetHostRequest)(nil),       // 0: controller.api.services.v1.GetHostRequest
-		(*GetHostResponse)(nil),      // 1: controller.api.services.v1.GetHostResponse
-		(*ListHostsRequest)(nil),     // 2: controller.api.services.v1.ListHostsRequest
-		(*ListHostsResponse)(nil),    // 3: controller.api.services.v1.ListHostsResponse
-		(*CreateHostRequest)(nil),    // 4: controller.api.services.v1.CreateHostRequest
-		(*CreateHostResponse)(nil),   // 5: controller.api.services.v1.CreateHostResponse
-		(*UpdateHostRequest)(nil),    // 6: controller.api.services.v1.UpdateHostRequest
-		(*UpdateHostResponse)(nil),   // 7: controller.api.services.v1.UpdateHostResponse
-		(*DeleteHostRequest)(nil),    // 8: controller.api.services.v1.DeleteHostRequest
-		(*DeleteHostResponse)(nil),   // 9: controller.api.services.v1.DeleteHostResponse
-		(*hosts.Host)(nil),           // 10: controller.api.resources.hosts.v1.Host
-		(*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_host_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_controller_api_services_v1_host_service_proto_goTypes = []interface{}{
+	(*GetHostRequest)(nil),       // 0: controller.api.services.v1.GetHostRequest
+	(*GetHostResponse)(nil),      // 1: controller.api.services.v1.GetHostResponse
+	(*ListHostsRequest)(nil),     // 2: controller.api.services.v1.ListHostsRequest
+	(*ListHostsResponse)(nil),    // 3: controller.api.services.v1.ListHostsResponse
+	(*CreateHostRequest)(nil),    // 4: controller.api.services.v1.CreateHostRequest
+	(*CreateHostResponse)(nil),   // 5: controller.api.services.v1.CreateHostResponse
+	(*UpdateHostRequest)(nil),    // 6: controller.api.services.v1.UpdateHostRequest
+	(*UpdateHostResponse)(nil),   // 7: controller.api.services.v1.UpdateHostResponse
+	(*DeleteHostRequest)(nil),    // 8: controller.api.services.v1.DeleteHostRequest
+	(*DeleteHostResponse)(nil),   // 9: controller.api.services.v1.DeleteHostResponse
+	(*hosts.Host)(nil),           // 10: controller.api.resources.hosts.v1.Host
+	(*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_host_service_proto_depIdxs = []int32{
 	10, // 0: controller.api.services.v1.GetHostResponse.item:type_name -> controller.api.resources.hosts.v1.Host
 	10, // 1: controller.api.services.v1.ListHostsResponse.items:type_name -> controller.api.resources.hosts.v1.Host

internal/gen/controller/api/services/host_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_HostService_GetHost_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetHostRequest
@@ -56,6 +54,7 @@ func request_HostService_GetHost_0(ctx context.Context, marshaler runtime.Marsha
 
 	msg, err := client.GetHost(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostService_GetHost_0(ctx context.Context, marshaler runtime.Marshaler, server HostServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_HostService_GetHost_0(ctx context.Context, marshaler runtime.
 
 	msg, err := server.GetHost(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostService_ListHosts_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_HostService_ListHosts_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_HostService_ListHosts_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListHostsRequest
@@ -98,6 +100,7 @@ func request_HostService_ListHosts_0(ctx context.Context, marshaler runtime.Mars
 
 	msg, err := client.ListHosts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostService_ListHosts_0(ctx context.Context, marshaler runtime.Marshaler, server HostServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_HostService_ListHosts_0(ctx context.Context, marshaler runtim
 
 	msg, err := server.ListHosts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostService_CreateHost_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_HostService_CreateHost_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.CreateHost(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostService_CreateHost_0(ctx context.Context, marshaler runtime.Marshaler, server HostServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_HostService_CreateHost_0(ctx context.Context, marshaler runti
 
 	msg, err := server.CreateHost(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostService_UpdateHost_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_HostService_UpdateHost_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_HostService_UpdateHost_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateHostRequest
@@ -194,6 +202,7 @@ func request_HostService_UpdateHost_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.UpdateHost(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostService_UpdateHost_0(ctx context.Context, marshaler runtime.Marshaler, server HostServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_HostService_UpdateHost_0(ctx context.Context, marshaler runti
 
 	msg, err := server.UpdateHost(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostService_DeleteHost_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_HostService_DeleteHost_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.DeleteHost(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostService_DeleteHost_0(ctx context.Context, marshaler runtime.Marshaler, server HostServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_HostService_DeleteHost_0(ctx context.Context, marshaler runti
 
 	msg, err := server.DeleteHost(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterHostServiceHandlerServer registers the http handlers for service HostService to "mux".
@@ -298,6 +310,7 @@ func local_request_HostService_DeleteHost_0(ctx context.Context, marshaler runti
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterHostServiceHandlerFromEndpoint instead.
 func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server HostServiceServer) error {
+
 	mux.Handle("GET", pattern_HostService_GetHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -318,6 +331,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_GetHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_GetHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostService_ListHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -340,6 +354,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_ListHosts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostService_CreateHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -362,6 +377,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_CreateHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_CreateHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostService_UpdateHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -384,6 +400,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_UpdateHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_UpdateHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostService_DeleteHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -406,6 +423,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_DeleteHost_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -448,6 +466,7 @@ func RegisterHostServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "HostServiceClient" to call the correct interceptors.
 func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client HostServiceClient) error {
+
 	mux.Handle("GET", pattern_HostService_GetHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -465,6 +484,7 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_GetHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_GetHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostService_ListHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -484,6 +504,7 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_ListHosts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostService_CreateHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -503,6 +524,7 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_CreateHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_CreateHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostService_UpdateHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -522,6 +544,7 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_UpdateHost_0(ctx, mux, outboundMarshaler, w, req, response_HostService_UpdateHost_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostService_DeleteHost_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -541,6 +564,7 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_HostService_DeleteHost_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/host_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -137,24 +136,21 @@ type HostServiceServer interface {
 }
 
 // UnimplementedHostServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedHostServiceServer struct{}
+type UnimplementedHostServiceServer struct {
+}
 
 func (UnimplementedHostServiceServer) GetHost(context.Context, *GetHostRequest) (*GetHostResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetHost not implemented")
 }
-
 func (UnimplementedHostServiceServer) ListHosts(context.Context, *ListHostsRequest) (*ListHostsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListHosts not implemented")
 }
-
 func (UnimplementedHostServiceServer) CreateHost(context.Context, *CreateHostRequest) (*CreateHostResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateHost not implemented")
 }
-
 func (UnimplementedHostServiceServer) UpdateHost(context.Context, *UpdateHostRequest) (*UpdateHostResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateHost not implemented")
 }
-
 func (UnimplementedHostServiceServer) DeleteHost(context.Context, *DeleteHostRequest) (*DeleteHostResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteHost not implemented")
 }

internal/gen/controller/api/services/host_set_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	hostsets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hostsets"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1071,30 +1070,27 @@ func file_controller_api_services_v1_host_set_service_proto_rawDescGZIP() []byte
 	return file_controller_api_services_v1_host_set_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_host_set_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-	file_controller_api_services_v1_host_set_service_proto_goTypes  = []interface{}{
-		(*GetHostSetRequest)(nil),          // 0: controller.api.services.v1.GetHostSetRequest
-		(*GetHostSetResponse)(nil),         // 1: controller.api.services.v1.GetHostSetResponse
-		(*ListHostSetsRequest)(nil),        // 2: controller.api.services.v1.ListHostSetsRequest
-		(*ListHostSetsResponse)(nil),       // 3: controller.api.services.v1.ListHostSetsResponse
-		(*CreateHostSetRequest)(nil),       // 4: controller.api.services.v1.CreateHostSetRequest
-		(*CreateHostSetResponse)(nil),      // 5: controller.api.services.v1.CreateHostSetResponse
-		(*UpdateHostSetRequest)(nil),       // 6: controller.api.services.v1.UpdateHostSetRequest
-		(*UpdateHostSetResponse)(nil),      // 7: controller.api.services.v1.UpdateHostSetResponse
-		(*DeleteHostSetRequest)(nil),       // 8: controller.api.services.v1.DeleteHostSetRequest
-		(*DeleteHostSetResponse)(nil),      // 9: controller.api.services.v1.DeleteHostSetResponse
-		(*AddHostSetHostsRequest)(nil),     // 10: controller.api.services.v1.AddHostSetHostsRequest
-		(*AddHostSetHostsResponse)(nil),    // 11: controller.api.services.v1.AddHostSetHostsResponse
-		(*SetHostSetHostsRequest)(nil),     // 12: controller.api.services.v1.SetHostSetHostsRequest
-		(*SetHostSetHostsResponse)(nil),    // 13: controller.api.services.v1.SetHostSetHostsResponse
-		(*RemoveHostSetHostsRequest)(nil),  // 14: controller.api.services.v1.RemoveHostSetHostsRequest
-		(*RemoveHostSetHostsResponse)(nil), // 15: controller.api.services.v1.RemoveHostSetHostsResponse
-		(*hostsets.HostSet)(nil),           // 16: controller.api.resources.hostsets.v1.HostSet
-		(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_host_set_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_controller_api_services_v1_host_set_service_proto_goTypes = []interface{}{
+	(*GetHostSetRequest)(nil),          // 0: controller.api.services.v1.GetHostSetRequest
+	(*GetHostSetResponse)(nil),         // 1: controller.api.services.v1.GetHostSetResponse
+	(*ListHostSetsRequest)(nil),        // 2: controller.api.services.v1.ListHostSetsRequest
+	(*ListHostSetsResponse)(nil),       // 3: controller.api.services.v1.ListHostSetsResponse
+	(*CreateHostSetRequest)(nil),       // 4: controller.api.services.v1.CreateHostSetRequest
+	(*CreateHostSetResponse)(nil),      // 5: controller.api.services.v1.CreateHostSetResponse
+	(*UpdateHostSetRequest)(nil),       // 6: controller.api.services.v1.UpdateHostSetRequest
+	(*UpdateHostSetResponse)(nil),      // 7: controller.api.services.v1.UpdateHostSetResponse
+	(*DeleteHostSetRequest)(nil),       // 8: controller.api.services.v1.DeleteHostSetRequest
+	(*DeleteHostSetResponse)(nil),      // 9: controller.api.services.v1.DeleteHostSetResponse
+	(*AddHostSetHostsRequest)(nil),     // 10: controller.api.services.v1.AddHostSetHostsRequest
+	(*AddHostSetHostsResponse)(nil),    // 11: controller.api.services.v1.AddHostSetHostsResponse
+	(*SetHostSetHostsRequest)(nil),     // 12: controller.api.services.v1.SetHostSetHostsRequest
+	(*SetHostSetHostsResponse)(nil),    // 13: controller.api.services.v1.SetHostSetHostsResponse
+	(*RemoveHostSetHostsRequest)(nil),  // 14: controller.api.services.v1.RemoveHostSetHostsRequest
+	(*RemoveHostSetHostsResponse)(nil), // 15: controller.api.services.v1.RemoveHostSetHostsResponse
+	(*hostsets.HostSet)(nil),           // 16: controller.api.resources.hostsets.v1.HostSet
+	(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_host_set_service_proto_depIdxs = []int32{
 	16, // 0: controller.api.services.v1.GetHostSetResponse.item:type_name -> controller.api.resources.hostsets.v1.HostSet
 	16, // 1: controller.api.services.v1.ListHostSetsResponse.items:type_name -> controller.api.resources.hostsets.v1.HostSet

internal/gen/controller/api/services/host_set_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_HostSetService_GetHostSet_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetHostSetRequest
@@ -56,6 +54,7 @@ func request_HostSetService_GetHostSet_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.GetHostSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_GetHostSet_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_HostSetService_GetHostSet_0(ctx context.Context, marshaler ru
 
 	msg, err := server.GetHostSet(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostSetService_ListHostSets_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_HostSetService_ListHostSets_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_HostSetService_ListHostSets_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListHostSetsRequest
@@ -98,6 +100,7 @@ func request_HostSetService_ListHostSets_0(ctx context.Context, marshaler runtim
 
 	msg, err := client.ListHostSets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_ListHostSets_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_HostSetService_ListHostSets_0(ctx context.Context, marshaler
 
 	msg, err := server.ListHostSets(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler runti
 
 	msg, err := client.CreateHostSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler
 
 	msg, err := server.CreateHostSet(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_HostSetService_UpdateHostSet_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_HostSetService_UpdateHostSet_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateHostSetRequest
@@ -194,6 +202,7 @@ func request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler runti
 
 	msg, err := client.UpdateHostSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler
 
 	msg, err := server.UpdateHostSet(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostSetService_DeleteHostSet_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_HostSetService_DeleteHostSet_0(ctx context.Context, marshaler runti
 
 	msg, err := client.DeleteHostSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_DeleteHostSet_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_HostSetService_DeleteHostSet_0(ctx context.Context, marshaler
 
 	msg, err := server.DeleteHostSet(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostSetService_AddHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_HostSetService_AddHostSetHosts_0(ctx context.Context, marshaler run
 
 	msg, err := client.AddHostSetHosts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_AddHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_HostSetService_AddHostSetHosts_0(ctx context.Context, marshal
 
 	msg, err := server.AddHostSetHosts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostSetService_SetHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_HostSetService_SetHostSetHosts_0(ctx context.Context, marshaler run
 
 	msg, err := client.SetHostSetHosts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_SetHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_HostSetService_SetHostSetHosts_0(ctx context.Context, marshal
 
 	msg, err := server.SetHostSetHosts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -456,6 +472,7 @@ func request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, marshaler
 
 	msg, err := client.RemoveHostSetHosts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, marshaler runtime.Marshaler, server HostSetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -489,6 +506,7 @@ func local_request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, mars
 
 	msg, err := server.RemoveHostSetHosts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterHostSetServiceHandlerServer registers the http handlers for service HostSetService to "mux".
@@ -496,6 +514,7 @@ func local_request_HostSetService_RemoveHostSetHosts_0(ctx context.Context, mars
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterHostSetServiceHandlerFromEndpoint instead.
 func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server HostSetServiceServer) error {
+
 	mux.Handle("GET", pattern_HostSetService_GetHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -516,6 +535,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_GetHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_GetHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostSetService_ListHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -538,6 +558,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_ListHostSets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_CreateHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -560,6 +581,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_CreateHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_CreateHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostSetService_UpdateHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -582,6 +604,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_UpdateHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_UpdateHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostSetService_DeleteHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -604,6 +627,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_DeleteHostSet_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_AddHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -626,6 +650,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_AddHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_AddHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_SetHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -648,6 +673,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_SetHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_SetHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_RemoveHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -670,6 +696,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_RemoveHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_RemoveHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -712,6 +739,7 @@ func RegisterHostSetServiceHandler(ctx context.Context, mux *runtime.ServeMux, c
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "HostSetServiceClient" to call the correct interceptors.
 func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client HostSetServiceClient) error {
+
 	mux.Handle("GET", pattern_HostSetService_GetHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -729,6 +757,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_GetHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_GetHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_HostSetService_ListHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -748,6 +777,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_ListHostSets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_CreateHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -767,6 +797,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_CreateHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_CreateHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_HostSetService_UpdateHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -786,6 +817,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_UpdateHostSet_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_UpdateHostSet_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_HostSetService_DeleteHostSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -805,6 +837,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_DeleteHostSet_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_AddHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -824,6 +857,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_AddHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_AddHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_SetHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -843,6 +877,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_SetHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_SetHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_HostSetService_RemoveHostSetHosts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -862,6 +897,7 @@ func RegisterHostSetServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_HostSetService_RemoveHostSetHosts_0(ctx, mux, outboundMarshaler, w, req, response_HostSetService_RemoveHostSetHosts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/host_set_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -204,36 +203,30 @@ type HostSetServiceServer interface {
 }
 
 // UnimplementedHostSetServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedHostSetServiceServer struct{}
+type UnimplementedHostSetServiceServer struct {
+}
 
 func (UnimplementedHostSetServiceServer) GetHostSet(context.Context, *GetHostSetRequest) (*GetHostSetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetHostSet not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) ListHostSets(context.Context, *ListHostSetsRequest) (*ListHostSetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListHostSets not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) CreateHostSet(context.Context, *CreateHostSetRequest) (*CreateHostSetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateHostSet not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) UpdateHostSet(context.Context, *UpdateHostSetRequest) (*UpdateHostSetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateHostSet not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) DeleteHostSet(context.Context, *DeleteHostSetRequest) (*DeleteHostSetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteHostSet not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) AddHostSetHosts(context.Context, *AddHostSetHostsRequest) (*AddHostSetHostsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddHostSetHosts not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) SetHostSetHosts(context.Context, *SetHostSetHostsRequest) (*SetHostSetHostsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetHostSetHosts not implemented")
 }
-
 func (UnimplementedHostSetServiceServer) RemoveHostSetHosts(context.Context, *RemoveHostSetHostsRequest) (*RemoveHostSetHostsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveHostSetHosts not implemented")
 }

internal/gen/controller/api/services/role_service.pb.go

@@ -7,9 +7,6 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/golang/protobuf/ptypes/wrappers"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	roles "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles"
@@ -17,6 +14,8 @@ import (
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1479,36 +1478,33 @@ func file_controller_api_services_v1_role_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_role_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_role_service_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
-	file_controller_api_services_v1_role_service_proto_goTypes  = []interface{}{
-		(*GetRoleRequest)(nil),               // 0: controller.api.services.v1.GetRoleRequest
-		(*GetRoleResponse)(nil),              // 1: controller.api.services.v1.GetRoleResponse
-		(*ListRolesRequest)(nil),             // 2: controller.api.services.v1.ListRolesRequest
-		(*ListRolesResponse)(nil),            // 3: controller.api.services.v1.ListRolesResponse
-		(*CreateRoleRequest)(nil),            // 4: controller.api.services.v1.CreateRoleRequest
-		(*CreateRoleResponse)(nil),           // 5: controller.api.services.v1.CreateRoleResponse
-		(*UpdateRoleRequest)(nil),            // 6: controller.api.services.v1.UpdateRoleRequest
-		(*UpdateRoleResponse)(nil),           // 7: controller.api.services.v1.UpdateRoleResponse
-		(*DeleteRoleRequest)(nil),            // 8: controller.api.services.v1.DeleteRoleRequest
-		(*DeleteRoleResponse)(nil),           // 9: controller.api.services.v1.DeleteRoleResponse
-		(*AddRolePrincipalsRequest)(nil),     // 10: controller.api.services.v1.AddRolePrincipalsRequest
-		(*AddRolePrincipalsResponse)(nil),    // 11: controller.api.services.v1.AddRolePrincipalsResponse
-		(*SetRolePrincipalsRequest)(nil),     // 12: controller.api.services.v1.SetRolePrincipalsRequest
-		(*SetRolePrincipalsResponse)(nil),    // 13: controller.api.services.v1.SetRolePrincipalsResponse
-		(*RemoveRolePrincipalsRequest)(nil),  // 14: controller.api.services.v1.RemoveRolePrincipalsRequest
-		(*RemoveRolePrincipalsResponse)(nil), // 15: controller.api.services.v1.RemoveRolePrincipalsResponse
-		(*AddRoleGrantsRequest)(nil),         // 16: controller.api.services.v1.AddRoleGrantsRequest
-		(*AddRoleGrantsResponse)(nil),        // 17: controller.api.services.v1.AddRoleGrantsResponse
-		(*SetRoleGrantsRequest)(nil),         // 18: controller.api.services.v1.SetRoleGrantsRequest
-		(*SetRoleGrantsResponse)(nil),        // 19: controller.api.services.v1.SetRoleGrantsResponse
-		(*RemoveRoleGrantsRequest)(nil),      // 20: controller.api.services.v1.RemoveRoleGrantsRequest
-		(*RemoveRoleGrantsResponse)(nil),     // 21: controller.api.services.v1.RemoveRoleGrantsResponse
-		(*roles.Role)(nil),                   // 22: controller.api.resources.roles.v1.Role
-		(*field_mask.FieldMask)(nil),         // 23: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_role_service_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_controller_api_services_v1_role_service_proto_goTypes = []interface{}{
+	(*GetRoleRequest)(nil),               // 0: controller.api.services.v1.GetRoleRequest
+	(*GetRoleResponse)(nil),              // 1: controller.api.services.v1.GetRoleResponse
+	(*ListRolesRequest)(nil),             // 2: controller.api.services.v1.ListRolesRequest
+	(*ListRolesResponse)(nil),            // 3: controller.api.services.v1.ListRolesResponse
+	(*CreateRoleRequest)(nil),            // 4: controller.api.services.v1.CreateRoleRequest
+	(*CreateRoleResponse)(nil),           // 5: controller.api.services.v1.CreateRoleResponse
+	(*UpdateRoleRequest)(nil),            // 6: controller.api.services.v1.UpdateRoleRequest
+	(*UpdateRoleResponse)(nil),           // 7: controller.api.services.v1.UpdateRoleResponse
+	(*DeleteRoleRequest)(nil),            // 8: controller.api.services.v1.DeleteRoleRequest
+	(*DeleteRoleResponse)(nil),           // 9: controller.api.services.v1.DeleteRoleResponse
+	(*AddRolePrincipalsRequest)(nil),     // 10: controller.api.services.v1.AddRolePrincipalsRequest
+	(*AddRolePrincipalsResponse)(nil),    // 11: controller.api.services.v1.AddRolePrincipalsResponse
+	(*SetRolePrincipalsRequest)(nil),     // 12: controller.api.services.v1.SetRolePrincipalsRequest
+	(*SetRolePrincipalsResponse)(nil),    // 13: controller.api.services.v1.SetRolePrincipalsResponse
+	(*RemoveRolePrincipalsRequest)(nil),  // 14: controller.api.services.v1.RemoveRolePrincipalsRequest
+	(*RemoveRolePrincipalsResponse)(nil), // 15: controller.api.services.v1.RemoveRolePrincipalsResponse
+	(*AddRoleGrantsRequest)(nil),         // 16: controller.api.services.v1.AddRoleGrantsRequest
+	(*AddRoleGrantsResponse)(nil),        // 17: controller.api.services.v1.AddRoleGrantsResponse
+	(*SetRoleGrantsRequest)(nil),         // 18: controller.api.services.v1.SetRoleGrantsRequest
+	(*SetRoleGrantsResponse)(nil),        // 19: controller.api.services.v1.SetRoleGrantsResponse
+	(*RemoveRoleGrantsRequest)(nil),      // 20: controller.api.services.v1.RemoveRoleGrantsRequest
+	(*RemoveRoleGrantsResponse)(nil),     // 21: controller.api.services.v1.RemoveRoleGrantsResponse
+	(*roles.Role)(nil),                   // 22: controller.api.resources.roles.v1.Role
+	(*field_mask.FieldMask)(nil),         // 23: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_role_service_proto_depIdxs = []int32{
 	22, // 0: controller.api.services.v1.GetRoleResponse.item:type_name -> controller.api.resources.roles.v1.Role
 	22, // 1: controller.api.services.v1.ListRolesResponse.items:type_name -> controller.api.resources.roles.v1.Role

internal/gen/controller/api/services/role_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetRoleRequest
@@ -56,6 +54,7 @@ func request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.Marsha
 
 	msg, err := client.GetRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.
 
 	msg, err := server.GetRole(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_RoleService_ListRoles_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_RoleService_ListRoles_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_RoleService_ListRoles_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListRolesRequest
@@ -98,6 +100,7 @@ func request_RoleService_ListRoles_0(ctx context.Context, marshaler runtime.Mars
 
 	msg, err := client.ListRoles(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_ListRoles_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_RoleService_ListRoles_0(ctx context.Context, marshaler runtim
 
 	msg, err := server.ListRoles(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_CreateRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_RoleService_CreateRole_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.CreateRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_CreateRole_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_RoleService_CreateRole_0(ctx context.Context, marshaler runti
 
 	msg, err := server.CreateRole(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_RoleService_UpdateRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_RoleService_UpdateRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateRoleRequest
@@ -194,6 +202,7 @@ func request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.UpdateRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_RoleService_UpdateRole_0(ctx context.Context, marshaler runti
 
 	msg, err := server.UpdateRole(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_DeleteRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_RoleService_DeleteRole_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.DeleteRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_DeleteRole_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_RoleService_DeleteRole_0(ctx context.Context, marshaler runti
 
 	msg, err := server.DeleteRole(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_AddRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_RoleService_AddRolePrincipals_0(ctx context.Context, marshaler runt
 
 	msg, err := client.AddRolePrincipals(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_AddRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_RoleService_AddRolePrincipals_0(ctx context.Context, marshale
 
 	msg, err := server.AddRolePrincipals(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_SetRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_RoleService_SetRolePrincipals_0(ctx context.Context, marshaler runt
 
 	msg, err := client.SetRolePrincipals(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_SetRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_RoleService_SetRolePrincipals_0(ctx context.Context, marshale
 
 	msg, err := server.SetRolePrincipals(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_RemoveRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -456,6 +472,7 @@ func request_RoleService_RemoveRolePrincipals_0(ctx context.Context, marshaler r
 
 	msg, err := client.RemoveRolePrincipals(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_RemoveRolePrincipals_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -489,6 +506,7 @@ func local_request_RoleService_RemoveRolePrincipals_0(ctx context.Context, marsh
 
 	msg, err := server.RemoveRolePrincipals(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_AddRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -522,6 +540,7 @@ func request_RoleService_AddRoleGrants_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.AddRoleGrants(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_AddRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -555,6 +574,7 @@ func local_request_RoleService_AddRoleGrants_0(ctx context.Context, marshaler ru
 
 	msg, err := server.AddRoleGrants(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_SetRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -588,6 +608,7 @@ func request_RoleService_SetRoleGrants_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.SetRoleGrants(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_SetRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -621,6 +642,7 @@ func local_request_RoleService_SetRoleGrants_0(ctx context.Context, marshaler ru
 
 	msg, err := server.SetRoleGrants(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -654,6 +676,7 @@ func request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler runti
 
 	msg, err := client.RemoveRoleGrants(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler runtime.Marshaler, server RoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -687,6 +710,7 @@ func local_request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler
 
 	msg, err := server.RemoveRoleGrants(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterRoleServiceHandlerServer registers the http handlers for service RoleService to "mux".
@@ -694,6 +718,7 @@ func local_request_RoleService_RemoveRoleGrants_0(ctx context.Context, marshaler
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterRoleServiceHandlerFromEndpoint instead.
 func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server RoleServiceServer) error {
+
 	mux.Handle("GET", pattern_RoleService_GetRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -714,6 +739,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_GetRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_GetRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_RoleService_ListRoles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -736,6 +762,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_ListRoles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_CreateRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -758,6 +785,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_CreateRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_CreateRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_RoleService_UpdateRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -780,6 +808,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_UpdateRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_UpdateRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_RoleService_DeleteRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -802,6 +831,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_DeleteRole_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_AddRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -824,6 +854,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_AddRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_AddRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_SetRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -846,6 +877,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_SetRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_SetRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_RemoveRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -868,6 +900,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_RemoveRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_RemoveRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_AddRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -890,6 +923,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_AddRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_AddRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_SetRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -912,6 +946,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_SetRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_SetRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_RemoveRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -934,6 +969,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_RemoveRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_RemoveRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -976,6 +1012,7 @@ func RegisterRoleServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "RoleServiceClient" to call the correct interceptors.
 func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client RoleServiceClient) error {
+
 	mux.Handle("GET", pattern_RoleService_GetRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -993,6 +1030,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_GetRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_GetRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_RoleService_ListRoles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1012,6 +1050,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_ListRoles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_CreateRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1031,6 +1070,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_CreateRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_CreateRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_RoleService_UpdateRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1050,6 +1090,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_UpdateRole_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_UpdateRole_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_RoleService_DeleteRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1069,6 +1110,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_DeleteRole_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_AddRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1088,6 +1130,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_AddRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_AddRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_SetRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1107,6 +1150,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_SetRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_SetRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_RemoveRolePrincipals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1126,6 +1170,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_RemoveRolePrincipals_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_RemoveRolePrincipals_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_AddRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1145,6 +1190,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_AddRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_AddRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_SetRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1164,6 +1210,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_SetRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_SetRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_RoleService_RemoveRoleGrants_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -1183,6 +1230,7 @@ func RegisterRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_RoleService_RemoveRoleGrants_0(ctx, mux, outboundMarshaler, w, req, response_RoleService_RemoveRoleGrants_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/role_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -257,48 +256,39 @@ type RoleServiceServer interface {
 }
 
 // UnimplementedRoleServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedRoleServiceServer struct{}
+type UnimplementedRoleServiceServer struct {
+}
 
 func (UnimplementedRoleServiceServer) GetRole(context.Context, *GetRoleRequest) (*GetRoleResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRole not implemented")
 }
-
 func (UnimplementedRoleServiceServer) ListRoles(context.Context, *ListRolesRequest) (*ListRolesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListRoles not implemented")
 }
-
 func (UnimplementedRoleServiceServer) CreateRole(context.Context, *CreateRoleRequest) (*CreateRoleResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateRole not implemented")
 }
-
 func (UnimplementedRoleServiceServer) UpdateRole(context.Context, *UpdateRoleRequest) (*UpdateRoleResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateRole not implemented")
 }
-
 func (UnimplementedRoleServiceServer) DeleteRole(context.Context, *DeleteRoleRequest) (*DeleteRoleResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteRole not implemented")
 }
-
 func (UnimplementedRoleServiceServer) AddRolePrincipals(context.Context, *AddRolePrincipalsRequest) (*AddRolePrincipalsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddRolePrincipals not implemented")
 }
-
 func (UnimplementedRoleServiceServer) SetRolePrincipals(context.Context, *SetRolePrincipalsRequest) (*SetRolePrincipalsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetRolePrincipals not implemented")
 }
-
 func (UnimplementedRoleServiceServer) RemoveRolePrincipals(context.Context, *RemoveRolePrincipalsRequest) (*RemoveRolePrincipalsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveRolePrincipals not implemented")
 }
-
 func (UnimplementedRoleServiceServer) AddRoleGrants(context.Context, *AddRoleGrantsRequest) (*AddRoleGrantsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddRoleGrants not implemented")
 }
-
 func (UnimplementedRoleServiceServer) SetRoleGrants(context.Context, *SetRoleGrantsRequest) (*SetRoleGrantsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetRoleGrants not implemented")
 }
-
 func (UnimplementedRoleServiceServer) RemoveRoleGrants(context.Context, *RemoveRoleGrantsRequest) (*RemoveRoleGrantsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveRoleGrants not implemented")
 }

internal/gen/controller/api/services/scope_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -675,24 +674,21 @@ func file_controller_api_services_v1_scope_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_scope_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_scope_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-	file_controller_api_services_v1_scope_service_proto_goTypes  = []interface{}{
-		(*GetScopeRequest)(nil),      // 0: controller.api.services.v1.GetScopeRequest
-		(*GetScopeResponse)(nil),     // 1: controller.api.services.v1.GetScopeResponse
-		(*ListScopesRequest)(nil),    // 2: controller.api.services.v1.ListScopesRequest
-		(*ListScopesResponse)(nil),   // 3: controller.api.services.v1.ListScopesResponse
-		(*CreateScopeRequest)(nil),   // 4: controller.api.services.v1.CreateScopeRequest
-		(*CreateScopeResponse)(nil),  // 5: controller.api.services.v1.CreateScopeResponse
-		(*UpdateScopeRequest)(nil),   // 6: controller.api.services.v1.UpdateScopeRequest
-		(*UpdateScopeResponse)(nil),  // 7: controller.api.services.v1.UpdateScopeResponse
-		(*DeleteScopeRequest)(nil),   // 8: controller.api.services.v1.DeleteScopeRequest
-		(*DeleteScopeResponse)(nil),  // 9: controller.api.services.v1.DeleteScopeResponse
-		(*scopes.Scope)(nil),         // 10: controller.api.resources.scopes.v1.Scope
-		(*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_scope_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_controller_api_services_v1_scope_service_proto_goTypes = []interface{}{
+	(*GetScopeRequest)(nil),      // 0: controller.api.services.v1.GetScopeRequest
+	(*GetScopeResponse)(nil),     // 1: controller.api.services.v1.GetScopeResponse
+	(*ListScopesRequest)(nil),    // 2: controller.api.services.v1.ListScopesRequest
+	(*ListScopesResponse)(nil),   // 3: controller.api.services.v1.ListScopesResponse
+	(*CreateScopeRequest)(nil),   // 4: controller.api.services.v1.CreateScopeRequest
+	(*CreateScopeResponse)(nil),  // 5: controller.api.services.v1.CreateScopeResponse
+	(*UpdateScopeRequest)(nil),   // 6: controller.api.services.v1.UpdateScopeRequest
+	(*UpdateScopeResponse)(nil),  // 7: controller.api.services.v1.UpdateScopeResponse
+	(*DeleteScopeRequest)(nil),   // 8: controller.api.services.v1.DeleteScopeRequest
+	(*DeleteScopeResponse)(nil),  // 9: controller.api.services.v1.DeleteScopeResponse
+	(*scopes.Scope)(nil),         // 10: controller.api.resources.scopes.v1.Scope
+	(*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_scope_service_proto_depIdxs = []int32{
 	10, // 0: controller.api.services.v1.GetScopeResponse.item:type_name -> controller.api.resources.scopes.v1.Scope
 	10, // 1: controller.api.services.v1.ListScopesResponse.items:type_name -> controller.api.resources.scopes.v1.Scope

internal/gen/controller/api/services/scope_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_ScopeService_GetScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetScopeRequest
@@ -56,6 +54,7 @@ func request_ScopeService_GetScope_0(ctx context.Context, marshaler runtime.Mars
 
 	msg, err := client.GetScope(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_ScopeService_GetScope_0(ctx context.Context, marshaler runtime.Marshaler, server ScopeServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_ScopeService_GetScope_0(ctx context.Context, marshaler runtim
 
 	msg, err := server.GetScope(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_ScopeService_ListScopes_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_ScopeService_ListScopes_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_ScopeService_ListScopes_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListScopesRequest
@@ -98,6 +100,7 @@ func request_ScopeService_ListScopes_0(ctx context.Context, marshaler runtime.Ma
 
 	msg, err := client.ListScopes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_ScopeService_ListScopes_0(ctx context.Context, marshaler runtime.Marshaler, server ScopeServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,9 +116,12 @@ func local_request_ScopeService_ListScopes_0(ctx context.Context, marshaler runt
 
 	msg, err := server.ListScopes(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_ScopeService_CreateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+var (
+	filter_ScopeService_CreateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
 
 func request_ScopeService_CreateScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq CreateScopeRequest
@@ -138,6 +144,7 @@ func request_ScopeService_CreateScope_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.CreateScope(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_ScopeService_CreateScope_0(ctx context.Context, marshaler runtime.Marshaler, server ScopeServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -161,9 +168,12 @@ func local_request_ScopeService_CreateScope_0(ctx context.Context, marshaler run
 
 	msg, err := server.CreateScope(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_ScopeService_UpdateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_ScopeService_UpdateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_ScopeService_UpdateScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateScopeRequest
@@ -210,6 +220,7 @@ func request_ScopeService_UpdateScope_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.UpdateScope(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_ScopeService_UpdateScope_0(ctx context.Context, marshaler runtime.Marshaler, server ScopeServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -257,6 +268,7 @@ func local_request_ScopeService_UpdateScope_0(ctx context.Context, marshaler run
 
 	msg, err := server.UpdateScope(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_ScopeService_DeleteScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -282,6 +294,7 @@ func request_ScopeService_DeleteScope_0(ctx context.Context, marshaler runtime.M
 
 	msg, err := client.DeleteScope(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_ScopeService_DeleteScope_0(ctx context.Context, marshaler runtime.Marshaler, server ScopeServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -307,6 +320,7 @@ func local_request_ScopeService_DeleteScope_0(ctx context.Context, marshaler run
 
 	msg, err := server.DeleteScope(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterScopeServiceHandlerServer registers the http handlers for service ScopeService to "mux".
@@ -314,6 +328,7 @@ func local_request_ScopeService_DeleteScope_0(ctx context.Context, marshaler run
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterScopeServiceHandlerFromEndpoint instead.
 func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ScopeServiceServer) error {
+
 	mux.Handle("GET", pattern_ScopeService_GetScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -334,6 +349,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_GetScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_GetScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_ScopeService_ListScopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -356,6 +372,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_ListScopes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_ScopeService_CreateScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -378,6 +395,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_CreateScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_CreateScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_ScopeService_UpdateScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -400,6 +418,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_UpdateScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_UpdateScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_ScopeService_DeleteScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -422,6 +441,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_DeleteScope_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -464,6 +484,7 @@ func RegisterScopeServiceHandler(ctx context.Context, mux *runtime.ServeMux, con
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "ScopeServiceClient" to call the correct interceptors.
 func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ScopeServiceClient) error {
+
 	mux.Handle("GET", pattern_ScopeService_GetScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -481,6 +502,7 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_GetScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_GetScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_ScopeService_ListScopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -500,6 +522,7 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_ListScopes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_ScopeService_CreateScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -519,6 +542,7 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_CreateScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_CreateScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_ScopeService_UpdateScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -538,6 +562,7 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_UpdateScope_0(ctx, mux, outboundMarshaler, w, req, response_ScopeService_UpdateScope_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_ScopeService_DeleteScope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -557,6 +582,7 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		}
 
 		forward_ScopeService_DeleteScope_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/scope_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -133,24 +132,21 @@ type ScopeServiceServer interface {
 }
 
 // UnimplementedScopeServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedScopeServiceServer struct{}
+type UnimplementedScopeServiceServer struct {
+}
 
 func (UnimplementedScopeServiceServer) GetScope(context.Context, *GetScopeRequest) (*GetScopeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetScope not implemented")
 }
-
 func (UnimplementedScopeServiceServer) ListScopes(context.Context, *ListScopesRequest) (*ListScopesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListScopes not implemented")
 }
-
 func (UnimplementedScopeServiceServer) CreateScope(context.Context, *CreateScopeRequest) (*CreateScopeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateScope not implemented")
 }
-
 func (UnimplementedScopeServiceServer) UpdateScope(context.Context, *UpdateScopeRequest) (*UpdateScopeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateScope not implemented")
 }
-
 func (UnimplementedScopeServiceServer) DeleteScope(context.Context, *DeleteScopeRequest) (*DeleteScopeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteScope not implemented")
 }

internal/gen/controller/api/services/session_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	sessions "github.com/hashicorp/boundary/internal/gen/controller/api/resources/sessions"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	_ "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -413,19 +412,16 @@ func file_controller_api_services_v1_session_service_proto_rawDescGZIP() []byte
 	return file_controller_api_services_v1_session_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_session_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-	file_controller_api_services_v1_session_service_proto_goTypes  = []interface{}{
-		(*GetSessionRequest)(nil),     // 0: controller.api.services.v1.GetSessionRequest
-		(*GetSessionResponse)(nil),    // 1: controller.api.services.v1.GetSessionResponse
-		(*ListSessionsRequest)(nil),   // 2: controller.api.services.v1.ListSessionsRequest
-		(*ListSessionsResponse)(nil),  // 3: controller.api.services.v1.ListSessionsResponse
-		(*CancelSessionRequest)(nil),  // 4: controller.api.services.v1.CancelSessionRequest
-		(*CancelSessionResponse)(nil), // 5: controller.api.services.v1.CancelSessionResponse
-		(*sessions.Session)(nil),      // 6: controller.api.resources.sessions.v1.Session
-	}
-)
-
+var file_controller_api_services_v1_session_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_controller_api_services_v1_session_service_proto_goTypes = []interface{}{
+	(*GetSessionRequest)(nil),     // 0: controller.api.services.v1.GetSessionRequest
+	(*GetSessionResponse)(nil),    // 1: controller.api.services.v1.GetSessionResponse
+	(*ListSessionsRequest)(nil),   // 2: controller.api.services.v1.ListSessionsRequest
+	(*ListSessionsResponse)(nil),  // 3: controller.api.services.v1.ListSessionsResponse
+	(*CancelSessionRequest)(nil),  // 4: controller.api.services.v1.CancelSessionRequest
+	(*CancelSessionResponse)(nil), // 5: controller.api.services.v1.CancelSessionResponse
+	(*sessions.Session)(nil),      // 6: controller.api.resources.sessions.v1.Session
+}
 var file_controller_api_services_v1_session_service_proto_depIdxs = []int32{
 	6, // 0: controller.api.services.v1.GetSessionResponse.item:type_name -> controller.api.resources.sessions.v1.Session
 	6, // 1: controller.api.services.v1.ListSessionsResponse.items:type_name -> controller.api.resources.sessions.v1.Session

internal/gen/controller/api/services/session_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_SessionService_GetSession_0(ctx context.Context, marshaler runtime.Marshaler, client SessionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetSessionRequest
@@ -56,6 +54,7 @@ func request_SessionService_GetSession_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.GetSession(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_SessionService_GetSession_0(ctx context.Context, marshaler runtime.Marshaler, server SessionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_SessionService_GetSession_0(ctx context.Context, marshaler ru
 
 	msg, err := server.GetSession(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_SessionService_ListSessions_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_SessionService_ListSessions_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_SessionService_ListSessions_0(ctx context.Context, marshaler runtime.Marshaler, client SessionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListSessionsRequest
@@ -98,6 +100,7 @@ func request_SessionService_ListSessions_0(ctx context.Context, marshaler runtim
 
 	msg, err := client.ListSessions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_SessionService_ListSessions_0(ctx context.Context, marshaler runtime.Marshaler, server SessionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_SessionService_ListSessions_0(ctx context.Context, marshaler
 
 	msg, err := server.ListSessions(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_SessionService_CancelSession_0(ctx context.Context, marshaler runtime.Marshaler, client SessionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -146,6 +150,7 @@ func request_SessionService_CancelSession_0(ctx context.Context, marshaler runti
 
 	msg, err := client.CancelSession(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_SessionService_CancelSession_0(ctx context.Context, marshaler runtime.Marshaler, server SessionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -179,6 +184,7 @@ func local_request_SessionService_CancelSession_0(ctx context.Context, marshaler
 
 	msg, err := server.CancelSession(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterSessionServiceHandlerServer registers the http handlers for service SessionService to "mux".
@@ -186,6 +192,7 @@ func local_request_SessionService_CancelSession_0(ctx context.Context, marshaler
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterSessionServiceHandlerFromEndpoint instead.
 func RegisterSessionServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server SessionServiceServer) error {
+
 	mux.Handle("GET", pattern_SessionService_GetSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -206,6 +213,7 @@ func RegisterSessionServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_GetSession_0(ctx, mux, outboundMarshaler, w, req, response_SessionService_GetSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_SessionService_ListSessions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -228,6 +236,7 @@ func RegisterSessionServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_ListSessions_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_SessionService_CancelSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -250,6 +259,7 @@ func RegisterSessionServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_CancelSession_0(ctx, mux, outboundMarshaler, w, req, response_SessionService_CancelSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -292,6 +302,7 @@ func RegisterSessionServiceHandler(ctx context.Context, mux *runtime.ServeMux, c
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "SessionServiceClient" to call the correct interceptors.
 func RegisterSessionServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client SessionServiceClient) error {
+
 	mux.Handle("GET", pattern_SessionService_GetSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -309,6 +320,7 @@ func RegisterSessionServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_GetSession_0(ctx, mux, outboundMarshaler, w, req, response_SessionService_GetSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_SessionService_ListSessions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -328,6 +340,7 @@ func RegisterSessionServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_ListSessions_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_SessionService_CancelSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -347,6 +360,7 @@ func RegisterSessionServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 		}
 
 		forward_SessionService_CancelSession_0(ctx, mux, outboundMarshaler, w, req, response_SessionService_CancelSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/session_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -91,16 +90,15 @@ type SessionServiceServer interface {
 }
 
 // UnimplementedSessionServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedSessionServiceServer struct{}
+type UnimplementedSessionServiceServer struct {
+}
 
 func (UnimplementedSessionServiceServer) GetSession(context.Context, *GetSessionRequest) (*GetSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetSession not implemented")
 }
-
 func (UnimplementedSessionServiceServer) ListSessions(context.Context, *ListSessionsRequest) (*ListSessionsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListSessions not implemented")
 }
-
 func (UnimplementedSessionServiceServer) CancelSession(context.Context, *CancelSessionRequest) (*CancelSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CancelSession not implemented")
 }

internal/gen/controller/api/services/target_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	targets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1226,33 +1225,30 @@ func file_controller_api_services_v1_target_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_target_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_target_service_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
-	file_controller_api_services_v1_target_service_proto_goTypes  = []interface{}{
-		(*GetTargetRequest)(nil),             // 0: controller.api.services.v1.GetTargetRequest
-		(*GetTargetResponse)(nil),            // 1: controller.api.services.v1.GetTargetResponse
-		(*ListTargetsRequest)(nil),           // 2: controller.api.services.v1.ListTargetsRequest
-		(*ListTargetsResponse)(nil),          // 3: controller.api.services.v1.ListTargetsResponse
-		(*CreateTargetRequest)(nil),          // 4: controller.api.services.v1.CreateTargetRequest
-		(*CreateTargetResponse)(nil),         // 5: controller.api.services.v1.CreateTargetResponse
-		(*UpdateTargetRequest)(nil),          // 6: controller.api.services.v1.UpdateTargetRequest
-		(*UpdateTargetResponse)(nil),         // 7: controller.api.services.v1.UpdateTargetResponse
-		(*DeleteTargetRequest)(nil),          // 8: controller.api.services.v1.DeleteTargetRequest
-		(*DeleteTargetResponse)(nil),         // 9: controller.api.services.v1.DeleteTargetResponse
-		(*AddTargetHostSetsRequest)(nil),     // 10: controller.api.services.v1.AddTargetHostSetsRequest
-		(*AddTargetHostSetsResponse)(nil),    // 11: controller.api.services.v1.AddTargetHostSetsResponse
-		(*SetTargetHostSetsRequest)(nil),     // 12: controller.api.services.v1.SetTargetHostSetsRequest
-		(*SetTargetHostSetsResponse)(nil),    // 13: controller.api.services.v1.SetTargetHostSetsResponse
-		(*RemoveTargetHostSetsRequest)(nil),  // 14: controller.api.services.v1.RemoveTargetHostSetsRequest
-		(*RemoveTargetHostSetsResponse)(nil), // 15: controller.api.services.v1.RemoveTargetHostSetsResponse
-		(*AuthorizeSessionRequest)(nil),      // 16: controller.api.services.v1.AuthorizeSessionRequest
-		(*AuthorizeSessionResponse)(nil),     // 17: controller.api.services.v1.AuthorizeSessionResponse
-		(*targets.Target)(nil),               // 18: controller.api.resources.targets.v1.Target
-		(*field_mask.FieldMask)(nil),         // 19: google.protobuf.FieldMask
-		(*targets.SessionAuthorization)(nil), // 20: controller.api.resources.targets.v1.SessionAuthorization
-	}
-)
-
+var file_controller_api_services_v1_target_service_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_controller_api_services_v1_target_service_proto_goTypes = []interface{}{
+	(*GetTargetRequest)(nil),             // 0: controller.api.services.v1.GetTargetRequest
+	(*GetTargetResponse)(nil),            // 1: controller.api.services.v1.GetTargetResponse
+	(*ListTargetsRequest)(nil),           // 2: controller.api.services.v1.ListTargetsRequest
+	(*ListTargetsResponse)(nil),          // 3: controller.api.services.v1.ListTargetsResponse
+	(*CreateTargetRequest)(nil),          // 4: controller.api.services.v1.CreateTargetRequest
+	(*CreateTargetResponse)(nil),         // 5: controller.api.services.v1.CreateTargetResponse
+	(*UpdateTargetRequest)(nil),          // 6: controller.api.services.v1.UpdateTargetRequest
+	(*UpdateTargetResponse)(nil),         // 7: controller.api.services.v1.UpdateTargetResponse
+	(*DeleteTargetRequest)(nil),          // 8: controller.api.services.v1.DeleteTargetRequest
+	(*DeleteTargetResponse)(nil),         // 9: controller.api.services.v1.DeleteTargetResponse
+	(*AddTargetHostSetsRequest)(nil),     // 10: controller.api.services.v1.AddTargetHostSetsRequest
+	(*AddTargetHostSetsResponse)(nil),    // 11: controller.api.services.v1.AddTargetHostSetsResponse
+	(*SetTargetHostSetsRequest)(nil),     // 12: controller.api.services.v1.SetTargetHostSetsRequest
+	(*SetTargetHostSetsResponse)(nil),    // 13: controller.api.services.v1.SetTargetHostSetsResponse
+	(*RemoveTargetHostSetsRequest)(nil),  // 14: controller.api.services.v1.RemoveTargetHostSetsRequest
+	(*RemoveTargetHostSetsResponse)(nil), // 15: controller.api.services.v1.RemoveTargetHostSetsResponse
+	(*AuthorizeSessionRequest)(nil),      // 16: controller.api.services.v1.AuthorizeSessionRequest
+	(*AuthorizeSessionResponse)(nil),     // 17: controller.api.services.v1.AuthorizeSessionResponse
+	(*targets.Target)(nil),               // 18: controller.api.resources.targets.v1.Target
+	(*field_mask.FieldMask)(nil),         // 19: google.protobuf.FieldMask
+	(*targets.SessionAuthorization)(nil), // 20: controller.api.resources.targets.v1.SessionAuthorization
+}
 var file_controller_api_services_v1_target_service_proto_depIdxs = []int32{
 	18, // 0: controller.api.services.v1.GetTargetResponse.item:type_name -> controller.api.resources.targets.v1.Target
 	18, // 1: controller.api.services.v1.ListTargetsResponse.items:type_name -> controller.api.resources.targets.v1.Target

internal/gen/controller/api/services/target_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_TargetService_GetTarget_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetTargetRequest
@@ -56,6 +54,7 @@ func request_TargetService_GetTarget_0(ctx context.Context, marshaler runtime.Ma
 
 	msg, err := client.GetTarget(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_GetTarget_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_TargetService_GetTarget_0(ctx context.Context, marshaler runt
 
 	msg, err := server.GetTarget(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_TargetService_ListTargets_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_TargetService_ListTargets_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_TargetService_ListTargets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListTargetsRequest
@@ -98,6 +100,7 @@ func request_TargetService_ListTargets_0(ctx context.Context, marshaler runtime.
 
 	msg, err := client.ListTargets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_ListTargets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_TargetService_ListTargets_0(ctx context.Context, marshaler ru
 
 	msg, err := server.ListTargets(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_CreateTarget_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_TargetService_CreateTarget_0(ctx context.Context, marshaler runtime
 
 	msg, err := client.CreateTarget(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_CreateTarget_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_TargetService_CreateTarget_0(ctx context.Context, marshaler r
 
 	msg, err := server.CreateTarget(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_TargetService_UpdateTarget_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_TargetService_UpdateTarget_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_TargetService_UpdateTarget_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateTargetRequest
@@ -194,6 +202,7 @@ func request_TargetService_UpdateTarget_0(ctx context.Context, marshaler runtime
 
 	msg, err := client.UpdateTarget(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_UpdateTarget_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_TargetService_UpdateTarget_0(ctx context.Context, marshaler r
 
 	msg, err := server.UpdateTarget(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_DeleteTarget_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_TargetService_DeleteTarget_0(ctx context.Context, marshaler runtime
 
 	msg, err := client.DeleteTarget(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_DeleteTarget_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_TargetService_DeleteTarget_0(ctx context.Context, marshaler r
 
 	msg, err := server.DeleteTarget(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_AuthorizeSession_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_TargetService_AuthorizeSession_0(ctx context.Context, marshaler run
 
 	msg, err := client.AuthorizeSession(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_AuthorizeSession_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_TargetService_AuthorizeSession_0(ctx context.Context, marshal
 
 	msg, err := server.AuthorizeSession(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_AddTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_TargetService_AddTargetHostSets_0(ctx context.Context, marshaler ru
 
 	msg, err := client.AddTargetHostSets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_AddTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_TargetService_AddTargetHostSets_0(ctx context.Context, marsha
 
 	msg, err := server.AddTargetHostSets(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_SetTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -456,6 +472,7 @@ func request_TargetService_SetTargetHostSets_0(ctx context.Context, marshaler ru
 
 	msg, err := client.SetTargetHostSets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_SetTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -489,6 +506,7 @@ func local_request_TargetService_SetTargetHostSets_0(ctx context.Context, marsha
 
 	msg, err := server.SetTargetHostSets(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_TargetService_RemoveTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -522,6 +540,7 @@ func request_TargetService_RemoveTargetHostSets_0(ctx context.Context, marshaler
 
 	msg, err := client.RemoveTargetHostSets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_TargetService_RemoveTargetHostSets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -555,6 +574,7 @@ func local_request_TargetService_RemoveTargetHostSets_0(ctx context.Context, mar
 
 	msg, err := server.RemoveTargetHostSets(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterTargetServiceHandlerServer registers the http handlers for service TargetService to "mux".
@@ -562,6 +582,7 @@ func local_request_TargetService_RemoveTargetHostSets_0(ctx context.Context, mar
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterTargetServiceHandlerFromEndpoint instead.
 func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TargetServiceServer) error {
+
 	mux.Handle("GET", pattern_TargetService_GetTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -582,6 +603,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_GetTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_GetTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_TargetService_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -604,6 +626,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_ListTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_CreateTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -626,6 +649,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_CreateTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_CreateTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_TargetService_UpdateTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -648,6 +672,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_UpdateTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_UpdateTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_TargetService_DeleteTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -670,6 +695,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_DeleteTarget_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_AuthorizeSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -692,6 +718,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_AuthorizeSession_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_AuthorizeSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_AddTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -714,6 +741,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_AddTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_AddTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_SetTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -736,6 +764,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_SetTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_SetTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_RemoveTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -758,6 +787,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_RemoveTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_RemoveTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -800,6 +830,7 @@ func RegisterTargetServiceHandler(ctx context.Context, mux *runtime.ServeMux, co
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "TargetServiceClient" to call the correct interceptors.
 func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client TargetServiceClient) error {
+
 	mux.Handle("GET", pattern_TargetService_GetTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -817,6 +848,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_GetTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_GetTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_TargetService_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -836,6 +868,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_ListTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_CreateTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -855,6 +888,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_CreateTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_CreateTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_TargetService_UpdateTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -874,6 +908,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_UpdateTarget_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_UpdateTarget_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_TargetService_DeleteTarget_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -893,6 +928,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_DeleteTarget_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_AuthorizeSession_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -912,6 +948,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_AuthorizeSession_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_AuthorizeSession_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_AddTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -931,6 +968,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_AddTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_AddTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_SetTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -950,6 +988,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_SetTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_SetTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_TargetService_RemoveTargetHostSets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -969,6 +1008,7 @@ func RegisterTargetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
 		}
 
 		forward_TargetService_RemoveTargetHostSets_0(ctx, mux, outboundMarshaler, w, req, response_TargetService_RemoveTargetHostSets_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/target_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -223,40 +222,33 @@ type TargetServiceServer interface {
 }
 
 // UnimplementedTargetServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedTargetServiceServer struct{}
+type UnimplementedTargetServiceServer struct {
+}
 
 func (UnimplementedTargetServiceServer) GetTarget(context.Context, *GetTargetRequest) (*GetTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetTarget not implemented")
 }
-
 func (UnimplementedTargetServiceServer) ListTargets(context.Context, *ListTargetsRequest) (*ListTargetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListTargets not implemented")
 }
-
 func (UnimplementedTargetServiceServer) CreateTarget(context.Context, *CreateTargetRequest) (*CreateTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTarget not implemented")
 }
-
 func (UnimplementedTargetServiceServer) UpdateTarget(context.Context, *UpdateTargetRequest) (*UpdateTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTarget not implemented")
 }
-
 func (UnimplementedTargetServiceServer) DeleteTarget(context.Context, *DeleteTargetRequest) (*DeleteTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTarget not implemented")
 }
-
 func (UnimplementedTargetServiceServer) AuthorizeSession(context.Context, *AuthorizeSessionRequest) (*AuthorizeSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AuthorizeSession not implemented")
 }
-
 func (UnimplementedTargetServiceServer) AddTargetHostSets(context.Context, *AddTargetHostSetsRequest) (*AddTargetHostSetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddTargetHostSets not implemented")
 }
-
 func (UnimplementedTargetServiceServer) SetTargetHostSets(context.Context, *SetTargetHostSetsRequest) (*SetTargetHostSetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetTargetHostSets not implemented")
 }
-
 func (UnimplementedTargetServiceServer) RemoveTargetHostSets(context.Context, *RemoveTargetHostSetsRequest) (*RemoveTargetHostSetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveTargetHostSets not implemented")
 }

internal/gen/controller/api/services/user_service.pb.go

@@ -7,15 +7,14 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	users "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1062,30 +1061,27 @@ func file_controller_api_services_v1_user_service_proto_rawDescGZIP() []byte {
 	return file_controller_api_services_v1_user_service_proto_rawDescData
 }
 
-var (
-	file_controller_api_services_v1_user_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-	file_controller_api_services_v1_user_service_proto_goTypes  = []interface{}{
-		(*GetUserRequest)(nil),             // 0: controller.api.services.v1.GetUserRequest
-		(*GetUserResponse)(nil),            // 1: controller.api.services.v1.GetUserResponse
-		(*ListUsersRequest)(nil),           // 2: controller.api.services.v1.ListUsersRequest
-		(*ListUsersResponse)(nil),          // 3: controller.api.services.v1.ListUsersResponse
-		(*CreateUserRequest)(nil),          // 4: controller.api.services.v1.CreateUserRequest
-		(*CreateUserResponse)(nil),         // 5: controller.api.services.v1.CreateUserResponse
-		(*UpdateUserRequest)(nil),          // 6: controller.api.services.v1.UpdateUserRequest
-		(*UpdateUserResponse)(nil),         // 7: controller.api.services.v1.UpdateUserResponse
-		(*DeleteUserRequest)(nil),          // 8: controller.api.services.v1.DeleteUserRequest
-		(*DeleteUserResponse)(nil),         // 9: controller.api.services.v1.DeleteUserResponse
-		(*AddUserAccountsRequest)(nil),     // 10: controller.api.services.v1.AddUserAccountsRequest
-		(*AddUserAccountsResponse)(nil),    // 11: controller.api.services.v1.AddUserAccountsResponse
-		(*SetUserAccountsRequest)(nil),     // 12: controller.api.services.v1.SetUserAccountsRequest
-		(*SetUserAccountsResponse)(nil),    // 13: controller.api.services.v1.SetUserAccountsResponse
-		(*RemoveUserAccountsRequest)(nil),  // 14: controller.api.services.v1.RemoveUserAccountsRequest
-		(*RemoveUserAccountsResponse)(nil), // 15: controller.api.services.v1.RemoveUserAccountsResponse
-		(*users.User)(nil),                 // 16: controller.api.resources.users.v1.User
-		(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_api_services_v1_user_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_controller_api_services_v1_user_service_proto_goTypes = []interface{}{
+	(*GetUserRequest)(nil),             // 0: controller.api.services.v1.GetUserRequest
+	(*GetUserResponse)(nil),            // 1: controller.api.services.v1.GetUserResponse
+	(*ListUsersRequest)(nil),           // 2: controller.api.services.v1.ListUsersRequest
+	(*ListUsersResponse)(nil),          // 3: controller.api.services.v1.ListUsersResponse
+	(*CreateUserRequest)(nil),          // 4: controller.api.services.v1.CreateUserRequest
+	(*CreateUserResponse)(nil),         // 5: controller.api.services.v1.CreateUserResponse
+	(*UpdateUserRequest)(nil),          // 6: controller.api.services.v1.UpdateUserRequest
+	(*UpdateUserResponse)(nil),         // 7: controller.api.services.v1.UpdateUserResponse
+	(*DeleteUserRequest)(nil),          // 8: controller.api.services.v1.DeleteUserRequest
+	(*DeleteUserResponse)(nil),         // 9: controller.api.services.v1.DeleteUserResponse
+	(*AddUserAccountsRequest)(nil),     // 10: controller.api.services.v1.AddUserAccountsRequest
+	(*AddUserAccountsResponse)(nil),    // 11: controller.api.services.v1.AddUserAccountsResponse
+	(*SetUserAccountsRequest)(nil),     // 12: controller.api.services.v1.SetUserAccountsRequest
+	(*SetUserAccountsResponse)(nil),    // 13: controller.api.services.v1.SetUserAccountsResponse
+	(*RemoveUserAccountsRequest)(nil),  // 14: controller.api.services.v1.RemoveUserAccountsRequest
+	(*RemoveUserAccountsResponse)(nil), // 15: controller.api.services.v1.RemoveUserAccountsResponse
+	(*users.User)(nil),                 // 16: controller.api.resources.users.v1.User
+	(*field_mask.FieldMask)(nil),       // 17: google.protobuf.FieldMask
+}
 var file_controller_api_services_v1_user_service_proto_depIdxs = []int32{
 	16, // 0: controller.api.services.v1.GetUserResponse.item:type_name -> controller.api.resources.users.v1.User
 	16, // 1: controller.api.services.v1.ListUsersResponse.items:type_name -> controller.api.resources.users.v1.User

internal/gen/controller/api/services/user_service.pb.gw.go

@@ -24,14 +24,12 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var (
-	_ codes.Code
-	_ io.Reader
-	_ status.Status
-	_ = runtime.String
-	_ = utilities.NewDoubleArray
-	_ = metadata.Join
-)
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
 
 func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq GetUserRequest
@@ -56,6 +54,7 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha
 
 	msg, err := client.GetUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -81,9 +80,12 @@ func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime.
 
 	msg, err := server.GetUser(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_UserService_ListUsers_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+var (
+	filter_UserService_ListUsers_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
 
 func request_UserService_ListUsers_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListUsersRequest
@@ -98,6 +100,7 @@ func request_UserService_ListUsers_0(ctx context.Context, marshaler runtime.Mars
 
 	msg, err := client.ListUsers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_ListUsers_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -113,6 +116,7 @@ func local_request_UserService_ListUsers_0(ctx context.Context, marshaler runtim
 
 	msg, err := server.ListUsers(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -129,6 +133,7 @@ func request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.CreateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -145,9 +150,12 @@ func local_request_UserService_CreateUser_0(ctx context.Context, marshaler runti
 
 	msg, err := server.CreateUser(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
-var filter_UserService_UpdateUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+var (
+	filter_UserService_UpdateUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
 
 func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq UpdateUserRequest
@@ -194,6 +202,7 @@ func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.UpdateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -241,6 +250,7 @@ func local_request_UserService_UpdateUser_0(ctx context.Context, marshaler runti
 
 	msg, err := server.UpdateUser(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -266,6 +276,7 @@ func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Mar
 
 	msg, err := client.DeleteUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -291,6 +302,7 @@ func local_request_UserService_DeleteUser_0(ctx context.Context, marshaler runti
 
 	msg, err := server.DeleteUser(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_UserService_AddUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -324,6 +336,7 @@ func request_UserService_AddUserAccounts_0(ctx context.Context, marshaler runtim
 
 	msg, err := client.AddUserAccounts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_AddUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -357,6 +370,7 @@ func local_request_UserService_AddUserAccounts_0(ctx context.Context, marshaler
 
 	msg, err := server.AddUserAccounts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_UserService_SetUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -390,6 +404,7 @@ func request_UserService_SetUserAccounts_0(ctx context.Context, marshaler runtim
 
 	msg, err := client.SetUserAccounts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_SetUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -423,6 +438,7 @@ func local_request_UserService_SetUserAccounts_0(ctx context.Context, marshaler
 
 	msg, err := server.SetUserAccounts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 func request_UserService_RemoveUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -456,6 +472,7 @@ func request_UserService_RemoveUserAccounts_0(ctx context.Context, marshaler run
 
 	msg, err := client.RemoveUserAccounts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+
 }
 
 func local_request_UserService_RemoveUserAccounts_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -489,6 +506,7 @@ func local_request_UserService_RemoveUserAccounts_0(ctx context.Context, marshal
 
 	msg, err := server.RemoveUserAccounts(ctx, &protoReq)
 	return msg, metadata, err
+
 }
 
 // RegisterUserServiceHandlerServer registers the http handlers for service UserService to "mux".
@@ -496,6 +514,7 @@ func local_request_UserService_RemoveUserAccounts_0(ctx context.Context, marshal
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterUserServiceHandlerFromEndpoint instead.
 func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server UserServiceServer) error {
+
 	mux.Handle("GET", pattern_UserService_GetUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -516,6 +535,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_GetUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_GetUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_UserService_ListUsers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -538,6 +558,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_ListUsers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_CreateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -560,6 +581,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_CreateUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_CreateUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_UserService_UpdateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -582,6 +604,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_UpdateUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_UpdateUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_UserService_DeleteUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -604,6 +627,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_DeleteUser_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_AddUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -626,6 +650,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_AddUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_AddUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_SetUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -648,6 +673,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_SetUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_SetUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_RemoveUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -670,6 +696,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_RemoveUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_RemoveUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil
@@ -712,6 +739,7 @@ func RegisterUserServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "UserServiceClient" to call the correct interceptors.
 func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client UserServiceClient) error {
+
 	mux.Handle("GET", pattern_UserService_GetUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -729,6 +757,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_GetUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_GetUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("GET", pattern_UserService_ListUsers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -748,6 +777,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_ListUsers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_CreateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -767,6 +797,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_CreateUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_CreateUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("PATCH", pattern_UserService_UpdateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -786,6 +817,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_UpdateUser_0(ctx, mux, outboundMarshaler, w, req, response_UserService_UpdateUser_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("DELETE", pattern_UserService_DeleteUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -805,6 +837,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_DeleteUser_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_AddUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -824,6 +857,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_AddUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_AddUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_SetUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -843,6 +877,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_SetUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_SetUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	mux.Handle("POST", pattern_UserService_RemoveUserAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
@@ -862,6 +897,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 
 		forward_UserService_RemoveUserAccounts_0(ctx, mux, outboundMarshaler, w, req, response_UserService_RemoveUserAccounts_0{resp}, mux.GetForwardResponseOptions()...)
+
 	})
 
 	return nil

internal/gen/controller/api/services/user_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -204,36 +203,30 @@ type UserServiceServer interface {
 }
 
 // UnimplementedUserServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedUserServiceServer struct{}
+type UnimplementedUserServiceServer struct {
+}
 
 func (UnimplementedUserServiceServer) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUser not implemented")
 }
-
 func (UnimplementedUserServiceServer) ListUsers(context.Context, *ListUsersRequest) (*ListUsersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListUsers not implemented")
 }
-
 func (UnimplementedUserServiceServer) CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUser not implemented")
 }
-
 func (UnimplementedUserServiceServer) UpdateUser(context.Context, *UpdateUserRequest) (*UpdateUserResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateUser not implemented")
 }
-
 func (UnimplementedUserServiceServer) DeleteUser(context.Context, *DeleteUserRequest) (*DeleteUserResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteUser not implemented")
 }
-
 func (UnimplementedUserServiceServer) AddUserAccounts(context.Context, *AddUserAccountsRequest) (*AddUserAccountsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddUserAccounts not implemented")
 }
-
 func (UnimplementedUserServiceServer) SetUserAccounts(context.Context, *SetUserAccountsRequest) (*SetUserAccountsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetUserAccounts not implemented")
 }
-
 func (UnimplementedUserServiceServer) RemoveUserAccounts(context.Context, *RemoveUserAccountsRequest) (*RemoveUserAccountsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveUserAccounts not implemented")
 }

internal/gen/controller/protooptions/options.pb.go

@@ -7,12 +7,11 @@
 package protooptions
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -157,14 +156,11 @@ func file_controller_custom_options_v1_options_proto_rawDescGZIP() []byte {
 	return file_controller_custom_options_v1_options_proto_rawDescData
 }
 
-var (
-	file_controller_custom_options_v1_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_custom_options_v1_options_proto_goTypes  = []interface{}{
-		(*MaskMapping)(nil),             // 0: controller.custom_options.v1.MaskMapping
-		(*descriptor.FieldOptions)(nil), // 1: google.protobuf.FieldOptions
-	}
-)
-
+var file_controller_custom_options_v1_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_custom_options_v1_options_proto_goTypes = []interface{}{
+	(*MaskMapping)(nil),             // 0: controller.custom_options.v1.MaskMapping
+	(*descriptor.FieldOptions)(nil), // 1: google.protobuf.FieldOptions
+}
 var file_controller_custom_options_v1_options_proto_depIdxs = []int32{
 	1, // 0: controller.custom_options.v1.mask_mapping:extendee -> google.protobuf.FieldOptions
 	1, // 1: controller.custom_options.v1.generate_sdk_option:extendee -> google.protobuf.FieldOptions

internal/gen/controller/protooptions/testing.pb.go

@@ -7,11 +7,10 @@
 package protooptions
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -615,19 +614,16 @@ func file_controller_custom_options_v1_testing_proto_rawDescGZIP() []byte {
 	return file_controller_custom_options_v1_testing_proto_rawDescData
 }
 
-var (
-	file_controller_custom_options_v1_testing_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-	file_controller_custom_options_v1_testing_proto_goTypes  = []interface{}{
-		(*TestBase)(nil),                // 0: controller.custom_options.v1.TestBase
-		(*TestBaseSplit1)(nil),          // 1: controller.custom_options.v1.TestBaseSplit1
-		(*TestBaseSplit2)(nil),          // 2: controller.custom_options.v1.TestBaseSplit2
-		(*TestProperlyNamedFields)(nil), // 3: controller.custom_options.v1.TestProperlyNamedFields
-		(*TestNameDoesntMap)(nil),       // 4: controller.custom_options.v1.TestNameDoesntMap
-		(*TestNotEnoughFields)(nil),     // 5: controller.custom_options.v1.TestNotEnoughFields
-		(*TestManyToOneMappings)(nil),   // 6: controller.custom_options.v1.TestManyToOneMappings
-	}
-)
-
+var file_controller_custom_options_v1_testing_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_controller_custom_options_v1_testing_proto_goTypes = []interface{}{
+	(*TestBase)(nil),                // 0: controller.custom_options.v1.TestBase
+	(*TestBaseSplit1)(nil),          // 1: controller.custom_options.v1.TestBaseSplit1
+	(*TestBaseSplit2)(nil),          // 2: controller.custom_options.v1.TestBaseSplit2
+	(*TestProperlyNamedFields)(nil), // 3: controller.custom_options.v1.TestProperlyNamedFields
+	(*TestNameDoesntMap)(nil),       // 4: controller.custom_options.v1.TestNameDoesntMap
+	(*TestNotEnoughFields)(nil),     // 5: controller.custom_options.v1.TestNotEnoughFields
+	(*TestManyToOneMappings)(nil),   // 6: controller.custom_options.v1.TestManyToOneMappings
+}
 var file_controller_custom_options_v1_testing_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/gen/controller/servers/services/server_coordination_service.pb.go

@@ -7,13 +7,12 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/golang/protobuf/ptypes/timestamp"
 	servers "github.com/hashicorp/boundary/internal/servers"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -773,25 +772,22 @@ func file_controller_servers_services_v1_server_coordination_service_proto_rawDe
 	return file_controller_servers_services_v1_server_coordination_service_proto_rawDescData
 }
 
-var (
-	file_controller_servers_services_v1_server_coordination_service_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
-	file_controller_servers_services_v1_server_coordination_service_proto_msgTypes  = make([]protoimpl.MessageInfo, 7)
-	file_controller_servers_services_v1_server_coordination_service_proto_goTypes   = []interface{}{
-		(CONNECTIONSTATUS)(0),    // 0: controller.servers.services.v1.CONNECTIONSTATUS
-		(SESSIONSTATUS)(0),       // 1: controller.servers.services.v1.SESSIONSTATUS
-		(JOBTYPE)(0),             // 2: controller.servers.services.v1.JOBTYPE
-		(CHANGETYPE)(0),          // 3: controller.servers.services.v1.CHANGETYPE
-		(*Connection)(nil),       // 4: controller.servers.services.v1.Connection
-		(*SessionJobInfo)(nil),   // 5: controller.servers.services.v1.SessionJobInfo
-		(*Job)(nil),              // 6: controller.servers.services.v1.Job
-		(*JobStatus)(nil),        // 7: controller.servers.services.v1.JobStatus
-		(*StatusRequest)(nil),    // 8: controller.servers.services.v1.StatusRequest
-		(*JobChangeRequest)(nil), // 9: controller.servers.services.v1.JobChangeRequest
-		(*StatusResponse)(nil),   // 10: controller.servers.services.v1.StatusResponse
-		(*servers.Server)(nil),   // 11: controller.servers.v1.Server
-	}
-)
-
+var file_controller_servers_services_v1_server_coordination_service_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_controller_servers_services_v1_server_coordination_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_controller_servers_services_v1_server_coordination_service_proto_goTypes = []interface{}{
+	(CONNECTIONSTATUS)(0),    // 0: controller.servers.services.v1.CONNECTIONSTATUS
+	(SESSIONSTATUS)(0),       // 1: controller.servers.services.v1.SESSIONSTATUS
+	(JOBTYPE)(0),             // 2: controller.servers.services.v1.JOBTYPE
+	(CHANGETYPE)(0),          // 3: controller.servers.services.v1.CHANGETYPE
+	(*Connection)(nil),       // 4: controller.servers.services.v1.Connection
+	(*SessionJobInfo)(nil),   // 5: controller.servers.services.v1.SessionJobInfo
+	(*Job)(nil),              // 6: controller.servers.services.v1.Job
+	(*JobStatus)(nil),        // 7: controller.servers.services.v1.JobStatus
+	(*StatusRequest)(nil),    // 8: controller.servers.services.v1.StatusRequest
+	(*JobChangeRequest)(nil), // 9: controller.servers.services.v1.JobChangeRequest
+	(*StatusResponse)(nil),   // 10: controller.servers.services.v1.StatusResponse
+	(*servers.Server)(nil),   // 11: controller.servers.v1.Server
+}
 var file_controller_servers_services_v1_server_coordination_service_proto_depIdxs = []int32{
 	0,  // 0: controller.servers.services.v1.Connection.status:type_name -> controller.servers.services.v1.CONNECTIONSTATUS
 	1,  // 1: controller.servers.services.v1.SessionJobInfo.status:type_name -> controller.servers.services.v1.SESSIONSTATUS

internal/gen/controller/servers/services/server_coordination_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -53,12 +52,12 @@ type ServerCoordinationServiceServer interface {
 }
 
 // UnimplementedServerCoordinationServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedServerCoordinationServiceServer struct{}
+type UnimplementedServerCoordinationServiceServer struct {
+}
 
 func (UnimplementedServerCoordinationServiceServer) Status(context.Context, *StatusRequest) (*StatusResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Status not implemented")
 }
-
 func (UnimplementedServerCoordinationServiceServer) mustEmbedUnimplementedServerCoordinationServiceServer() {
 }
 

internal/gen/controller/servers/services/session_service.pb.go

@@ -7,14 +7,13 @@
 package services
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	targets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets"
 	_ "github.com/hashicorp/boundary/internal/servers"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -1125,30 +1124,27 @@ func file_controller_servers_services_v1_session_service_proto_rawDescGZIP() []b
 	return file_controller_servers_services_v1_session_service_proto_rawDescData
 }
 
-var (
-	file_controller_servers_services_v1_session_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
-	file_controller_servers_services_v1_session_service_proto_goTypes  = []interface{}{
-		(*LookupSessionRequest)(nil),             // 0: controller.servers.services.v1.LookupSessionRequest
-		(*LookupSessionResponse)(nil),            // 1: controller.servers.services.v1.LookupSessionResponse
-		(*ActivateSessionRequest)(nil),           // 2: controller.servers.services.v1.ActivateSessionRequest
-		(*ActivateSessionResponse)(nil),          // 3: controller.servers.services.v1.ActivateSessionResponse
-		(*CancelSessionRequest)(nil),             // 4: controller.servers.services.v1.CancelSessionRequest
-		(*CancelSessionResponse)(nil),            // 5: controller.servers.services.v1.CancelSessionResponse
-		(*AuthorizeConnectionRequest)(nil),       // 6: controller.servers.services.v1.AuthorizeConnectionRequest
-		(*AuthorizeConnectionResponse)(nil),      // 7: controller.servers.services.v1.AuthorizeConnectionResponse
-		(*ConnectConnectionRequest)(nil),         // 8: controller.servers.services.v1.ConnectConnectionRequest
-		(*ConnectConnectionResponse)(nil),        // 9: controller.servers.services.v1.ConnectConnectionResponse
-		(*CloseConnectionRequestData)(nil),       // 10: controller.servers.services.v1.CloseConnectionRequestData
-		(*CloseConnectionRequest)(nil),           // 11: controller.servers.services.v1.CloseConnectionRequest
-		(*CloseConnectionResponseData)(nil),      // 12: controller.servers.services.v1.CloseConnectionResponseData
-		(*CloseConnectionResponse)(nil),          // 13: controller.servers.services.v1.CloseConnectionResponse
-		(*targets.SessionAuthorizationData)(nil), // 14: controller.api.resources.targets.v1.SessionAuthorizationData
-		(*timestamp.Timestamp)(nil),              // 15: google.protobuf.Timestamp
-		(SESSIONSTATUS)(0),                       // 16: controller.servers.services.v1.SESSIONSTATUS
-		(CONNECTIONSTATUS)(0),                    // 17: controller.servers.services.v1.CONNECTIONSTATUS
-	}
-)
-
+var file_controller_servers_services_v1_session_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_controller_servers_services_v1_session_service_proto_goTypes = []interface{}{
+	(*LookupSessionRequest)(nil),             // 0: controller.servers.services.v1.LookupSessionRequest
+	(*LookupSessionResponse)(nil),            // 1: controller.servers.services.v1.LookupSessionResponse
+	(*ActivateSessionRequest)(nil),           // 2: controller.servers.services.v1.ActivateSessionRequest
+	(*ActivateSessionResponse)(nil),          // 3: controller.servers.services.v1.ActivateSessionResponse
+	(*CancelSessionRequest)(nil),             // 4: controller.servers.services.v1.CancelSessionRequest
+	(*CancelSessionResponse)(nil),            // 5: controller.servers.services.v1.CancelSessionResponse
+	(*AuthorizeConnectionRequest)(nil),       // 6: controller.servers.services.v1.AuthorizeConnectionRequest
+	(*AuthorizeConnectionResponse)(nil),      // 7: controller.servers.services.v1.AuthorizeConnectionResponse
+	(*ConnectConnectionRequest)(nil),         // 8: controller.servers.services.v1.ConnectConnectionRequest
+	(*ConnectConnectionResponse)(nil),        // 9: controller.servers.services.v1.ConnectConnectionResponse
+	(*CloseConnectionRequestData)(nil),       // 10: controller.servers.services.v1.CloseConnectionRequestData
+	(*CloseConnectionRequest)(nil),           // 11: controller.servers.services.v1.CloseConnectionRequest
+	(*CloseConnectionResponseData)(nil),      // 12: controller.servers.services.v1.CloseConnectionResponseData
+	(*CloseConnectionResponse)(nil),          // 13: controller.servers.services.v1.CloseConnectionResponse
+	(*targets.SessionAuthorizationData)(nil), // 14: controller.api.resources.targets.v1.SessionAuthorizationData
+	(*timestamp.Timestamp)(nil),              // 15: google.protobuf.Timestamp
+	(SESSIONSTATUS)(0),                       // 16: controller.servers.services.v1.SESSIONSTATUS
+	(CONNECTIONSTATUS)(0),                    // 17: controller.servers.services.v1.CONNECTIONSTATUS
+}
 var file_controller_servers_services_v1_session_service_proto_depIdxs = []int32{
 	14, // 0: controller.servers.services.v1.LookupSessionResponse.authorization:type_name -> controller.api.resources.targets.v1.SessionAuthorizationData
 	15, // 1: controller.servers.services.v1.LookupSessionResponse.expiration:type_name -> google.protobuf.Timestamp

internal/gen/controller/servers/services/session_service_grpc.pb.go

@@ -4,7 +4,6 @@ package services
 
 import (
 	context "context"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -116,28 +115,24 @@ type SessionServiceServer interface {
 }
 
 // UnimplementedSessionServiceServer must be embedded to have forward compatible implementations.
-type UnimplementedSessionServiceServer struct{}
+type UnimplementedSessionServiceServer struct {
+}
 
 func (UnimplementedSessionServiceServer) LookupSession(context.Context, *LookupSessionRequest) (*LookupSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method LookupSession not implemented")
 }
-
 func (UnimplementedSessionServiceServer) ActivateSession(context.Context, *ActivateSessionRequest) (*ActivateSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ActivateSession not implemented")
 }
-
 func (UnimplementedSessionServiceServer) CancelSession(context.Context, *CancelSessionRequest) (*CancelSessionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CancelSession not implemented")
 }
-
 func (UnimplementedSessionServiceServer) AuthorizeConnection(context.Context, *AuthorizeConnectionRequest) (*AuthorizeConnectionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AuthorizeConnection not implemented")
 }
-
 func (UnimplementedSessionServiceServer) ConnectConnection(context.Context, *ConnectConnectionRequest) (*ConnectConnectionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ConnectConnection not implemented")
 }
-
 func (UnimplementedSessionServiceServer) CloseConnection(context.Context, *CloseConnectionRequest) (*CloseConnectionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CloseConnection not implemented")
 }

internal/gen/controller/tokens/tokens.pb.go

@@ -7,11 +7,10 @@
 package tokens
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -106,13 +105,10 @@ func file_controller_tokens_v1_tokens_proto_rawDescGZIP() []byte {
 	return file_controller_tokens_v1_tokens_proto_rawDescData
 }
 
-var (
-	file_controller_tokens_v1_tokens_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_tokens_v1_tokens_proto_goTypes  = []interface{}{
-		(*S1TokenInfo)(nil), // 0: controller.tokens.v1.S1TokenInfo
-	}
-)
-
+var file_controller_tokens_v1_tokens_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_tokens_v1_tokens_proto_goTypes = []interface{}{
+	(*S1TokenInfo)(nil), // 0: controller.tokens.v1.S1TokenInfo
+}
 var file_controller_tokens_v1_tokens_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/host/static/store/static.pb.go

@@ -10,13 +10,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -544,17 +543,14 @@ func file_controller_storage_host_static_store_v1_static_proto_rawDescGZIP() []b
 	return file_controller_storage_host_static_store_v1_static_proto_rawDescData
 }
 
-var (
-	file_controller_storage_host_static_store_v1_static_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-	file_controller_storage_host_static_store_v1_static_proto_goTypes  = []interface{}{
-		(*HostCatalog)(nil),         // 0: controller.storage.host.static.store.v1.HostCatalog
-		(*Host)(nil),                // 1: controller.storage.host.static.store.v1.Host
-		(*HostSet)(nil),             // 2: controller.storage.host.static.store.v1.HostSet
-		(*HostSetMember)(nil),       // 3: controller.storage.host.static.store.v1.HostSetMember
-		(*timestamp.Timestamp)(nil), // 4: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_host_static_store_v1_static_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_controller_storage_host_static_store_v1_static_proto_goTypes = []interface{}{
+	(*HostCatalog)(nil),         // 0: controller.storage.host.static.store.v1.HostCatalog
+	(*Host)(nil),                // 1: controller.storage.host.static.store.v1.Host
+	(*HostSet)(nil),             // 2: controller.storage.host.static.store.v1.HostSet
+	(*HostSetMember)(nil),       // 3: controller.storage.host.static.store.v1.HostSetMember
+	(*timestamp.Timestamp)(nil), // 4: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_host_static_store_v1_static_proto_depIdxs = []int32{
 	4, // 0: controller.storage.host.static.store.v1.HostCatalog.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	4, // 1: controller.storage.host.static.store.v1.HostCatalog.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/host/store/host.pb.go

@@ -9,13 +9,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	_ "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -247,15 +246,12 @@ func file_controller_storage_host_store_v1_host_proto_rawDescGZIP() []byte {
 	return file_controller_storage_host_store_v1_host_proto_rawDescData
 }
 
-var (
-	file_controller_storage_host_store_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-	file_controller_storage_host_store_v1_host_proto_goTypes  = []interface{}{
-		(*Catalog)(nil), // 0: controller.storage.host.store.v1.Catalog
-		(*Host)(nil),    // 1: controller.storage.host.store.v1.Host
-		(*Set)(nil),     // 2: controller.storage.host.store.v1.Set
-	}
-)
-
+var file_controller_storage_host_store_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_controller_storage_host_store_v1_host_proto_goTypes = []interface{}{
+	(*Catalog)(nil), // 0: controller.storage.host.store.v1.Catalog
+	(*Host)(nil),    // 1: controller.storage.host.store.v1.Host
+	(*Set)(nil),     // 2: controller.storage.host.store.v1.Set
+}
 var file_controller_storage_host_store_v1_host_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/iam/store/group.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -191,14 +190,11 @@ func file_controller_storage_iam_store_v1_group_proto_rawDescGZIP() []byte {
 	return file_controller_storage_iam_store_v1_group_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_iam_store_v1_group_proto_goTypes  = []interface{}{
-		(*Group)(nil),               // 0: controller.storage.iam.store.v1.Group
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_iam_store_v1_group_proto_goTypes = []interface{}{
+	(*Group)(nil),               // 0: controller.storage.iam.store.v1.Group
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_group_proto_depIdxs = []int32{
 	1, // 0: controller.storage.iam.store.v1.Group.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.storage.iam.store.v1.Group.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/iam/store/group_member.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -260,15 +259,12 @@ func file_controller_storage_iam_store_v1_group_member_proto_rawDescGZIP() []byt
 	return file_controller_storage_iam_store_v1_group_member_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_group_member_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_iam_store_v1_group_member_proto_goTypes  = []interface{}{
-		(*GroupMemberUser)(nil),     // 0: controller.storage.iam.store.v1.GroupMemberUser
-		(*GroupMemberView)(nil),     // 1: controller.storage.iam.store.v1.GroupMemberView
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_group_member_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_iam_store_v1_group_member_proto_goTypes = []interface{}{
+	(*GroupMemberUser)(nil),     // 0: controller.storage.iam.store.v1.GroupMemberUser
+	(*GroupMemberView)(nil),     // 1: controller.storage.iam.store.v1.GroupMemberView
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_group_member_proto_depIdxs = []int32{
 	2, // 0: controller.storage.iam.store.v1.GroupMemberUser.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.iam.store.v1.GroupMemberView.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/iam/store/principal_role.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -338,16 +337,13 @@ func file_controller_storage_iam_store_v1_principal_role_proto_rawDescGZIP() []b
 	return file_controller_storage_iam_store_v1_principal_role_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_principal_role_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-	file_controller_storage_iam_store_v1_principal_role_proto_goTypes  = []interface{}{
-		(*UserRole)(nil),            // 0: controller.storage.iam.store.v1.UserRole
-		(*GroupRole)(nil),           // 1: controller.storage.iam.store.v1.GroupRole
-		(*PrincipalRoleView)(nil),   // 2: controller.storage.iam.store.v1.PrincipalRoleView
-		(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_principal_role_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_controller_storage_iam_store_v1_principal_role_proto_goTypes = []interface{}{
+	(*UserRole)(nil),            // 0: controller.storage.iam.store.v1.UserRole
+	(*GroupRole)(nil),           // 1: controller.storage.iam.store.v1.GroupRole
+	(*PrincipalRoleView)(nil),   // 2: controller.storage.iam.store.v1.PrincipalRoleView
+	(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_principal_role_proto_depIdxs = []int32{
 	3, // 0: controller.storage.iam.store.v1.UserRole.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	3, // 1: controller.storage.iam.store.v1.GroupRole.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/iam/store/role.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -206,14 +205,11 @@ func file_controller_storage_iam_store_v1_role_proto_rawDescGZIP() []byte {
 	return file_controller_storage_iam_store_v1_role_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_iam_store_v1_role_proto_goTypes  = []interface{}{
-		(*Role)(nil),                // 0: controller.storage.iam.store.v1.Role
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_iam_store_v1_role_proto_goTypes = []interface{}{
+	(*Role)(nil),                // 0: controller.storage.iam.store.v1.Role
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_role_proto_depIdxs = []int32{
 	1, // 0: controller.storage.iam.store.v1.Role.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.storage.iam.store.v1.Role.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/iam/store/role_grant.pb.go

@@ -7,12 +7,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -146,14 +145,11 @@ func file_controller_storage_iam_store_v1_role_grant_proto_rawDescGZIP() []byte
 	return file_controller_storage_iam_store_v1_role_grant_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_role_grant_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_iam_store_v1_role_grant_proto_goTypes  = []interface{}{
-		(*RoleGrant)(nil),           // 0: controller.storage.iam.store.v1.RoleGrant
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_role_grant_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_iam_store_v1_role_grant_proto_goTypes = []interface{}{
+	(*RoleGrant)(nil),           // 0: controller.storage.iam.store.v1.RoleGrant
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_role_grant_proto_depIdxs = []int32{
 	1, // 0: controller.storage.iam.store.v1.RoleGrant.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // [1:1] is the sub-list for method output_type

internal/iam/store/scope.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -198,14 +197,11 @@ func file_controller_storage_iam_store_v1_scope_proto_rawDescGZIP() []byte {
 	return file_controller_storage_iam_store_v1_scope_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_iam_store_v1_scope_proto_goTypes  = []interface{}{
-		(*Scope)(nil),               // 0: controller.storage.iam.store.v1.Scope
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_iam_store_v1_scope_proto_goTypes = []interface{}{
+	(*Scope)(nil),               // 0: controller.storage.iam.store.v1.Scope
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_scope_proto_depIdxs = []int32{
 	1, // 0: controller.storage.iam.store.v1.Scope.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.storage.iam.store.v1.Scope.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/iam/store/user.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -187,14 +186,11 @@ func file_controller_storage_iam_store_v1_user_proto_rawDescGZIP() []byte {
 	return file_controller_storage_iam_store_v1_user_proto_rawDescData
 }
 
-var (
-	file_controller_storage_iam_store_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_iam_store_v1_user_proto_goTypes  = []interface{}{
-		(*User)(nil),                // 0: controller.storage.iam.store.v1.User
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_iam_store_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_iam_store_v1_user_proto_goTypes = []interface{}{
+	(*User)(nil),                // 0: controller.storage.iam.store.v1.User
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_iam_store_v1_user_proto_depIdxs = []int32{
 	1, // 0: controller.storage.iam.store.v1.User.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.storage.iam.store.v1.User.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/kms/store/database_key.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -263,15 +262,12 @@ func file_controller_storage_kms_store_v1_database_key_proto_rawDescGZIP() []byt
 	return file_controller_storage_kms_store_v1_database_key_proto_rawDescData
 }
 
-var (
-	file_controller_storage_kms_store_v1_database_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_kms_store_v1_database_key_proto_goTypes  = []interface{}{
-		(*DatabaseKey)(nil),         // 0: controller.storage.kms.store.v1.DatabaseKey
-		(*DatabaseKeyVersion)(nil),  // 1: controller.storage.kms.store.v1.DatabaseKeyVersion
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_kms_store_v1_database_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_kms_store_v1_database_key_proto_goTypes = []interface{}{
+	(*DatabaseKey)(nil),         // 0: controller.storage.kms.store.v1.DatabaseKey
+	(*DatabaseKeyVersion)(nil),  // 1: controller.storage.kms.store.v1.DatabaseKeyVersion
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_kms_store_v1_database_key_proto_depIdxs = []int32{
 	2, // 0: controller.storage.kms.store.v1.DatabaseKey.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.kms.store.v1.DatabaseKeyVersion.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/kms/store/oplog_key.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -262,15 +261,12 @@ func file_controller_storage_kms_store_v1_oplog_key_proto_rawDescGZIP() []byte {
 	return file_controller_storage_kms_store_v1_oplog_key_proto_rawDescData
 }
 
-var (
-	file_controller_storage_kms_store_v1_oplog_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_kms_store_v1_oplog_key_proto_goTypes  = []interface{}{
-		(*OplogKey)(nil),            // 0: controller.storage.kms.store.v1.OplogKey
-		(*OplogKeyVersion)(nil),     // 1: controller.storage.kms.store.v1.OplogKeyVersion
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_kms_store_v1_oplog_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_kms_store_v1_oplog_key_proto_goTypes = []interface{}{
+	(*OplogKey)(nil),            // 0: controller.storage.kms.store.v1.OplogKey
+	(*OplogKeyVersion)(nil),     // 1: controller.storage.kms.store.v1.OplogKeyVersion
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_kms_store_v1_oplog_key_proto_depIdxs = []int32{
 	2, // 0: controller.storage.kms.store.v1.OplogKey.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.kms.store.v1.OplogKeyVersion.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/kms/store/root_key.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -249,15 +248,12 @@ func file_controller_storage_kms_store_v1_root_key_proto_rawDescGZIP() []byte {
 	return file_controller_storage_kms_store_v1_root_key_proto_rawDescData
 }
 
-var (
-	file_controller_storage_kms_store_v1_root_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_kms_store_v1_root_key_proto_goTypes  = []interface{}{
-		(*RootKey)(nil),             // 0: controller.storage.kms.store.v1.RootKey
-		(*RootKeyVersion)(nil),      // 1: controller.storage.kms.store.v1.RootKeyVersion
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_kms_store_v1_root_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_kms_store_v1_root_key_proto_goTypes = []interface{}{
+	(*RootKey)(nil),             // 0: controller.storage.kms.store.v1.RootKey
+	(*RootKeyVersion)(nil),      // 1: controller.storage.kms.store.v1.RootKeyVersion
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_kms_store_v1_root_key_proto_depIdxs = []int32{
 	2, // 0: controller.storage.kms.store.v1.RootKey.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.kms.store.v1.RootKeyVersion.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/kms/store/session_key.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -263,15 +262,12 @@ func file_controller_storage_kms_store_v1_session_key_proto_rawDescGZIP() []byte
 	return file_controller_storage_kms_store_v1_session_key_proto_rawDescData
 }
 
-var (
-	file_controller_storage_kms_store_v1_session_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_kms_store_v1_session_key_proto_goTypes  = []interface{}{
-		(*SessionKey)(nil),          // 0: controller.storage.kms.store.v1.SessionKey
-		(*SessionKeyVersion)(nil),   // 1: controller.storage.kms.store.v1.SessionKeyVersion
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_kms_store_v1_session_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_kms_store_v1_session_key_proto_goTypes = []interface{}{
+	(*SessionKey)(nil),          // 0: controller.storage.kms.store.v1.SessionKey
+	(*SessionKeyVersion)(nil),   // 1: controller.storage.kms.store.v1.SessionKeyVersion
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_kms_store_v1_session_key_proto_depIdxs = []int32{
 	2, // 0: controller.storage.kms.store.v1.SessionKey.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.kms.store.v1.SessionKeyVersion.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/kms/store/token_key.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -262,15 +261,12 @@ func file_controller_storage_kms_store_v1_token_key_proto_rawDescGZIP() []byte {
 	return file_controller_storage_kms_store_v1_token_key_proto_rawDescData
 }
 
-var (
-	file_controller_storage_kms_store_v1_token_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-	file_controller_storage_kms_store_v1_token_key_proto_goTypes  = []interface{}{
-		(*TokenKey)(nil),            // 0: controller.storage.kms.store.v1.TokenKey
-		(*TokenKeyVersion)(nil),     // 1: controller.storage.kms.store.v1.TokenKeyVersion
-		(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_kms_store_v1_token_key_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_controller_storage_kms_store_v1_token_key_proto_goTypes = []interface{}{
+	(*TokenKey)(nil),            // 0: controller.storage.kms.store.v1.TokenKey
+	(*TokenKeyVersion)(nil),     // 1: controller.storage.kms.store.v1.TokenKeyVersion
+	(*timestamp.Timestamp)(nil), // 2: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_kms_store_v1_token_key_proto_depIdxs = []int32{
 	2, // 0: controller.storage.kms.store.v1.TokenKey.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	2, // 1: controller.storage.kms.store.v1.TokenKeyVersion.create_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/oplog/any_operation.pb.go

@@ -7,12 +7,11 @@
 package oplog
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -217,16 +216,13 @@ func file_controller_storage_oplog_v1_any_operation_proto_rawDescGZIP() []byte {
 	return file_controller_storage_oplog_v1_any_operation_proto_rawDescData
 }
 
-var (
-	file_controller_storage_oplog_v1_any_operation_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-	file_controller_storage_oplog_v1_any_operation_proto_msgTypes  = make([]protoimpl.MessageInfo, 1)
-	file_controller_storage_oplog_v1_any_operation_proto_goTypes   = []interface{}{
-		(OpType)(0),                  // 0: controller.storage.oplog.v1.OpType
-		(*AnyOperation)(nil),         // 1: controller.storage.oplog.v1.AnyOperation
-		(*field_mask.FieldMask)(nil), // 2: google.protobuf.FieldMask
-	}
-)
-
+var file_controller_storage_oplog_v1_any_operation_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_controller_storage_oplog_v1_any_operation_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_storage_oplog_v1_any_operation_proto_goTypes = []interface{}{
+	(OpType)(0),                  // 0: controller.storage.oplog.v1.OpType
+	(*AnyOperation)(nil),         // 1: controller.storage.oplog.v1.AnyOperation
+	(*field_mask.FieldMask)(nil), // 2: google.protobuf.FieldMask
+}
 var file_controller_storage_oplog_v1_any_operation_proto_depIdxs = []int32{
 	0, // 0: controller.storage.oplog.v1.AnyOperation.operation_type:type_name -> controller.storage.oplog.v1.OpType
 	2, // 1: controller.storage.oplog.v1.AnyOperation.field_mask:type_name -> google.protobuf.FieldMask

internal/oplog/oplog_test/oplog_test.pb.go

@@ -9,11 +9,10 @@
 package oplog_test
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -371,16 +370,13 @@ func file_controller_storage_oplog_test_v1_oplog_test_proto_rawDescGZIP() []byte
 	return file_controller_storage_oplog_test_v1_oplog_test_proto_rawDescData
 }
 
-var (
-	file_controller_storage_oplog_test_v1_oplog_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-	file_controller_storage_oplog_test_v1_oplog_test_proto_goTypes  = []interface{}{
-		(*TestUser)(nil),              // 0: controller.storage.oplog.test.v1.TestUser
-		(*TestCar)(nil),               // 1: controller.storage.oplog.test.v1.TestCar
-		(*TestRental)(nil),            // 2: controller.storage.oplog.test.v1.TestRental
-		(*TestNonReplayableUser)(nil), // 3: controller.storage.oplog.test.v1.TestNonReplayableUser
-	}
-)
-
+var file_controller_storage_oplog_test_v1_oplog_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_controller_storage_oplog_test_v1_oplog_test_proto_goTypes = []interface{}{
+	(*TestUser)(nil),              // 0: controller.storage.oplog.test.v1.TestUser
+	(*TestCar)(nil),               // 1: controller.storage.oplog.test.v1.TestCar
+	(*TestRental)(nil),            // 2: controller.storage.oplog.test.v1.TestRental
+	(*TestNonReplayableUser)(nil), // 3: controller.storage.oplog.test.v1.TestNonReplayableUser
+}
 var file_controller_storage_oplog_test_v1_oplog_test_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type

internal/oplog/store/oplog.pb.go

@@ -9,12 +9,11 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -400,16 +399,13 @@ func file_controller_storage_oplog_store_v1_oplog_proto_rawDescGZIP() []byte {
 	return file_controller_storage_oplog_store_v1_oplog_proto_rawDescData
 }
 
-var (
-	file_controller_storage_oplog_store_v1_oplog_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-	file_controller_storage_oplog_store_v1_oplog_proto_goTypes  = []interface{}{
-		(*Entry)(nil),               // 0: controller.storage.oplog.store.v1.Entry
-		(*Metadata)(nil),            // 1: controller.storage.oplog.store.v1.Metadata
-		(*Ticket)(nil),              // 2: controller.storage.oplog.store.v1.Ticket
-		(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_oplog_store_v1_oplog_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_controller_storage_oplog_store_v1_oplog_proto_goTypes = []interface{}{
+	(*Entry)(nil),               // 0: controller.storage.oplog.store.v1.Entry
+	(*Metadata)(nil),            // 1: controller.storage.oplog.store.v1.Metadata
+	(*Ticket)(nil),              // 2: controller.storage.oplog.store.v1.Ticket
+	(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_oplog_store_v1_oplog_proto_depIdxs = []int32{
 	3, // 0: controller.storage.oplog.store.v1.Entry.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	3, // 1: controller.storage.oplog.store.v1.Entry.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/proxy/proxy.pb.go

@@ -7,12 +7,11 @@
 package proxy
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -237,17 +236,14 @@ func file_worker_proxy_v1_proxy_proto_rawDescGZIP() []byte {
 	return file_worker_proxy_v1_proxy_proto_rawDescData
 }
 
-var (
-	file_worker_proxy_v1_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-	file_worker_proxy_v1_proxy_proto_msgTypes  = make([]protoimpl.MessageInfo, 2)
-	file_worker_proxy_v1_proxy_proto_goTypes   = []interface{}{
-		(HANDSHAKECOMMAND)(0),       // 0: worker.proxy.v1.HANDSHAKECOMMAND
-		(*ClientHandshake)(nil),     // 1: worker.proxy.v1.ClientHandshake
-		(*HandshakeResult)(nil),     // 2: worker.proxy.v1.HandshakeResult
-		(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
-	}
-)
-
+var file_worker_proxy_v1_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_worker_proxy_v1_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_worker_proxy_v1_proxy_proto_goTypes = []interface{}{
+	(HANDSHAKECOMMAND)(0),       // 0: worker.proxy.v1.HANDSHAKECOMMAND
+	(*ClientHandshake)(nil),     // 1: worker.proxy.v1.ClientHandshake
+	(*HandshakeResult)(nil),     // 2: worker.proxy.v1.HandshakeResult
+	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+}
 var file_worker_proxy_v1_proxy_proto_depIdxs = []int32{
 	0, // 0: worker.proxy.v1.ClientHandshake.command:type_name -> worker.proxy.v1.HANDSHAKECOMMAND
 	3, // 1: worker.proxy.v1.HandshakeResult.expiration:type_name -> google.protobuf.Timestamp

internal/servers/servers.pb.go

@@ -7,12 +7,11 @@
 package servers
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
@@ -172,14 +171,11 @@ func file_controller_servers_v1_servers_proto_rawDescGZIP() []byte {
 	return file_controller_servers_v1_servers_proto_rawDescData
 }
 
-var (
-	file_controller_servers_v1_servers_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-	file_controller_servers_v1_servers_proto_goTypes  = []interface{}{
-		(*Server)(nil),              // 0: controller.servers.v1.Server
-		(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_servers_v1_servers_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_controller_servers_v1_servers_proto_goTypes = []interface{}{
+	(*Server)(nil),              // 0: controller.servers.v1.Server
+	(*timestamp.Timestamp)(nil), // 1: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_servers_v1_servers_proto_depIdxs = []int32{
 	1, // 0: controller.servers.v1.Server.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	1, // 1: controller.servers.v1.Server.update_time:type_name -> controller.storage.timestamp.v1.Timestamp

internal/target/store/target.pb.go

@@ -7,13 +7,12 @@
 package store
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	timestamp "github.com/hashicorp/boundary/internal/db/timestamp"
 	_ "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 (
@@ -497,16 +496,13 @@ func file_controller_storage_target_store_v1_target_proto_rawDescGZIP() []byte {
 	return file_controller_storage_target_store_v1_target_proto_rawDescData
 }
 
-var (
-	file_controller_storage_target_store_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-	file_controller_storage_target_store_v1_target_proto_goTypes  = []interface{}{
-		(*TargetView)(nil),          // 0: controller.storage.target.store.v1.TargetView
-		(*TargetHostSet)(nil),       // 1: controller.storage.target.store.v1.TargetHostSet
-		(*TcpTarget)(nil),           // 2: controller.storage.target.store.v1.TcpTarget
-		(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
-	}
-)
-
+var file_controller_storage_target_store_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_controller_storage_target_store_v1_target_proto_goTypes = []interface{}{
+	(*TargetView)(nil),          // 0: controller.storage.target.store.v1.TargetView
+	(*TargetHostSet)(nil),       // 1: controller.storage.target.store.v1.TargetHostSet
+	(*TcpTarget)(nil),           // 2: controller.storage.target.store.v1.TcpTarget
+	(*timestamp.Timestamp)(nil), // 3: controller.storage.timestamp.v1.Timestamp
+}
 var file_controller_storage_target_store_v1_target_proto_depIdxs = []int32{
 	3, // 0: controller.storage.target.store.v1.TargetView.create_time:type_name -> controller.storage.timestamp.v1.Timestamp
 	3, // 1: controller.storage.target.store.v1.TargetView.update_time:type_name -> controller.storage.timestamp.v1.Timestamp