From 94cb79bbddb6efa778758cfb985a113e5553105e Mon Sep 17 00:00:00 2001 From: Michael Gaffney Date: Thu, 7 Jan 2021 10:02:32 -0500 Subject: [PATCH] See how Boundary would look with gofumpt applied (#853) * See how Boundary would look with https://github.com/mvdan/gofumpt applied Results of running `gofumpt -w -s .` * Update tools file and Makefile for gofumpt Co-authored-by: Jeff Mitchell --- Makefile | 2 +- api/accounts/account.gen.go | 6 +- api/authmethods/authmethods.gen.go | 6 +- api/authtokens/authtokens.gen.go | 6 +- api/client.go | 28 ++++---- api/groups/group.gen.go | 6 +- api/hostcatalogs/host_catalog.gen.go | 6 +- api/hosts/host.gen.go | 6 +- api/hostsets/host_set.gen.go | 6 +- api/options.go | 3 +- api/output_string.go | 4 +- api/roles/role.gen.go | 6 +- api/scopes/scope.gen.go | 6 +- api/sessions/session.gen.go | 6 +- api/targets/target.gen.go | 6 +- api/users/user.gen.go | 6 +- globals/globals.go | 6 +- go.mod | 3 +- go.sum | 11 ++- internal/api/genapi/parse.go | 4 +- internal/api/genapi/templates.go | 4 +- internal/auth/password/account_test.go | 2 +- internal/auth/password/argon2_test.go | 7 +- internal/auth/password/authmethod_test.go | 2 +- .../auth/password/repository_account_test.go | 14 ++-- .../password/repository_authmethod_test.go | 10 +-- .../password/repository_configuration_test.go | 4 +- .../auth/password/repository_password_test.go | 7 +- internal/auth/password/repository_test.go | 2 +- internal/auth/password/store/argon2.pb.go | 20 +++--- internal/auth/password/store/password.pb.go | 22 +++--- internal/auth/store/account.pb.go | 16 +++-- internal/auth/store/auth_method.pb.go | 18 +++-- internal/authtoken/authtoken_test.go | 6 +- internal/authtoken/gorm.go | 6 +- internal/authtoken/immutable_fields_test.go | 3 +- internal/authtoken/repository_test.go | 14 ++-- internal/authtoken/store/authtoken.pb.go | 18 +++-- internal/cmd/base/profiling_on.go | 2 +- internal/cmd/base/servers.go | 4 +- internal/cmd/commands/accounts/account.go | 6 +- internal/cmd/commands/accounts/password.go | 6 +- .../cmd/commands/authenticate/password.go | 14 ++-- .../cmd/commands/authmethods/authmethod.go | 6 +- internal/cmd/commands/authmethods/password.go | 6 +- .../cmd/commands/authtokens/authtokens.go | 6 +- .../cmd/commands/config/encryptdecrypt.go | 6 +- .../commands/config/encryptdecrypt_test.go | 1 - internal/cmd/commands/config/token.go | 6 +- internal/cmd/commands/connect/connect.go | 8 +-- internal/cmd/commands/database/database.go | 6 +- internal/cmd/commands/database/init.go | 6 +- internal/cmd/commands/dev/dev.go | 8 ++- internal/cmd/commands/groups/group.go | 6 +- .../cmd/commands/hostcatalogs/hostcatalog.go | 6 +- internal/cmd/commands/hostcatalogs/static.go | 6 +- internal/cmd/commands/hosts/host.go | 6 +- internal/cmd/commands/hosts/static.go | 6 +- internal/cmd/commands/hostsets/hostset.go | 6 +- internal/cmd/commands/hostsets/static.go | 6 +- internal/cmd/commands/roles/funcs.go | 1 - internal/cmd/commands/roles/role.go | 6 +- internal/cmd/commands/scopes/scope.go | 6 +- internal/cmd/commands/server/server.go | 6 +- internal/cmd/commands/sessions/session.go | 6 +- internal/cmd/commands/targets/target.go | 6 +- internal/cmd/commands/targets/tcp.go | 6 +- internal/cmd/commands/users/user.go | 6 +- internal/cmd/commands/version/version.go | 6 +- internal/db/db.go | 4 +- internal/db/db_test/db.go | 5 ++ internal/db/db_test/db_test.pb.go | 24 ++++--- internal/db/domains_test.go | 4 +- internal/db/id_test.go | 1 - internal/db/migrations/driver.go | 1 + .../db/migrations/genmigrations/generate.go | 2 +- internal/db/read_writer.go | 7 +- internal/db/read_writer_test.go | 13 ++-- internal/db/testing_test.go | 1 - internal/db/timestamp/timestamp.pb.go | 18 +++-- internal/errors/code_test.go | 1 - internal/errors/is_test.go | 10 +-- internal/gen/controller/api/error.pb.go | 22 +++--- .../api/resources/accounts/account.pb.go | 26 ++++--- .../resources/authmethods/auth_method.pb.go | 26 ++++--- .../api/resources/authtokens/authtoken.pb.go | 20 +++--- .../api/resources/groups/group.pb.go | 24 ++++--- .../resources/hostcatalogs/host_catalog.pb.go | 24 ++++--- .../controller/api/resources/hosts/host.pb.go | 26 ++++--- .../api/resources/hostsets/host_set.pb.go | 24 ++++--- .../controller/api/resources/roles/role.pb.go | 28 ++++---- .../api/resources/scopes/scope.pb.go | 22 +++--- .../api/resources/sessions/session.pb.go | 24 ++++--- .../api/resources/targets/target.pb.go | 38 ++++++----- .../controller/api/resources/users/user.pb.go | 24 ++++--- .../api/services/account_service.pb.go | 46 +++++++------ .../api/services/account_service.pb.gw.go | 52 +++----------- .../api/services/account_service_grpc.pb.go | 10 ++- .../api/services/auth_method_service.pb.go | 48 +++++++------ .../api/services/auth_method_service.pb.gw.go | 48 +++---------- .../services/auth_method_service_grpc.pb.go | 9 ++- .../api/services/authtokens_service.pb.go | 28 ++++---- .../api/services/authtokens_service.pb.gw.go | 32 +++------ .../services/authtokens_service_grpc.pb.go | 6 +- .../api/services/group_service.pb.go | 50 +++++++------- .../api/services/group_service.pb.gw.go | 56 +++------------ .../api/services/group_service_grpc.pb.go | 11 ++- .../api/services/host_catalog_service.pb.go | 38 ++++++----- .../services/host_catalog_service.pb.gw.go | 44 +++--------- .../services/host_catalog_service_grpc.pb.go | 8 ++- .../api/services/host_service.pb.go | 38 ++++++----- .../api/services/host_service.pb.gw.go | 44 +++--------- .../api/services/host_service_grpc.pb.go | 8 ++- .../api/services/host_set_service.pb.go | 50 +++++++------- .../api/services/host_set_service.pb.gw.go | 56 +++------------ .../api/services/host_set_service_grpc.pb.go | 11 ++- .../api/services/role_service.pb.go | 62 +++++++++-------- .../api/services/role_service.pb.gw.go | 68 +++---------------- .../api/services/role_service_grpc.pb.go | 14 +++- .../api/services/scope_service.pb.go | 38 ++++++----- .../api/services/scope_service.pb.gw.go | 48 +++---------- .../api/services/scope_service_grpc.pb.go | 8 ++- .../api/services/session_service.pb.go | 28 ++++---- .../api/services/session_service.pb.gw.go | 32 +++------ .../api/services/session_service_grpc.pb.go | 6 +- .../api/services/target_service.pb.go | 56 ++++++++------- .../api/services/target_service.pb.gw.go | 60 +++------------- .../api/services/target_service_grpc.pb.go | 12 +++- .../api/services/user_service.pb.go | 50 +++++++------- .../api/services/user_service.pb.gw.go | 56 +++------------ .../api/services/user_service_grpc.pb.go | 11 ++- .../gen/controller/protooptions/options.pb.go | 18 +++-- .../gen/controller/protooptions/testing.pb.go | 28 ++++---- .../server_coordination_service.pb.go | 40 ++++++----- .../server_coordination_service_grpc.pb.go | 5 +- .../servers/services/session_service.pb.go | 50 +++++++------- .../services/session_service_grpc.pb.go | 9 ++- internal/gen/controller/tokens/tokens.pb.go | 16 +++-- internal/host/static/host_catalog_test.go | 2 +- internal/host/static/host_set_member_test.go | 2 +- internal/host/static/host_set_test.go | 2 +- internal/host/static/host_test.go | 2 +- internal/host/static/immutable_fields_test.go | 12 ++-- .../static/repository_host_catalog_test.go | 8 +-- internal/host/static/repository_host_set.go | 1 - .../static/repository_host_set_member_test.go | 2 +- .../host/static/repository_host_set_test.go | 16 ++--- internal/host/static/repository_host_test.go | 12 ++-- internal/host/static/repository_test.go | 2 +- internal/host/static/store/static.pb.go | 24 ++++--- internal/host/store/host.pb.go | 20 +++--- internal/iam/account.go | 8 ++- internal/iam/group.go | 8 ++- internal/iam/group_member.go | 6 +- internal/iam/immutable_fields_test.go | 14 ++-- internal/iam/principal_role.go | 12 ++-- internal/iam/repository.go | 4 +- internal/iam/repository_group_test.go | 2 - internal/iam/repository_scope_test.go | 3 +- internal/iam/repository_test.go | 1 + internal/iam/role.go | 8 ++- internal/iam/role_grant.go | 6 +- internal/iam/scope.go | 8 ++- internal/iam/scope_test.go | 2 + internal/iam/store/group.pb.go | 18 +++-- internal/iam/store/group_member.pb.go | 20 +++--- internal/iam/store/principal_role.pb.go | 22 +++--- internal/iam/store/role.pb.go | 18 +++-- internal/iam/store/role_grant.pb.go | 18 +++-- internal/iam/store/scope.pb.go | 18 +++-- internal/iam/store/user.pb.go | 18 +++-- internal/iam/testing_test.go | 3 +- internal/iam/user.go | 8 ++- internal/iam/user_test.go | 1 - internal/kms/immutable_fields_test.go | 12 ++-- internal/kms/store/database_key.pb.go | 20 +++--- internal/kms/store/oplog_key.pb.go | 20 +++--- internal/kms/store/root_key.pb.go | 20 +++--- internal/kms/store/session_key.pb.go | 20 +++--- internal/kms/store/token_key.pb.go | 20 +++--- internal/kms/token_key_test.go | 1 - internal/libs/alpnmux/mux_test.go | 2 +- internal/oplog/any_operation.pb.go | 22 +++--- internal/oplog/immutable_fields_test.go | 4 +- internal/oplog/oplog.go | 1 + internal/oplog/oplog_test.go | 2 - internal/oplog/oplog_test/oplog_test.pb.go | 22 +++--- internal/oplog/store/oplog.pb.go | 22 +++--- internal/oplog/ticketer_gorm_test.go | 1 - internal/oplog/type_catalog.go | 1 - internal/oplog/type_catalog_test.go | 1 - internal/proxy/proxy.pb.go | 24 ++++--- internal/servers/controller/handler_test.go | 1 - .../servers/controller/handler_ui_test.go | 4 +- .../handlers/accounts/account_service.go | 4 +- .../handlers/accounts/account_service_test.go | 6 +- .../authmethods/authmethod_service.go | 4 +- .../authmethods/authmethod_service_test.go | 3 +- .../servers/controller/handlers/errors.go | 24 ++++--- .../handlers/groups/group_service.go | 4 +- .../handlers/groups/group_service_test.go | 3 +- .../host_catalogs/host_catalog_service.go | 4 +- .../host_catalog_service_test.go | 5 +- .../handlers/host_sets/host_set_service.go | 4 +- .../host_sets/host_set_service_test.go | 3 +- .../controller/handlers/hosts/host_service.go | 4 +- .../handlers/hosts/host_service_test.go | 9 ++- .../controller/handlers/roles/role_service.go | 4 +- .../handlers/roles/role_service_test.go | 4 +- .../handlers/scopes/scope_service.go | 4 +- .../handlers/scopes/scope_service_test.go | 3 +- .../handlers/targets/target_service.go | 4 +- .../handlers/targets/target_service_test.go | 3 +- .../controller/handlers/users/user_service.go | 4 +- .../handlers/users/user_service_test.go | 3 +- .../handlers/workers/worker_service.go | 6 +- internal/servers/repository.go | 6 +- internal/servers/servers.pb.go | 18 +++-- internal/servers/worker/handler.go | 2 +- internal/session/connection.go | 6 +- internal/session/connection_closed_reason.go | 1 + internal/session/connection_state.go | 6 +- internal/session/immutable_fields_test.go | 10 ++- internal/session/repository.go | 3 +- internal/session/repository_session_test.go | 1 - internal/session/session.go | 6 +- internal/session/state.go | 6 +- internal/session/term_reason.go | 1 + internal/session/testing_test.go | 1 + internal/target/immutable_fields_test.go | 8 +-- internal/target/repository.go | 4 +- internal/target/store/target.pb.go | 22 +++--- internal/target/tcp_target.go | 8 ++- internal/types/resource/resource_test.go | 1 - internal/website/permstable/permstable.go | 2 +- sdk/strutil/strutil_test.go | 1 - tools/tools.go | 3 + 237 files changed, 1567 insertions(+), 1529 deletions(-) diff --git a/Makefile b/Makefile index 725dfbc93..780bd218c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ bin: build-ui @CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/build.sh'" fmt: - goimports -w $$(find . -name '*.go' | grep -v pb.go | grep -v pb.gw.go) + gofumpt -w $$(find . -name '*.go' | grep -v pb.go | grep -v pb.gw.go) # Set env for all UI targets. UI_TARGETS := update-ui-version build-ui build-ui-ifne diff --git a/api/accounts/account.gen.go b/api/accounts/account.gen.go index 8ff2fcd65..6cd5baf72 100644 --- a/api/accounts/account.gen.go +++ b/api/accounts/account.gen.go @@ -57,8 +57,10 @@ func (n AccountReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type AccountCreateResult = AccountReadResult -type AccountUpdateResult = AccountReadResult +type ( + AccountCreateResult = AccountReadResult + AccountUpdateResult = AccountReadResult +) type AccountDeleteResult struct { response *api.Response diff --git a/api/authmethods/authmethods.gen.go b/api/authmethods/authmethods.gen.go index 11378bdc1..25df6290a 100644 --- a/api/authmethods/authmethods.gen.go +++ b/api/authmethods/authmethods.gen.go @@ -57,8 +57,10 @@ func (n AuthMethodReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type AuthMethodCreateResult = AuthMethodReadResult -type AuthMethodUpdateResult = AuthMethodReadResult +type ( + AuthMethodCreateResult = AuthMethodReadResult + AuthMethodUpdateResult = AuthMethodReadResult +) type AuthMethodDeleteResult struct { response *api.Response diff --git a/api/authtokens/authtokens.gen.go b/api/authtokens/authtokens.gen.go index 14e798e88..e27e57b1b 100644 --- a/api/authtokens/authtokens.gen.go +++ b/api/authtokens/authtokens.gen.go @@ -57,8 +57,10 @@ func (n AuthTokenReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type AuthTokenCreateResult = AuthTokenReadResult -type AuthTokenUpdateResult = AuthTokenReadResult +type ( + AuthTokenCreateResult = AuthTokenReadResult + AuthTokenUpdateResult = AuthTokenReadResult +) type AuthTokenDeleteResult struct { response *api.Response diff --git a/api/client.go b/api/client.go index 11ad3b287..321d5d653 100644 --- a/api/client.go +++ b/api/client.go @@ -28,18 +28,20 @@ import ( "golang.org/x/time/rate" ) -const EnvBoundaryAddr = "BOUNDARY_ADDR" -const EnvBoundaryCACert = "BOUNDARY_CACERT" -const EnvBoundaryCAPath = "BOUNDARY_CAPATH" -const EnvBoundaryClientCert = "BOUNDARY_CLIENT_CERT" -const EnvBoundaryClientKey = "BOUNDARY_CLIENT_KEY" -const EnvBoundaryClientTimeout = "BOUNDARY_CLIENT_TIMEOUT" -const EnvBoundaryTLSInsecure = "BOUNDARY_TLS_INSECURE" -const EnvBoundaryTLSServerName = "BOUNDARY_TLS_SERVER_NAME" -const EnvBoundaryMaxRetries = "BOUNDARY_MAX_RETRIES" -const EnvBoundaryToken = "BOUNDARY_TOKEN" -const EnvBoundaryRateLimit = "BOUNDARY_RATE_LIMIT" -const EnvBoundarySRVLookup = "BOUNDARY_SRV_LOOKUP" +const ( + EnvBoundaryAddr = "BOUNDARY_ADDR" + EnvBoundaryCACert = "BOUNDARY_CACERT" + EnvBoundaryCAPath = "BOUNDARY_CAPATH" + EnvBoundaryClientCert = "BOUNDARY_CLIENT_CERT" + EnvBoundaryClientKey = "BOUNDARY_CLIENT_KEY" + EnvBoundaryClientTimeout = "BOUNDARY_CLIENT_TIMEOUT" + EnvBoundaryTLSInsecure = "BOUNDARY_TLS_INSECURE" + EnvBoundaryTLSServerName = "BOUNDARY_TLS_SERVER_NAME" + EnvBoundaryMaxRetries = "BOUNDARY_MAX_RETRIES" + EnvBoundaryToken = "BOUNDARY_TOKEN" + EnvBoundaryRateLimit = "BOUNDARY_RATE_LIMIT" + EnvBoundarySRVLookup = "BOUNDARY_SRV_LOOKUP" +) // Config is used to configure the creation of the client type Config struct { @@ -642,7 +644,7 @@ func (c *Client) NewRequest(ctx context.Context, method, requestPath string, bod u.Path = "" } - var host = u.Host + host := u.Host // if SRV records exist (see // https://tools.ietf.org/html/draft-andrews-http-srv-02), lookup the SRV // record and take the highest match; this is not designed for diff --git a/api/groups/group.gen.go b/api/groups/group.gen.go index 54bd74cf4..6b1d67a2f 100644 --- a/api/groups/group.gen.go +++ b/api/groups/group.gen.go @@ -57,8 +57,10 @@ func (n GroupReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type GroupCreateResult = GroupReadResult -type GroupUpdateResult = GroupReadResult +type ( + GroupCreateResult = GroupReadResult + GroupUpdateResult = GroupReadResult +) type GroupDeleteResult struct { response *api.Response diff --git a/api/hostcatalogs/host_catalog.gen.go b/api/hostcatalogs/host_catalog.gen.go index 446bf477a..104e07711 100644 --- a/api/hostcatalogs/host_catalog.gen.go +++ b/api/hostcatalogs/host_catalog.gen.go @@ -57,8 +57,10 @@ func (n HostCatalogReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type HostCatalogCreateResult = HostCatalogReadResult -type HostCatalogUpdateResult = HostCatalogReadResult +type ( + HostCatalogCreateResult = HostCatalogReadResult + HostCatalogUpdateResult = HostCatalogReadResult +) type HostCatalogDeleteResult struct { response *api.Response diff --git a/api/hosts/host.gen.go b/api/hosts/host.gen.go index 16f1a9d07..72f83fce3 100644 --- a/api/hosts/host.gen.go +++ b/api/hosts/host.gen.go @@ -58,8 +58,10 @@ func (n HostReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type HostCreateResult = HostReadResult -type HostUpdateResult = HostReadResult +type ( + HostCreateResult = HostReadResult + HostUpdateResult = HostReadResult +) type HostDeleteResult struct { response *api.Response diff --git a/api/hostsets/host_set.gen.go b/api/hostsets/host_set.gen.go index c5944cb1e..4be35aec8 100644 --- a/api/hostsets/host_set.gen.go +++ b/api/hostsets/host_set.gen.go @@ -58,8 +58,10 @@ func (n HostSetReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type HostSetCreateResult = HostSetReadResult -type HostSetUpdateResult = HostSetReadResult +type ( + HostSetCreateResult = HostSetReadResult + HostSetUpdateResult = HostSetReadResult +) type HostSetDeleteResult struct { response *api.Response diff --git a/api/options.go b/api/options.go index e18996c39..c40a7ecfb 100644 --- a/api/options.go +++ b/api/options.go @@ -12,8 +12,7 @@ func getOpts(opt ...Option) options { type Option func(*options) // options = how options are represented -type options struct { -} +type options struct{} func getDefaultOptions() options { return options{} diff --git a/api/output_string.go b/api/output_string.go index 8ec1b573e..95a105083 100644 --- a/api/output_string.go +++ b/api/output_string.go @@ -12,9 +12,7 @@ const ( ErrOutputStringRequest = "output a string, please" ) -var ( - LastOutputStringError *OutputStringError -) +var LastOutputStringError *OutputStringError type OutputStringError struct { *retryablehttp.Request diff --git a/api/roles/role.gen.go b/api/roles/role.gen.go index c6125f8a7..e840f0bb6 100644 --- a/api/roles/role.gen.go +++ b/api/roles/role.gen.go @@ -60,8 +60,10 @@ func (n RoleReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type RoleCreateResult = RoleReadResult -type RoleUpdateResult = RoleReadResult +type ( + RoleCreateResult = RoleReadResult + RoleUpdateResult = RoleReadResult +) type RoleDeleteResult struct { response *api.Response diff --git a/api/scopes/scope.gen.go b/api/scopes/scope.gen.go index 00b472cfc..9f59d3c41 100644 --- a/api/scopes/scope.gen.go +++ b/api/scopes/scope.gen.go @@ -55,8 +55,10 @@ func (n ScopeReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type ScopeCreateResult = ScopeReadResult -type ScopeUpdateResult = ScopeReadResult +type ( + ScopeCreateResult = ScopeReadResult + ScopeUpdateResult = ScopeReadResult +) type ScopeDeleteResult struct { response *api.Response diff --git a/api/sessions/session.gen.go b/api/sessions/session.gen.go index cb5cf82fd..cf454470c 100644 --- a/api/sessions/session.gen.go +++ b/api/sessions/session.gen.go @@ -65,8 +65,10 @@ func (n SessionReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type SessionCreateResult = SessionReadResult -type SessionUpdateResult = SessionReadResult +type ( + SessionCreateResult = SessionReadResult + SessionUpdateResult = SessionReadResult +) type SessionDeleteResult struct { response *api.Response diff --git a/api/targets/target.gen.go b/api/targets/target.gen.go index db1c24870..75b0ecb1c 100644 --- a/api/targets/target.gen.go +++ b/api/targets/target.gen.go @@ -61,8 +61,10 @@ func (n TargetReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type TargetCreateResult = TargetReadResult -type TargetUpdateResult = TargetReadResult +type ( + TargetCreateResult = TargetReadResult + TargetUpdateResult = TargetReadResult +) type TargetDeleteResult struct { response *api.Response diff --git a/api/users/user.gen.go b/api/users/user.gen.go index 5334061b3..ddda2dd53 100644 --- a/api/users/user.gen.go +++ b/api/users/user.gen.go @@ -57,8 +57,10 @@ func (n UserReadResult) GetResponseMap() map[string]interface{} { return n.response.Map } -type UserCreateResult = UserReadResult -type UserUpdateResult = UserReadResult +type ( + UserCreateResult = UserReadResult + UserUpdateResult = UserReadResult +) type UserDeleteResult struct { response *api.Response diff --git a/globals/globals.go b/globals/globals.go index 513762ae3..6c261bc6a 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -14,8 +14,10 @@ const ( ServiceTokenV1 = "s1" ) -type ContextMaxRequestSizeType int -type ContextOriginalRequestPathType int +type ( + ContextMaxRequestSizeType int + ContextOriginalRequestPathType int +) var ( // DefaultMaxRequestDuration is the amount of time we'll wait for a request diff --git a/go.mod b/go.mod index 05292a5f3..c436e456e 100644 --- a/go.mod +++ b/go.mod @@ -53,10 +53,11 @@ require ( github.com/zalando/go-keyring v0.1.0 go.uber.org/atomic v1.7.0 golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 - golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 + golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d google.golang.org/grpc v1.34.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.1 google.golang.org/protobuf v1.25.1-0.20201020201750-d3470999428b + mvdan.cc/gofumpt v0.1.0 nhooyr.io/websocket v1.8.6 ) diff --git a/go.sum b/go.sum index 31d77d2f0..4445855f7 100644 --- a/go.sum +++ b/go.sum @@ -992,6 +992,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= +github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= @@ -1193,6 +1195,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1403,8 +1407,8 @@ golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 h1:1Bs6RVeBFtLZ8Yi1Hk07DiOqzvwLD/4hln4iahvFlag= -golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c h1:dS09fXwOFF9cXBnIzZexIuUBj95U1NyQjkEhkgidDow= +golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1531,6 +1535,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= @@ -1591,6 +1596,8 @@ modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY= modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4= +mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw= +mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/internal/api/genapi/parse.go b/internal/api/genapi/parse.go index 3c4f00155..257b8d214 100644 --- a/internal/api/genapi/parse.go +++ b/internal/api/genapi/parse.go @@ -35,7 +35,7 @@ func parsePBs() { msg := in.inProto.ProtoReflect() desc := msg.Descriptor() - //printDebug(desc) + // printDebug(desc) // Evaluate above, populate below. in.generatedStructure.pkg = packageFromFullName(desc.FullName()) @@ -73,7 +73,7 @@ func parsePBs() { } in.generatedStructure.fields = append(in.generatedStructure.fields, fi) } - //fmt.Printf("Parsed: %#v\n", in.generatedStructure) + // fmt.Printf("Parsed: %#v\n", in.generatedStructure) } } diff --git a/internal/api/genapi/templates.go b/internal/api/genapi/templates.go index c86a38603..c44a9276f 100644 --- a/internal/api/genapi/templates.go +++ b/internal/api/genapi/templates.go @@ -129,7 +129,7 @@ func fillTemplates() { if _, err := os.Stat(outDir); os.IsNotExist(err) { _ = os.Mkdir(outDir, os.ModePerm) } - if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0644); err != nil { + if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0o644); err != nil { fmt.Printf("error writing file %q: %v\n", outFile, err) os.Exit(1) } @@ -169,7 +169,7 @@ func fillTemplates() { if _, err := os.Stat(outDir); os.IsNotExist(err) { _ = os.Mkdir(outDir, os.ModePerm) } - if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0644); err != nil { + if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0o644); err != nil { fmt.Printf("error writing file %q: %v\n", outFile, err) os.Exit(1) } diff --git a/internal/auth/password/account_test.go b/internal/auth/password/account_test.go index 5862c75ad..de919b593 100644 --- a/internal/auth/password/account_test.go +++ b/internal/auth/password/account_test.go @@ -22,7 +22,7 @@ func TestAccount_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *Account diff --git a/internal/auth/password/argon2_test.go b/internal/auth/password/argon2_test.go index e51a2debc..e5e2a7e24 100644 --- a/internal/auth/password/argon2_test.go +++ b/internal/auth/password/argon2_test.go @@ -121,7 +121,7 @@ func TestArgon2Configuration_Readonly(t *testing.T) { authMethod := authMethods[0] authMethodId := authMethod.GetPublicId() - var tests = []struct { + tests := []struct { name string chgFn func(*Argon2Configuration) (*Argon2Configuration, []string) }{ @@ -157,11 +157,10 @@ func TestArgon2Configuration_Readonly(t *testing.T) { assert.Equal(0, count) }) } - } func TestArgon2Configuration_Validate(t *testing.T) { - var tests = []struct { + tests := []struct { name string in *Argon2Configuration want error @@ -315,7 +314,7 @@ func TestArgon2Credential_New(t *testing.T) { password string conf *Argon2Configuration } - var tests = []struct { + tests := []struct { name string args args want *Argon2Credential diff --git a/internal/auth/password/authmethod_test.go b/internal/auth/password/authmethod_test.go index 7322678c6..d3c3ee09e 100644 --- a/internal/auth/password/authmethod_test.go +++ b/internal/auth/password/authmethod_test.go @@ -21,7 +21,7 @@ func TestAuthMethod_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *AuthMethod diff --git a/internal/auth/password/repository_account_test.go b/internal/auth/password/repository_account_test.go index da907a492..ef1e43572 100644 --- a/internal/auth/password/repository_account_test.go +++ b/internal/auth/password/repository_account_test.go @@ -17,7 +17,7 @@ import ( ) func TestCheckLoginName(t *testing.T) { - var tests = []struct { + tests := []struct { in string want bool }{ @@ -50,7 +50,7 @@ func TestRepository_CreateAccount(t *testing.T) { authMethods := TestAuthMethods(t, conn, org.GetPublicId(), 1) authMethod := authMethods[0] - var tests = []struct { + tests := []struct { name string in *Account opts []Option @@ -333,7 +333,7 @@ func TestRepository_LookupAccount(t *testing.T) { newAcctId, err := newAccountId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want *Account @@ -387,7 +387,7 @@ func TestRepository_DeleteAccount(t *testing.T) { newAcctId, err := newAccountId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want int @@ -442,7 +442,7 @@ func TestRepository_ListAccounts(t *testing.T) { accounts2 := TestAccounts(t, conn, authMethods[1].GetPublicId(), 4) _ = accounts2 - var tests = []struct { + tests := []struct { name string in string opts []Option @@ -498,7 +498,7 @@ func TestRepository_ListAccounts_Limits(t *testing.T) { accountCount := 10 _ = TestAccounts(t, conn, am.GetPublicId(), accountCount) - var tests = []struct { + tests := []struct { name string repoOpts []Option listOpts []Option @@ -619,7 +619,7 @@ func TestRepository_UpdateAccount(t *testing.T) { } } - var tests = []struct { + tests := []struct { name string orig *Account chgFn func(*Account) *Account diff --git a/internal/auth/password/repository_authmethod_test.go b/internal/auth/password/repository_authmethod_test.go index 4448376af..ae1fe9532 100644 --- a/internal/auth/password/repository_authmethod_test.go +++ b/internal/auth/password/repository_authmethod_test.go @@ -28,7 +28,7 @@ func TestRepository_CreateAuthMethod(t *testing.T) { iamRepo := iam.TestRepo(t, conn, wrapper) org, _ := iam.TestScopes(t, iamRepo) - var tests = []struct { + tests := []struct { name string in *AuthMethod opts []Option @@ -266,7 +266,7 @@ func TestRepository_LookupAuthMethod(t *testing.T) { amId, err := newAuthMethodId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want *AuthMethod @@ -317,7 +317,7 @@ func TestRepository_DeleteAuthMethod(t *testing.T) { newAuthMethodId, err := newAuthMethodId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want int @@ -368,7 +368,7 @@ func TestRepository_ListAuthMethods(t *testing.T) { o, _ := iam.TestScopes(t, iamRepo) authMethods := TestAuthMethods(t, conn, o.GetPublicId(), 3) - var tests = []struct { + tests := []struct { name string in string opts []Option @@ -420,7 +420,7 @@ func TestRepository_ListAuthMethods_Limits(t *testing.T) { authMethodCount := 10 ams := TestAuthMethods(t, conn, o.GetPublicId(), authMethodCount) - var tests = []struct { + tests := []struct { name string repoOpts []Option listOpts []Option diff --git a/internal/auth/password/repository_configuration_test.go b/internal/auth/password/repository_configuration_test.go index 0481a2168..ab4fd024e 100644 --- a/internal/auth/password/repository_configuration_test.go +++ b/internal/auth/password/repository_configuration_test.go @@ -136,7 +136,7 @@ func TestRepository_GetConfiguration(t *testing.T) { authMethodId := authMethod.GetPublicId() ctx := context.Background() - var tests = []struct { + tests := []struct { name string authMethodId string want *Argon2Configuration @@ -207,7 +207,7 @@ func TestRepository_SetConfiguration(t *testing.T) { authMethod := authMethods[0] authMethodId := authMethod.GetPublicId() - var tests = []struct { + tests := []struct { name string in Configuration want *Argon2Configuration diff --git a/internal/auth/password/repository_password_test.go b/internal/auth/password/repository_password_test.go index 343d70714..bf1989a86 100644 --- a/internal/auth/password/repository_password_test.go +++ b/internal/auth/password/repository_password_test.go @@ -45,7 +45,7 @@ func TestRepository_Authenticate(t *testing.T) { password string } - var tests = []struct { + tests := []struct { name string args args want *Account @@ -272,7 +272,7 @@ func TestRepository_ChangePassword(t *testing.T) { old, new string } - var tests = []struct { + tests := []struct { name string args args wantAccount bool @@ -447,7 +447,7 @@ func TestRepository_SetPassword(t *testing.T) { return "" } - var tests = []struct { + tests := []struct { name string oldPw string newPw string @@ -537,5 +537,4 @@ func TestRepository_SetPassword(t *testing.T) { assert.Nil(acct) }) } - } diff --git a/internal/auth/password/repository_test.go b/internal/auth/password/repository_test.go index 011e518c5..11ffc9b45 100644 --- a/internal/auth/password/repository_test.go +++ b/internal/auth/password/repository_test.go @@ -24,7 +24,7 @@ func TestRepository_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *Repository diff --git a/internal/auth/password/store/argon2.pb.go b/internal/auth/password/store/argon2.pb.go index c1233deab..c6c4e0c7a 100644 --- a/internal/auth/password/store/argon2.pb.go +++ b/internal/auth/password/store/argon2.pb.go @@ -9,11 +9,12 @@ 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 ( @@ -370,12 +371,15 @@ 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) -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_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_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 diff --git a/internal/auth/password/store/password.pb.go b/internal/auth/password/store/password.pb.go index cab91835c..03f5919ea 100644 --- a/internal/auth/password/store/password.pb.go +++ b/internal/auth/password/store/password.pb.go @@ -9,12 +9,13 @@ 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 ( @@ -459,13 +460,16 @@ 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) -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_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_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 diff --git a/internal/auth/store/account.pb.go b/internal/auth/store/account.pb.go index e552658b6..55399342f 100644 --- a/internal/auth/store/account.pb.go +++ b/internal/auth/store/account.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -142,10 +143,13 @@ 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) -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_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_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/internal/auth/store/auth_method.pb.go b/internal/auth/store/auth_method.pb.go index 37e16dad9..502c5c57a 100644 --- a/internal/auth/store/auth_method.pb.go +++ b/internal/auth/store/auth_method.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -199,11 +200,14 @@ 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) -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_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_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/internal/authtoken/authtoken_test.go b/internal/authtoken/authtoken_test.go index 4e16bc3d5..4f03d3413 100644 --- a/internal/authtoken/authtoken_test.go +++ b/internal/authtoken/authtoken_test.go @@ -42,7 +42,7 @@ func TestAuthToken_DbUpdate(t *testing.T) { future, err := ptypes.TimestampProto(time.Now().Add(time.Hour)) require.NoError(t, err) - var tests = []struct { + tests := []struct { name string args args want *AuthToken @@ -131,7 +131,7 @@ func TestAuthToken_DbCreate(t *testing.T) { return id } - var tests = []struct { + tests := []struct { name string in *store.AuthToken wantError bool @@ -185,7 +185,7 @@ func TestAuthToken_DbDelete(t *testing.T) { org, _ := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) existingAuthTok := TestAuthToken(t, conn, kms, org.GetPublicId()) - var tests = []struct { + tests := []struct { name string at *writableAuthToken wantError bool diff --git a/internal/authtoken/gorm.go b/internal/authtoken/gorm.go index 6d9e24cbb..f8d9ecbea 100644 --- a/internal/authtoken/gorm.go +++ b/internal/authtoken/gorm.go @@ -1,7 +1,9 @@ package authtoken -const defaultAuthTokenTableName = "auth_token_account" -const defaultWritableAuthTokenTableName = "auth_token" +const ( + defaultAuthTokenTableName = "auth_token_account" + defaultWritableAuthTokenTableName = "auth_token" +) // TableName returns the table name for the auth token. func (s *AuthToken) TableName() string { diff --git a/internal/authtoken/immutable_fields_test.go b/internal/authtoken/immutable_fields_test.go index c1c8dabca..e0cef25d2 100644 --- a/internal/authtoken/immutable_fields_test.go +++ b/internal/authtoken/immutable_fields_test.go @@ -26,7 +26,7 @@ func TestAuthToken_ImmutableFields(t *testing.T) { org, _ := iam.TestScopes(t, repo) new := TestAuthToken(t, conn, kms, org.PublicId) - var tests = []struct { + tests := []struct { name string update *AuthToken fieldMask []string @@ -76,7 +76,6 @@ func TestAuthToken_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } diff --git a/internal/authtoken/repository_test.go b/internal/authtoken/repository_test.go index 34fc95d91..a04da4782 100644 --- a/internal/authtoken/repository_test.go +++ b/internal/authtoken/repository_test.go @@ -34,7 +34,7 @@ func TestRepository_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *Repository @@ -192,7 +192,7 @@ func TestRepository_CreateAuthToken(t *testing.T) { org2, _ := iam.TestScopes(t, repo) u2 := iam.TestUser(t, repo, org2.GetPublicId()) - var tests = []struct { + tests := []struct { name string iamUser *iam.User authAcctId string @@ -279,7 +279,7 @@ func TestRepository_LookupAuthToken(t *testing.T) { require.NoError(t, err) require.NotNil(t, badId) - var tests = []struct { + tests := []struct { name string id string want *AuthToken @@ -370,7 +370,7 @@ func TestRepository_ValidateToken(t *testing.T) { require.NoError(t, err) require.NotNil(t, badToken) - var tests = []struct { + tests := []struct { name string id string token string @@ -475,7 +475,7 @@ func TestRepository_ValidateToken_expired(t *testing.T) { require.NoError(t, err) require.NotNil(t, iamUser) - var tests = []struct { + tests := []struct { name string staleDuration time.Duration expirationDuration time.Duration @@ -543,7 +543,7 @@ func TestRepository_DeleteAuthToken(t *testing.T) { require.NoError(t, err) require.NotNil(t, badId) - var tests = []struct { + tests := []struct { name string id string want int @@ -609,7 +609,7 @@ func TestRepository_ListAuthTokens(t *testing.T) { emptyOrg, _ := iam.TestScopes(t, repo) - var tests = []struct { + tests := []struct { name string orgId string want []*AuthToken diff --git a/internal/authtoken/store/authtoken.pb.go b/internal/authtoken/store/authtoken.pb.go index 3de721708..8dd5f6270 100644 --- a/internal/authtoken/store/authtoken.pb.go +++ b/internal/authtoken/store/authtoken.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -254,11 +255,14 @@ 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) -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_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_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 diff --git a/internal/cmd/base/profiling_on.go b/internal/cmd/base/profiling_on.go index 30608032d..e48731d2f 100644 --- a/internal/cmd/base/profiling_on.go +++ b/internal/cmd/base/profiling_on.go @@ -14,7 +14,7 @@ import ( func StartMemProfiler(logger hclog.Logger) { profileDir := filepath.Join(os.TempDir(), "boundaryprof") - if err := os.MkdirAll(profileDir, 0700); err != nil { + if err := os.MkdirAll(profileDir, 0o700); err != nil { logger.Debug("could not create profile directory", "error", err) return } diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index a0f3edee8..464c2dff1 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -159,7 +159,7 @@ func (b *Server) StorePidFile(pidPath string) error { } // Open the PID file - pidFile, err := os.OpenFile(pidPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644) + pidFile, err := os.OpenFile(pidPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644) if err != nil { return fmt.Errorf("could not open pid file: %w", err) } @@ -313,7 +313,7 @@ func (b *Server) SetupListeners(ui cli.Ui, config *configutil.SharedConfig, allo lnConfig.MaxRequestSize = globals.DefaultMaxRequestSize } // TODO: We don't actually limit this yet. - //props["max_request_size"] = fmt.Sprintf("%d", lnConfig.MaxRequestSize) + // props["max_request_size"] = fmt.Sprintf("%d", lnConfig.MaxRequestSize) if lnConfig.MaxRequestDuration == 0 { lnConfig.MaxRequestDuration = globals.DefaultMaxRequestDuration diff --git a/internal/cmd/commands/accounts/account.go b/internal/cmd/commands/accounts/account.go index 795570bfd..ffa20069a 100644 --- a/internal/cmd/commands/accounts/account.go +++ b/internal/cmd/commands/accounts/account.go @@ -17,8 +17,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/accounts/password.go b/internal/cmd/commands/accounts/password.go index 1712f22e0..d12681155 100644 --- a/internal/cmd/commands/accounts/password.go +++ b/internal/cmd/commands/accounts/password.go @@ -16,8 +16,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*PasswordCommand)(nil) -var _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +var ( + _ cli.Command = (*PasswordCommand)(nil) + _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +) type PasswordCommand struct { *base.Command diff --git a/internal/cmd/commands/authenticate/password.go b/internal/cmd/commands/authenticate/password.go index 1890544f5..a04f50dd9 100644 --- a/internal/cmd/commands/authenticate/password.go +++ b/internal/cmd/commands/authenticate/password.go @@ -20,12 +20,16 @@ import ( zkeyring "github.com/zalando/go-keyring" ) -var _ cli.Command = (*PasswordCommand)(nil) -var _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +var ( + _ cli.Command = (*PasswordCommand)(nil) + _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +) -var envPassword = "BOUNDARY_AUTHENTICATE_PASSWORD_PASSWORD" -var envLoginName = "BOUNDARY_AUTHENTICATE_PASSWORD_LOGIN_NAME" -var envAuthMethodId = "BOUNDARY_AUTHENTICATE_AUTH_METHOD_ID" +var ( + envPassword = "BOUNDARY_AUTHENTICATE_PASSWORD_PASSWORD" + envLoginName = "BOUNDARY_AUTHENTICATE_PASSWORD_LOGIN_NAME" + envAuthMethodId = "BOUNDARY_AUTHENTICATE_AUTH_METHOD_ID" +) type PasswordCommand struct { *base.Command diff --git a/internal/cmd/commands/authmethods/authmethod.go b/internal/cmd/commands/authmethods/authmethod.go index 421569d5b..b1810b128 100644 --- a/internal/cmd/commands/authmethods/authmethod.go +++ b/internal/cmd/commands/authmethods/authmethod.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/authmethods/password.go b/internal/cmd/commands/authmethods/password.go index 166af01a5..662212e12 100644 --- a/internal/cmd/commands/authmethods/password.go +++ b/internal/cmd/commands/authmethods/password.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*PasswordCommand)(nil) -var _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +var ( + _ cli.Command = (*PasswordCommand)(nil) + _ cli.CommandAutocomplete = (*PasswordCommand)(nil) +) type PasswordCommand struct { *base.Command diff --git a/internal/cmd/commands/authtokens/authtokens.go b/internal/cmd/commands/authtokens/authtokens.go index b7d651334..a9f88d0ea 100644 --- a/internal/cmd/commands/authtokens/authtokens.go +++ b/internal/cmd/commands/authtokens/authtokens.go @@ -15,8 +15,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/config/encryptdecrypt.go b/internal/cmd/commands/config/encryptdecrypt.go index 4bee54c0a..28c7a09c2 100644 --- a/internal/cmd/commands/config/encryptdecrypt.go +++ b/internal/cmd/commands/config/encryptdecrypt.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*EncryptDecryptCommand)(nil) -var _ cli.CommandAutocomplete = (*EncryptDecryptCommand)(nil) +var ( + _ cli.Command = (*EncryptDecryptCommand)(nil) + _ cli.CommandAutocomplete = (*EncryptDecryptCommand)(nil) +) type EncryptDecryptCommand struct { *base.Command diff --git a/internal/cmd/commands/config/encryptdecrypt_test.go b/internal/cmd/commands/config/encryptdecrypt_test.go index 9b5905130..a286972ac 100644 --- a/internal/cmd/commands/config/encryptdecrypt_test.go +++ b/internal/cmd/commands/config/encryptdecrypt_test.go @@ -61,7 +61,6 @@ func TestEncryptDecrypt(t *testing.T) { for _, c := range cases { t.Run(fmt.Sprintf("Test encrypt %v", c.f), func(t *testing.T) { - var b bytes.Buffer ui := &cli.BasicUi{ diff --git a/internal/cmd/commands/config/token.go b/internal/cmd/commands/config/token.go index cc0484558..875c1d9e9 100644 --- a/internal/cmd/commands/config/token.go +++ b/internal/cmd/commands/config/token.go @@ -9,8 +9,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*TokenCommand)(nil) -var _ cli.CommandAutocomplete = (*TokenCommand)(nil) +var ( + _ cli.Command = (*TokenCommand)(nil) + _ cli.CommandAutocomplete = (*TokenCommand)(nil) +) type TokenCommand struct { *base.Command diff --git a/internal/cmd/commands/connect/connect.go b/internal/cmd/commands/connect/connect.go index 058ec14b4..17be53789 100644 --- a/internal/cmd/commands/connect/connect.go +++ b/internal/cmd/commands/connect/connect.go @@ -56,8 +56,10 @@ type TerminationInfo struct { Reason string `json:"termination_reason"` } -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command @@ -648,7 +650,6 @@ func (c *Command) getWsConn( ctx context.Context, workerAddr string, transport *http.Transport) (*websocket.Conn, error) { - conn, resp, err := websocket.Dial( ctx, fmt.Sprintf("wss://%s/v1/proxy", workerAddr), @@ -687,7 +688,6 @@ func (c *Command) sendSessionTeardown( ctx context.Context, wsConn *websocket.Conn, tofuToken string) error { - handshake := proxy.ClientHandshake{ TofuToken: tofuToken, Command: proxy.HANDSHAKECOMMAND_HANDSHAKECOMMAND_SESSION_CANCEL, diff --git a/internal/cmd/commands/database/database.go b/internal/cmd/commands/database/database.go index 5885b6bc3..7e5b18a8d 100644 --- a/internal/cmd/commands/database/database.go +++ b/internal/cmd/commands/database/database.go @@ -6,8 +6,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/database/init.go b/internal/cmd/commands/database/init.go index 7bb45cafc..c275d319a 100644 --- a/internal/cmd/commands/database/init.go +++ b/internal/cmd/commands/database/init.go @@ -18,8 +18,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*InitCommand)(nil) -var _ cli.CommandAutocomplete = (*InitCommand)(nil) +var ( + _ cli.Command = (*InitCommand)(nil) + _ cli.CommandAutocomplete = (*InitCommand)(nil) +) type InitCommand struct { *base.Command diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go index 837671cbc..d91f170cc 100644 --- a/internal/cmd/commands/dev/dev.go +++ b/internal/cmd/commands/dev/dev.go @@ -21,8 +21,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Server @@ -241,7 +243,7 @@ func (c *Command) Run(args []string) int { return 1 } - //childShutdownCh := make(chan struct{}) + // childShutdownCh := make(chan struct{}) c.Config, err = config.DevCombined() if err != nil { diff --git a/internal/cmd/commands/groups/group.go b/internal/cmd/commands/groups/group.go index 90623007c..7d0e34216 100644 --- a/internal/cmd/commands/groups/group.go +++ b/internal/cmd/commands/groups/group.go @@ -13,8 +13,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/hostcatalogs/hostcatalog.go b/internal/cmd/commands/hostcatalogs/hostcatalog.go index 31208edd1..15838c987 100644 --- a/internal/cmd/commands/hostcatalogs/hostcatalog.go +++ b/internal/cmd/commands/hostcatalogs/hostcatalog.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/hostcatalogs/static.go b/internal/cmd/commands/hostcatalogs/static.go index 7cdd26588..e5e1cc60f 100644 --- a/internal/cmd/commands/hostcatalogs/static.go +++ b/internal/cmd/commands/hostcatalogs/static.go @@ -13,8 +13,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*StaticCommand)(nil) -var _ cli.CommandAutocomplete = (*StaticCommand)(nil) +var ( + _ cli.Command = (*StaticCommand)(nil) + _ cli.CommandAutocomplete = (*StaticCommand)(nil) +) type StaticCommand struct { *base.Command diff --git a/internal/cmd/commands/hosts/host.go b/internal/cmd/commands/hosts/host.go index 4b1f9b960..0117bd3ba 100644 --- a/internal/cmd/commands/hosts/host.go +++ b/internal/cmd/commands/hosts/host.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/hosts/static.go b/internal/cmd/commands/hosts/static.go index c87d7c0b7..6a8cd18e3 100644 --- a/internal/cmd/commands/hosts/static.go +++ b/internal/cmd/commands/hosts/static.go @@ -13,8 +13,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*StaticCommand)(nil) -var _ cli.CommandAutocomplete = (*StaticCommand)(nil) +var ( + _ cli.Command = (*StaticCommand)(nil) + _ cli.CommandAutocomplete = (*StaticCommand)(nil) +) type StaticCommand struct { *base.Command diff --git a/internal/cmd/commands/hostsets/hostset.go b/internal/cmd/commands/hostsets/hostset.go index 0eac981db..27fe902c3 100644 --- a/internal/cmd/commands/hostsets/hostset.go +++ b/internal/cmd/commands/hostsets/hostset.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/hostsets/static.go b/internal/cmd/commands/hostsets/static.go index 915ce886a..2cb88710c 100644 --- a/internal/cmd/commands/hostsets/static.go +++ b/internal/cmd/commands/hostsets/static.go @@ -13,8 +13,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*StaticCommand)(nil) -var _ cli.CommandAutocomplete = (*StaticCommand)(nil) +var ( + _ cli.Command = (*StaticCommand)(nil) + _ cli.CommandAutocomplete = (*StaticCommand)(nil) +) type StaticCommand struct { *base.Command diff --git a/internal/cmd/commands/roles/funcs.go b/internal/cmd/commands/roles/funcs.go index de433809e..90db514f3 100644 --- a/internal/cmd/commands/roles/funcs.go +++ b/internal/cmd/commands/roles/funcs.go @@ -138,7 +138,6 @@ func generateRoleTableOutput(in *roles.Role) string { ret = append(ret, fmt.Sprintf(" %s", grant.Canonical), ) - } return base.WrapForHelpText(ret) } diff --git a/internal/cmd/commands/roles/role.go b/internal/cmd/commands/roles/role.go index c7abb04c3..862278403 100644 --- a/internal/cmd/commands/roles/role.go +++ b/internal/cmd/commands/roles/role.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/scopes/scope.go b/internal/cmd/commands/scopes/scope.go index 41e34497f..9c106fe4b 100644 --- a/internal/cmd/commands/scopes/scope.go +++ b/internal/cmd/commands/scopes/scope.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index 0ea943f54..2f53b4cf0 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -20,8 +20,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Server diff --git a/internal/cmd/commands/sessions/session.go b/internal/cmd/commands/sessions/session.go index adbb65fed..444dd89b8 100644 --- a/internal/cmd/commands/sessions/session.go +++ b/internal/cmd/commands/sessions/session.go @@ -14,8 +14,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/targets/target.go b/internal/cmd/commands/targets/target.go index 98a341055..a1c618775 100644 --- a/internal/cmd/commands/targets/target.go +++ b/internal/cmd/commands/targets/target.go @@ -15,8 +15,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/targets/tcp.go b/internal/cmd/commands/targets/tcp.go index 5f8f584ae..5d9cc5d1a 100644 --- a/internal/cmd/commands/targets/tcp.go +++ b/internal/cmd/commands/targets/tcp.go @@ -15,8 +15,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*TcpCommand)(nil) -var _ cli.CommandAutocomplete = (*TcpCommand)(nil) +var ( + _ cli.Command = (*TcpCommand)(nil) + _ cli.CommandAutocomplete = (*TcpCommand)(nil) +) type TcpCommand struct { *base.Command diff --git a/internal/cmd/commands/users/user.go b/internal/cmd/commands/users/user.go index befaccb64..fd9424ddc 100644 --- a/internal/cmd/commands/users/user.go +++ b/internal/cmd/commands/users/user.go @@ -13,8 +13,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/cmd/commands/version/version.go b/internal/cmd/commands/version/version.go index eaf453938..2d3c130a7 100644 --- a/internal/cmd/commands/version/version.go +++ b/internal/cmd/commands/version/version.go @@ -9,8 +9,10 @@ import ( "github.com/posener/complete" ) -var _ cli.Command = (*Command)(nil) -var _ cli.CommandAutocomplete = (*Command)(nil) +var ( + _ cli.Command = (*Command)(nil) + _ cli.CommandAutocomplete = (*Command)(nil) +) type Command struct { *base.Command diff --git a/internal/db/db.go b/internal/db/db.go index b940752ab..5537aa303 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -14,9 +14,7 @@ import ( "github.com/lib/pq" ) -var ( - StartDbInDocker = docker.StartDbInDocker -) +var StartDbInDocker = docker.StartDbInDocker type DbType int diff --git a/internal/db/db_test/db.go b/internal/db/db_test/db.go index 9178cedfc..a7aa7e882 100644 --- a/internal/db/db_test/db.go +++ b/internal/db/db_test/db.go @@ -43,6 +43,7 @@ func (u *TestUser) Clone() interface{} { StoreTestUser: s.(*StoreTestUser), } } + func (u *TestUser) TableName() string { if u.table != "" { return u.table @@ -83,6 +84,7 @@ func (c *TestCar) TableName() string { return defaultCarTableName } + func (c *TestCar) SetTableName(name string) { c.table = name } @@ -103,6 +105,7 @@ func NewTestRental() (*TestRental, error) { }, }, nil } + func (r *TestRental) TableName() string { if r.table != "" { return r.table @@ -110,6 +113,7 @@ func (r *TestRental) TableName() string { return defaultRentalTableName } + func (r *TestRental) SetTableName(name string) { r.table = name } @@ -137,6 +141,7 @@ func (t *TestScooter) Clone() interface{} { StoreTestScooter: s.(*StoreTestScooter), } } + func (t *TestScooter) TableName() string { if t.table != "" { return t.table diff --git a/internal/db/db_test/db_test.pb.go b/internal/db/db_test/db_test.pb.go index 54dc97d6a..66ec1889e 100644 --- a/internal/db/db_test/db_test.pb.go +++ b/internal/db/db_test/db_test.pb.go @@ -11,11 +11,12 @@ 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 ( @@ -555,14 +556,17 @@ 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) -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_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_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 diff --git a/internal/db/domains_test.go b/internal/db/domains_test.go index 5427e9f36..9ce7136fc 100644 --- a/internal/db/domains_test.go +++ b/internal/db/domains_test.go @@ -451,7 +451,7 @@ set id = null; assert.NoError(t, err) assert.Equal(t, 1, count) - var tests = []struct { + tests := []struct { name string stmt string }{ @@ -525,7 +525,5 @@ set id = null; assert.Equal(orig.Id, found.Id) assert.Equal(orig.Name, found.Name) assert.Equal(orig.CreateTime, found.CreateTime) - }) - } diff --git a/internal/db/id_test.go b/internal/db/id_test.go index 11313223e..e26a4c159 100644 --- a/internal/db/id_test.go +++ b/internal/db/id_test.go @@ -48,7 +48,6 @@ func TestNewPublicId(t *testing.T) { if len(got) != tt.wantLen { t.Errorf("NewPublicId() = %v, with len of %d and wanted len of %v", got, len(got), tt.wantLen) } - }) } } diff --git a/internal/db/migrations/driver.go b/internal/db/migrations/driver.go index e2ba1cf06..4d842cf13 100644 --- a/internal/db/migrations/driver.go +++ b/internal/db/migrations/driver.go @@ -56,6 +56,7 @@ func newFakeFile(dialect string, name string) (*fakeFile, error) { ff.dialect = dialect return ff, nil } + func (f *fakeFile) Read(p []byte) (n int, err error) { return f.reader.Read(p) } diff --git a/internal/db/migrations/genmigrations/generate.go b/internal/db/migrations/genmigrations/generate.go index 3724f969c..6ddfe5912 100644 --- a/internal/db/migrations/genmigrations/generate.go +++ b/internal/db/migrations/genmigrations/generate.go @@ -114,7 +114,7 @@ func generate(dialect string) { } outFile := fmt.Sprintf("%s/%s.gen.go", baseDir, dialect) - if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0644); err != nil { + if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0o644); err != nil { fmt.Printf("error writing file %q: %v\n", outFile, err) os.Exit(1) } diff --git a/internal/db/read_writer.go b/internal/db/read_writer.go index cf96c5d05..52d72174d 100644 --- a/internal/db/read_writer.go +++ b/internal/db/read_writer.go @@ -169,8 +169,10 @@ type Db struct { } // ensure that Db implements the interfaces of: Reader and Writer -var _ Reader = (*Db)(nil) -var _ Writer = (*Db)(nil) +var ( + _ Reader = (*Db)(nil) + _ Writer = (*Db)(nil) +) func New(underlying *gorm.DB) *Db { return &Db{underlying: underlying} @@ -344,7 +346,6 @@ func (rw *Db) CreateItems(ctx context.Context, createItems []interface{}, opt .. if err := rw.Create(ctx, item); err != nil { return errors.Wrap(err, op) } - } if opts.withOplog { if err := rw.addOplogForItems(ctx, CreateOp, opts, ticket, createItems); err != nil { diff --git a/internal/db/read_writer_test.go b/internal/db/read_writer_test.go index 00503d251..0ad6f7268 100644 --- a/internal/db/read_writer_test.go +++ b/internal/db/read_writer_test.go @@ -34,7 +34,8 @@ func TestDb_UpdateUnsetField(t *testing.T) { StoreTestUser: &db_test.StoreTestUser{ PublicId: testId(t), Name: "default", - }} + }, + } require.NoError(t, rw.Create(context.Background(), tu)) updatedTu := tu.Clone().(*db_test.TestUser) @@ -586,9 +587,11 @@ type testUserWithVet struct { func (u *testUserWithVet) GetPublicId() string { return u.PublicId } + func (u *testUserWithVet) TableName() string { return "db_test_user" } + func (u *testUserWithVet) VetForWrite(ctx context.Context, r Reader, opType OpType, opt ...Option) error { if u.PublicId == "" { return stderrors.New("public id is empty string for user write") @@ -1029,6 +1032,7 @@ func TestDb_Exec(t *testing.T) { require.Equal(1, rowsAffected) }) } + func TestDb_DoTx(t *testing.T) { t.Parallel() db, _ := TestSetup(t, "postgres") @@ -1901,6 +1905,7 @@ func testUser(t *testing.T, conn *gorm.DB, name, email, phoneNumber string) *db_ } return u } + func testCar(t *testing.T, conn *gorm.DB, name, model string, mpg int32) *db_test.TestCar { t.Helper() require := require.New(t) @@ -2274,7 +2279,7 @@ func TestClear_InputTypes(t *testing.T) { d int } - var tests = []struct { + tests := []struct { name string args args want interface{} @@ -2430,7 +2435,7 @@ func TestClear_Structs(t *testing.T) { f []string d int } - var tests = []struct { + tests := []struct { name string args args want interface{} @@ -2676,7 +2681,7 @@ func TestClear_SetFieldsToNil(t *testing.T) { v interface{} f []string } - var tests = []struct { + tests := []struct { name string args args want interface{} diff --git a/internal/db/testing_test.go b/internal/db/testing_test.go index 6e7231cec..75e0b4e89 100644 --- a/internal/db/testing_test.go +++ b/internal/db/testing_test.go @@ -17,7 +17,6 @@ func Test_Utils(t *testing.T) { t.Parallel() _, _ = TestSetup(t, "postgres") t.Run("nothing", func(t *testing.T) { - }) } diff --git a/internal/db/timestamp/timestamp.pb.go b/internal/db/timestamp/timestamp.pb.go index 536e0a68f..bc0f0a34f 100644 --- a/internal/db/timestamp/timestamp.pb.go +++ b/internal/db/timestamp/timestamp.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -107,11 +108,14 @@ 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) -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_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_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 diff --git a/internal/errors/code_test.go b/internal/errors/code_test.go index c0018012b..db3ab32a9 100644 --- a/internal/errors/code_test.go +++ b/internal/errors/code_test.go @@ -128,7 +128,6 @@ func TestCode_Both_String_Info(t *testing.T) { assert := assert.New(t) assert.Equal(errorCodeInfo[tt.want], tt.c.Info()) assert.Equal(errorCodeInfo[tt.want].Message, tt.c.String()) - }) } } diff --git a/internal/errors/is_test.go b/internal/errors/is_test.go index 4c4949193..c7bee85fe 100644 --- a/internal/errors/is_test.go +++ b/internal/errors/is_test.go @@ -14,7 +14,7 @@ import ( func TestError_IsUnique(t *testing.T) { t.Parallel() - var tests = []struct { + tests := []struct { name string in error want bool @@ -76,7 +76,7 @@ func TestError_IsUnique(t *testing.T) { func TestError_IsCheckConstraint(t *testing.T) { t.Parallel() - var tests = []struct { + tests := []struct { name string in error want bool @@ -138,7 +138,7 @@ func TestError_IsCheckConstraint(t *testing.T) { func TestError_IsNotNullError(t *testing.T) { t.Parallel() - var tests = []struct { + tests := []struct { name string in error want bool @@ -206,7 +206,7 @@ func TestError_IsNotNullError(t *testing.T) { } func TestError_IsMissingTableError(t *testing.T) { - var tests = []struct { + tests := []struct { name string in error want bool @@ -258,7 +258,7 @@ func TestError_IsMissingTableError(t *testing.T) { } func TestError_IsNotFoundError(t *testing.T) { - var tests = []struct { + tests := []struct { name string in error want bool diff --git a/internal/gen/controller/api/error.pb.go b/internal/gen/controller/api/error.pb.go index 1ea0e1124..8391858a5 100644 --- a/internal/gen/controller/api/error.pb.go +++ b/internal/gen/controller/api/error.pb.go @@ -7,10 +7,11 @@ package api import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -320,13 +321,16 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/resources/accounts/account.pb.go b/internal/gen/controller/api/resources/accounts/account.pb.go index dec56112e..ff2eb825d 100644 --- a/internal/gen/controller/api/resources/accounts/account.pb.go +++ b/internal/gen/controller/api/resources/accounts/account.pb.go @@ -7,6 +7,9 @@ package accounts import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -14,8 +17,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -299,15 +300,18 @@ func file_controller_api_resources_accounts_v1_account_proto_rawDescGZIP() []byt return file_controller_api_resources_accounts_v1_account_proto_rawDescData } -var file_controller_api_resources_accounts_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_accounts_v1_account_proto_goTypes = []interface{}{ - (*Account)(nil), // 0: controller.api.resources.accounts.v1.Account - (*PasswordAccountAttributes)(nil), // 1: controller.api.resources.accounts.v1.PasswordAccountAttributes - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 5: google.protobuf.Struct -} +var ( + file_controller_api_resources_accounts_v1_account_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_accounts_v1_account_proto_goTypes = []interface{}{ + (*Account)(nil), // 0: controller.api.resources.accounts.v1.Account + (*PasswordAccountAttributes)(nil), // 1: controller.api.resources.accounts.v1.PasswordAccountAttributes + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 5: google.protobuf.Struct + } +) + var file_controller_api_resources_accounts_v1_account_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.accounts.v1.Account.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 3, // 1: controller.api.resources.accounts.v1.Account.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/authmethods/auth_method.pb.go b/internal/gen/controller/api/resources/authmethods/auth_method.pb.go index e32e3aad0..4afe0af95 100644 --- a/internal/gen/controller/api/resources/authmethods/auth_method.pb.go +++ b/internal/gen/controller/api/resources/authmethods/auth_method.pb.go @@ -7,6 +7,9 @@ package authmethods import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -14,8 +17,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -305,15 +306,18 @@ func file_controller_api_resources_authmethods_v1_auth_method_proto_rawDescGZIP( return file_controller_api_resources_authmethods_v1_auth_method_proto_rawDescData } -var file_controller_api_resources_authmethods_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_authmethods_v1_auth_method_proto_goTypes = []interface{}{ - (*AuthMethod)(nil), // 0: controller.api.resources.authmethods.v1.AuthMethod - (*PasswordAuthMethodAttributes)(nil), // 1: controller.api.resources.authmethods.v1.PasswordAuthMethodAttributes - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 5: google.protobuf.Struct -} +var ( + file_controller_api_resources_authmethods_v1_auth_method_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_authmethods_v1_auth_method_proto_goTypes = []interface{}{ + (*AuthMethod)(nil), // 0: controller.api.resources.authmethods.v1.AuthMethod + (*PasswordAuthMethodAttributes)(nil), // 1: controller.api.resources.authmethods.v1.PasswordAuthMethodAttributes + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 5: google.protobuf.Struct + } +) + var file_controller_api_resources_authmethods_v1_auth_method_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.authmethods.v1.AuthMethod.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 3, // 1: controller.api.resources.authmethods.v1.AuthMethod.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go index acbb50383..6ff74195e 100644 --- a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go +++ b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go @@ -7,13 +7,14 @@ package authtokens import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -232,12 +233,15 @@ func file_controller_api_resources_authtokens_v1_authtoken_proto_rawDescGZIP() [ return file_controller_api_resources_authtokens_v1_authtoken_proto_rawDescData } -var file_controller_api_resources_authtokens_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_controller_api_resources_authtokens_v1_authtoken_proto_goTypes = []interface{}{ - (*AuthToken)(nil), // 0: controller.api.resources.authtokens.v1.AuthToken - (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo - (*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp -} +var ( + file_controller_api_resources_authtokens_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1) + file_controller_api_resources_authtokens_v1_authtoken_proto_goTypes = []interface{}{ + (*AuthToken)(nil), // 0: controller.api.resources.authtokens.v1.AuthToken + (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo + (*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp + } +) + var file_controller_api_resources_authtokens_v1_authtoken_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.authtokens.v1.AuthToken.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 2, // 1: controller.api.resources.authtokens.v1.AuthToken.created_time:type_name -> google.protobuf.Timestamp diff --git a/internal/gen/controller/api/resources/groups/group.pb.go b/internal/gen/controller/api/resources/groups/group.pb.go index 9a7a327e7..43ce5f9bd 100644 --- a/internal/gen/controller/api/resources/groups/group.pb.go +++ b/internal/gen/controller/api/resources/groups/group.pb.go @@ -7,14 +7,15 @@ package groups import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -288,14 +289,17 @@ func file_controller_api_resources_groups_v1_group_proto_rawDescGZIP() []byte { return file_controller_api_resources_groups_v1_group_proto_rawDescData } -var file_controller_api_resources_groups_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_groups_v1_group_proto_goTypes = []interface{}{ - (*Member)(nil), // 0: controller.api.resources.groups.v1.Member - (*Group)(nil), // 1: controller.api.resources.groups.v1.Group - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp -} +var ( + file_controller_api_resources_groups_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_groups_v1_group_proto_goTypes = []interface{}{ + (*Member)(nil), // 0: controller.api.resources.groups.v1.Member + (*Group)(nil), // 1: controller.api.resources.groups.v1.Group + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + } +) + var file_controller_api_resources_groups_v1_group_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.groups.v1.Group.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 3, // 1: controller.api.resources.groups.v1.Group.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go b/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go index 0b136b7c2..195e5f8bd 100644 --- a/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go +++ b/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go @@ -7,6 +7,9 @@ package hostcatalogs import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -14,8 +17,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -232,14 +233,17 @@ func file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_rawDescGZI return file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_rawDescData } -var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_goTypes = []interface{}{ - (*HostCatalog)(nil), // 0: controller.api.resources.hostcatalogs.v1.HostCatalog - (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 4: google.protobuf.Struct -} +var ( + file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 1) + file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_goTypes = []interface{}{ + (*HostCatalog)(nil), // 0: controller.api.resources.hostcatalogs.v1.HostCatalog + (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 4: google.protobuf.Struct + } +) + var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.hostcatalogs.v1.HostCatalog.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 2, // 1: controller.api.resources.hostcatalogs.v1.HostCatalog.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/hosts/host.pb.go b/internal/gen/controller/api/resources/hosts/host.pb.go index 9f66e5ae4..e03ec30de 100644 --- a/internal/gen/controller/api/resources/hosts/host.pb.go +++ b/internal/gen/controller/api/resources/hosts/host.pb.go @@ -7,6 +7,9 @@ package hosts import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -14,8 +17,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -297,15 +298,18 @@ func file_controller_api_resources_hosts_v1_host_proto_rawDescGZIP() []byte { return file_controller_api_resources_hosts_v1_host_proto_rawDescData } -var file_controller_api_resources_hosts_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_hosts_v1_host_proto_goTypes = []interface{}{ - (*Host)(nil), // 0: controller.api.resources.hosts.v1.Host - (*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 5: google.protobuf.Struct -} +var ( + file_controller_api_resources_hosts_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_hosts_v1_host_proto_goTypes = []interface{}{ + (*Host)(nil), // 0: controller.api.resources.hosts.v1.Host + (*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 5: google.protobuf.Struct + } +) + var file_controller_api_resources_hosts_v1_host_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.hosts.v1.Host.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 3, // 1: controller.api.resources.hosts.v1.Host.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/hostsets/host_set.pb.go b/internal/gen/controller/api/resources/hostsets/host_set.pb.go index fe7f276f5..fe55f7908 100644 --- a/internal/gen/controller/api/resources/hostsets/host_set.pb.go +++ b/internal/gen/controller/api/resources/hostsets/host_set.pb.go @@ -7,6 +7,9 @@ package hostsets import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -15,8 +18,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -245,14 +246,17 @@ func file_controller_api_resources_hostsets_v1_host_set_proto_rawDescGZIP() []by return file_controller_api_resources_hostsets_v1_host_set_proto_rawDescData } -var file_controller_api_resources_hostsets_v1_host_set_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_controller_api_resources_hostsets_v1_host_set_proto_goTypes = []interface{}{ - (*HostSet)(nil), // 0: controller.api.resources.hostsets.v1.HostSet - (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 4: google.protobuf.Struct -} +var ( + file_controller_api_resources_hostsets_v1_host_set_proto_msgTypes = make([]protoimpl.MessageInfo, 1) + file_controller_api_resources_hostsets_v1_host_set_proto_goTypes = []interface{}{ + (*HostSet)(nil), // 0: controller.api.resources.hostsets.v1.HostSet + (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 4: google.protobuf.Struct + } +) + var file_controller_api_resources_hostsets_v1_host_set_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.hostsets.v1.HostSet.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 2, // 1: controller.api.resources.hostsets.v1.HostSet.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/roles/role.pb.go b/internal/gen/controller/api/resources/roles/role.pb.go index 365c90be3..d6a5940ea 100644 --- a/internal/gen/controller/api/resources/roles/role.pb.go +++ b/internal/gen/controller/api/resources/roles/role.pb.go @@ -7,14 +7,15 @@ package roles import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -484,16 +485,19 @@ func file_controller_api_resources_roles_v1_role_proto_rawDescGZIP() []byte { return file_controller_api_resources_roles_v1_role_proto_rawDescData } -var file_controller_api_resources_roles_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_controller_api_resources_roles_v1_role_proto_goTypes = []interface{}{ - (*Principal)(nil), // 0: controller.api.resources.roles.v1.Principal - (*GrantJson)(nil), // 1: controller.api.resources.roles.v1.GrantJson - (*Grant)(nil), // 2: controller.api.resources.roles.v1.Grant - (*Role)(nil), // 3: controller.api.resources.roles.v1.Role - (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp -} +var ( + file_controller_api_resources_roles_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 4) + file_controller_api_resources_roles_v1_role_proto_goTypes = []interface{}{ + (*Principal)(nil), // 0: controller.api.resources.roles.v1.Principal + (*GrantJson)(nil), // 1: controller.api.resources.roles.v1.GrantJson + (*Grant)(nil), // 2: controller.api.resources.roles.v1.Grant + (*Role)(nil), // 3: controller.api.resources.roles.v1.Role + (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp + } +) + var file_controller_api_resources_roles_v1_role_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.roles.v1.Grant.json:type_name -> controller.api.resources.roles.v1.GrantJson 4, // 1: controller.api.resources.roles.v1.Role.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/scopes/scope.pb.go b/internal/gen/controller/api/resources/scopes/scope.pb.go index 938a8806a..8c2e29590 100644 --- a/internal/gen/controller/api/resources/scopes/scope.pb.go +++ b/internal/gen/controller/api/resources/scopes/scope.pb.go @@ -7,13 +7,14 @@ package scopes import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -303,13 +304,16 @@ func file_controller_api_resources_scopes_v1_scope_proto_rawDescGZIP() []byte { return file_controller_api_resources_scopes_v1_scope_proto_rawDescData } -var file_controller_api_resources_scopes_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_scopes_v1_scope_proto_goTypes = []interface{}{ - (*ScopeInfo)(nil), // 0: controller.api.resources.scopes.v1.ScopeInfo - (*Scope)(nil), // 1: controller.api.resources.scopes.v1.Scope - (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp -} +var ( + file_controller_api_resources_scopes_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_scopes_v1_scope_proto_goTypes = []interface{}{ + (*ScopeInfo)(nil), // 0: controller.api.resources.scopes.v1.ScopeInfo + (*Scope)(nil), // 1: controller.api.resources.scopes.v1.Scope + (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp + } +) + var file_controller_api_resources_scopes_v1_scope_proto_depIdxs = []int32{ 0, // 0: controller.api.resources.scopes.v1.Scope.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 2, // 1: controller.api.resources.scopes.v1.Scope.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/sessions/session.pb.go b/internal/gen/controller/api/resources/sessions/session.pb.go index ddc6f14ec..cf534d221 100644 --- a/internal/gen/controller/api/resources/sessions/session.pb.go +++ b/internal/gen/controller/api/resources/sessions/session.pb.go @@ -7,6 +7,9 @@ package sessions import ( + reflect "reflect" + sync "sync" + _ "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/golang/protobuf/ptypes/wrappers" @@ -15,8 +18,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -459,14 +460,17 @@ func file_controller_api_resources_sessions_v1_session_proto_rawDescGZIP() []byt return file_controller_api_resources_sessions_v1_session_proto_rawDescData } -var file_controller_api_resources_sessions_v1_session_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_controller_api_resources_sessions_v1_session_proto_goTypes = []interface{}{ - (*WorkerInfo)(nil), // 0: controller.api.resources.sessions.v1.WorkerInfo - (*SessionState)(nil), // 1: controller.api.resources.sessions.v1.SessionState - (*Session)(nil), // 2: controller.api.resources.sessions.v1.Session - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo -} +var ( + file_controller_api_resources_sessions_v1_session_proto_msgTypes = make([]protoimpl.MessageInfo, 3) + file_controller_api_resources_sessions_v1_session_proto_goTypes = []interface{}{ + (*WorkerInfo)(nil), // 0: controller.api.resources.sessions.v1.WorkerInfo + (*SessionState)(nil), // 1: controller.api.resources.sessions.v1.SessionState + (*Session)(nil), // 2: controller.api.resources.sessions.v1.Session + (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp + (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo + } +) + var file_controller_api_resources_sessions_v1_session_proto_depIdxs = []int32{ 3, // 0: controller.api.resources.sessions.v1.SessionState.start_time:type_name -> google.protobuf.Timestamp 3, // 1: controller.api.resources.sessions.v1.SessionState.end_time:type_name -> google.protobuf.Timestamp diff --git a/internal/gen/controller/api/resources/targets/target.pb.go b/internal/gen/controller/api/resources/targets/target.pb.go index ce6265eae..16452f99b 100644 --- a/internal/gen/controller/api/resources/targets/target.pb.go +++ b/internal/gen/controller/api/resources/targets/target.pb.go @@ -7,6 +7,9 @@ package targets import ( + reflect "reflect" + sync "sync" + _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -14,8 +17,6 @@ import ( _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -786,21 +787,24 @@ func file_controller_api_resources_targets_v1_target_proto_rawDescGZIP() []byte return file_controller_api_resources_targets_v1_target_proto_rawDescData } -var file_controller_api_resources_targets_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_controller_api_resources_targets_v1_target_proto_goTypes = []interface{}{ - (*HostSet)(nil), // 0: controller.api.resources.targets.v1.HostSet - (*Target)(nil), // 1: controller.api.resources.targets.v1.Target - (*TcpTargetAttributes)(nil), // 2: controller.api.resources.targets.v1.TcpTargetAttributes - (*WorkerInfo)(nil), // 3: controller.api.resources.targets.v1.WorkerInfo - (*SessionAuthorizationData)(nil), // 4: controller.api.resources.targets.v1.SessionAuthorizationData - (*SessionAuthorization)(nil), // 5: controller.api.resources.targets.v1.SessionAuthorization - (*scopes.ScopeInfo)(nil), // 6: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 7: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value - (*wrappers.Int32Value)(nil), // 10: google.protobuf.Int32Value - (*_struct.Struct)(nil), // 11: google.protobuf.Struct -} +var ( + file_controller_api_resources_targets_v1_target_proto_msgTypes = make([]protoimpl.MessageInfo, 6) + file_controller_api_resources_targets_v1_target_proto_goTypes = []interface{}{ + (*HostSet)(nil), // 0: controller.api.resources.targets.v1.HostSet + (*Target)(nil), // 1: controller.api.resources.targets.v1.Target + (*TcpTargetAttributes)(nil), // 2: controller.api.resources.targets.v1.TcpTargetAttributes + (*WorkerInfo)(nil), // 3: controller.api.resources.targets.v1.WorkerInfo + (*SessionAuthorizationData)(nil), // 4: controller.api.resources.targets.v1.SessionAuthorizationData + (*SessionAuthorization)(nil), // 5: controller.api.resources.targets.v1.SessionAuthorization + (*scopes.ScopeInfo)(nil), // 6: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 7: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrappers.Int32Value)(nil), // 10: google.protobuf.Int32Value + (*_struct.Struct)(nil), // 11: google.protobuf.Struct + } +) + var file_controller_api_resources_targets_v1_target_proto_depIdxs = []int32{ 6, // 0: controller.api.resources.targets.v1.Target.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 7, // 1: controller.api.resources.targets.v1.Target.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/resources/users/user.pb.go b/internal/gen/controller/api/resources/users/user.pb.go index c485cfe3c..8bd3eb369 100644 --- a/internal/gen/controller/api/resources/users/user.pb.go +++ b/internal/gen/controller/api/resources/users/user.pb.go @@ -7,14 +7,15 @@ package users import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -288,14 +289,17 @@ func file_controller_api_resources_users_v1_user_proto_rawDescGZIP() []byte { return file_controller_api_resources_users_v1_user_proto_rawDescData } -var file_controller_api_resources_users_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_controller_api_resources_users_v1_user_proto_goTypes = []interface{}{ - (*Account)(nil), // 0: controller.api.resources.users.v1.Account - (*User)(nil), // 1: controller.api.resources.users.v1.User - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp -} +var ( + file_controller_api_resources_users_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_controller_api_resources_users_v1_user_proto_goTypes = []interface{}{ + (*Account)(nil), // 0: controller.api.resources.users.v1.Account + (*User)(nil), // 1: controller.api.resources.users.v1.User + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + } +) + var file_controller_api_resources_users_v1_user_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.users.v1.User.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo 3, // 1: controller.api.resources.users.v1.User.name:type_name -> google.protobuf.StringValue diff --git a/internal/gen/controller/api/services/account_service.pb.go b/internal/gen/controller/api/services/account_service.pb.go index 1e20ec5c5..fe0832ea9 100644 --- a/internal/gen/controller/api/services/account_service.pb.go +++ b/internal/gen/controller/api/services/account_service.pb.go @@ -7,6 +7,9 @@ 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" @@ -14,8 +17,6 @@ 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 ( @@ -945,25 +946,28 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/account_service.pb.gw.go b/internal/gen/controller/api/services/account_service.pb.gw.go index 6be778e3f..a739599eb 100644 --- a/internal/gen/controller/api/services/account_service.pb.gw.go +++ b/internal/gen/controller/api/services/account_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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". @@ -446,7 +430,6 @@ 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() @@ -467,7 +450,6 @@ 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) { @@ -490,7 +472,6 @@ 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) { @@ -513,7 +494,6 @@ 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) { @@ -536,7 +516,6 @@ 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) { @@ -559,7 +538,6 @@ 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) { @@ -582,7 +560,6 @@ 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) { @@ -605,7 +582,6 @@ 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 @@ -648,7 +624,6 @@ 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() @@ -666,7 +641,6 @@ 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) { @@ -686,7 +660,6 @@ 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) { @@ -706,7 +679,6 @@ 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) { @@ -726,7 +698,6 @@ 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) { @@ -746,7 +717,6 @@ 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) { @@ -766,7 +736,6 @@ 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) { @@ -786,7 +755,6 @@ 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 diff --git a/internal/gen/controller/api/services/account_service_grpc.pb.go b/internal/gen/controller/api/services/account_service_grpc.pb.go index 20c37790e..28800f7fb 100644 --- a/internal/gen/controller/api/services/account_service_grpc.pb.go +++ b/internal/gen/controller/api/services/account_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -170,27 +171,32 @@ 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") } diff --git a/internal/gen/controller/api/services/auth_method_service.pb.go b/internal/gen/controller/api/services/auth_method_service.pb.go index a6c2451c7..0e367bafb 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.go @@ -7,6 +7,9 @@ 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" @@ -15,8 +18,6 @@ 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 ( @@ -886,26 +887,29 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/auth_method_service.pb.gw.go b/internal/gen/controller/api/services/auth_method_service.pb.gw.go index 7a541376c..08d48ad6f 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.gw.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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". @@ -378,7 +364,6 @@ 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() @@ -399,7 +384,6 @@ 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) { @@ -422,7 +406,6 @@ 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) { @@ -445,7 +428,6 @@ 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) { @@ -468,7 +450,6 @@ 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) { @@ -491,7 +472,6 @@ 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) { @@ -514,7 +494,6 @@ 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 @@ -557,7 +536,6 @@ 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() @@ -575,7 +553,6 @@ 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) { @@ -595,7 +572,6 @@ 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) { @@ -615,7 +591,6 @@ 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) { @@ -635,7 +610,6 @@ 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) { @@ -655,7 +629,6 @@ 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) { @@ -675,7 +648,6 @@ 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 diff --git a/internal/gen/controller/api/services/auth_method_service_grpc.pb.go b/internal/gen/controller/api/services/auth_method_service_grpc.pb.go index 2d5021896..3fc83b253 100644 --- a/internal/gen/controller/api/services/auth_method_service_grpc.pb.go +++ b/internal/gen/controller/api/services/auth_method_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -145,24 +146,28 @@ 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") } diff --git a/internal/gen/controller/api/services/authtokens_service.pb.go b/internal/gen/controller/api/services/authtokens_service.pb.go index 0543d78f9..4919d585b 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.go @@ -7,13 +7,14 @@ 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 ( @@ -389,16 +390,19 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/authtokens_service.pb.gw.go b/internal/gen/controller/api/services/authtokens_service.pb.gw.go index 6aab7667f..5a07a140b 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.gw.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -142,7 +138,6 @@ 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) { @@ -168,7 +163,6 @@ 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". @@ -176,7 +170,6 @@ 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() @@ -197,7 +190,6 @@ 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) { @@ -220,7 +212,6 @@ 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) { @@ -243,7 +234,6 @@ func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.Ser } forward_AuthTokenService_DeleteAuthToken_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -286,7 +276,6 @@ 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() @@ -304,7 +293,6 @@ 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) { @@ -324,7 +312,6 @@ 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) { @@ -344,7 +331,6 @@ func RegisterAuthTokenServiceHandlerClient(ctx context.Context, mux *runtime.Ser } forward_AuthTokenService_DeleteAuthToken_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil diff --git a/internal/gen/controller/api/services/authtokens_service_grpc.pb.go b/internal/gen/controller/api/services/authtokens_service_grpc.pb.go index 063ea4046..8e0a468f0 100644 --- a/internal/gen/controller/api/services/authtokens_service_grpc.pb.go +++ b/internal/gen/controller/api/services/authtokens_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -86,15 +87,16 @@ 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") } diff --git a/internal/gen/controller/api/services/group_service.pb.go b/internal/gen/controller/api/services/group_service.pb.go index 5de7e0d1d..43ea0238a 100644 --- a/internal/gen/controller/api/services/group_service.pb.go +++ b/internal/gen/controller/api/services/group_service.pb.go @@ -7,6 +7,9 @@ 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" @@ -15,8 +18,6 @@ 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 ( @@ -1070,27 +1071,30 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/group_service.pb.gw.go b/internal/gen/controller/api/services/group_service.pb.gw.go index fbd1a34c2..a564440d5 100644 --- a/internal/gen/controller/api/services/group_service.pb.gw.go +++ b/internal/gen/controller/api/services/group_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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) { @@ -472,7 +456,6 @@ 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) { @@ -506,7 +489,6 @@ 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". @@ -514,7 +496,6 @@ 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() @@ -535,7 +516,6 @@ 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) { @@ -558,7 +538,6 @@ 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) { @@ -581,7 +560,6 @@ 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) { @@ -604,7 +582,6 @@ 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) { @@ -627,7 +604,6 @@ 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) { @@ -650,7 +626,6 @@ 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) { @@ -673,7 +648,6 @@ 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) { @@ -696,7 +670,6 @@ 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 @@ -739,7 +712,6 @@ 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() @@ -757,7 +729,6 @@ 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) { @@ -777,7 +748,6 @@ 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) { @@ -797,7 +767,6 @@ 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) { @@ -817,7 +786,6 @@ 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) { @@ -837,7 +805,6 @@ 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) { @@ -857,7 +824,6 @@ 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) { @@ -877,7 +843,6 @@ 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) { @@ -897,7 +862,6 @@ 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 diff --git a/internal/gen/controller/api/services/group_service_grpc.pb.go b/internal/gen/controller/api/services/group_service_grpc.pb.go index cb1f59d77..fe7b9f8d0 100644 --- a/internal/gen/controller/api/services/group_service_grpc.pb.go +++ b/internal/gen/controller/api/services/group_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -193,30 +194,36 @@ 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") } diff --git a/internal/gen/controller/api/services/host_catalog_service.pb.go b/internal/gen/controller/api/services/host_catalog_service.pb.go index 5ba0d914a..bac5f2d2e 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -665,21 +666,24 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go index e1260543d..e28afec4a 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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". @@ -310,7 +298,6 @@ 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() @@ -331,7 +318,6 @@ 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) { @@ -354,7 +340,6 @@ 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) { @@ -377,7 +362,6 @@ 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) { @@ -400,7 +384,6 @@ 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) { @@ -423,7 +406,6 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S } forward_HostCatalogService_DeleteHostCatalog_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -466,7 +448,6 @@ 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() @@ -484,7 +465,6 @@ 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) { @@ -504,7 +484,6 @@ 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) { @@ -524,7 +503,6 @@ 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) { @@ -544,7 +522,6 @@ 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) { @@ -564,7 +541,6 @@ func RegisterHostCatalogServiceHandlerClient(ctx context.Context, mux *runtime.S } forward_HostCatalogService_DeleteHostCatalog_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil diff --git a/internal/gen/controller/api/services/host_catalog_service_grpc.pb.go b/internal/gen/controller/api/services/host_catalog_service_grpc.pb.go index 626d0b2d0..e723ad403 100644 --- a/internal/gen/controller/api/services/host_catalog_service_grpc.pb.go +++ b/internal/gen/controller/api/services/host_catalog_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -132,21 +133,24 @@ 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") } diff --git a/internal/gen/controller/api/services/host_service.pb.go b/internal/gen/controller/api/services/host_service.pb.go index a60861a0b..bd93a3751 100644 --- a/internal/gen/controller/api/services/host_service.pb.go +++ b/internal/gen/controller/api/services/host_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -645,21 +646,24 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/host_service.pb.gw.go b/internal/gen/controller/api/services/host_service.pb.gw.go index 9edd94eed..1235954a5 100644 --- a/internal/gen/controller/api/services/host_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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". @@ -310,7 +298,6 @@ 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() @@ -331,7 +318,6 @@ 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) { @@ -354,7 +340,6 @@ 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) { @@ -377,7 +362,6 @@ 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) { @@ -400,7 +384,6 @@ 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) { @@ -423,7 +406,6 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux } forward_HostService_DeleteHost_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -466,7 +448,6 @@ 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() @@ -484,7 +465,6 @@ 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) { @@ -504,7 +484,6 @@ 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) { @@ -524,7 +503,6 @@ 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) { @@ -544,7 +522,6 @@ 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) { @@ -564,7 +541,6 @@ func RegisterHostServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux } forward_HostService_DeleteHost_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil diff --git a/internal/gen/controller/api/services/host_service_grpc.pb.go b/internal/gen/controller/api/services/host_service_grpc.pb.go index b0aaecdb1..9a9c27e86 100644 --- a/internal/gen/controller/api/services/host_service_grpc.pb.go +++ b/internal/gen/controller/api/services/host_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -136,21 +137,24 @@ 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") } diff --git a/internal/gen/controller/api/services/host_set_service.pb.go b/internal/gen/controller/api/services/host_set_service.pb.go index e2404938d..90fc0037e 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.go +++ b/internal/gen/controller/api/services/host_set_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -1070,27 +1071,30 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/host_set_service.pb.gw.go b/internal/gen/controller/api/services/host_set_service.pb.gw.go index 8fe09fb4a..258d60e16 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_set_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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) { @@ -472,7 +456,6 @@ 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) { @@ -506,7 +489,6 @@ 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". @@ -514,7 +496,6 @@ 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() @@ -535,7 +516,6 @@ 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) { @@ -558,7 +538,6 @@ 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) { @@ -581,7 +560,6 @@ 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) { @@ -604,7 +582,6 @@ 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) { @@ -627,7 +604,6 @@ 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) { @@ -650,7 +626,6 @@ 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) { @@ -673,7 +648,6 @@ 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) { @@ -696,7 +670,6 @@ 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 @@ -739,7 +712,6 @@ 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() @@ -757,7 +729,6 @@ 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) { @@ -777,7 +748,6 @@ 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) { @@ -797,7 +767,6 @@ 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) { @@ -817,7 +786,6 @@ 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) { @@ -837,7 +805,6 @@ 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) { @@ -857,7 +824,6 @@ 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) { @@ -877,7 +843,6 @@ 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) { @@ -897,7 +862,6 @@ 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 diff --git a/internal/gen/controller/api/services/host_set_service_grpc.pb.go b/internal/gen/controller/api/services/host_set_service_grpc.pb.go index ce1fe8613..a53fab0a5 100644 --- a/internal/gen/controller/api/services/host_set_service_grpc.pb.go +++ b/internal/gen/controller/api/services/host_set_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -203,30 +204,36 @@ 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") } diff --git a/internal/gen/controller/api/services/role_service.pb.go b/internal/gen/controller/api/services/role_service.pb.go index 6d09f0470..37ffa4c31 100644 --- a/internal/gen/controller/api/services/role_service.pb.go +++ b/internal/gen/controller/api/services/role_service.pb.go @@ -7,6 +7,9 @@ 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" @@ -14,8 +17,6 @@ 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 ( @@ -1478,33 +1479,36 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/role_service.pb.gw.go b/internal/gen/controller/api/services/role_service.pb.gw.go index 14da88c58..25c6a93e0 100644 --- a/internal/gen/controller/api/services/role_service.pb.gw.go +++ b/internal/gen/controller/api/services/role_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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) { @@ -472,7 +456,6 @@ 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) { @@ -506,7 +489,6 @@ 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) { @@ -540,7 +522,6 @@ 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) { @@ -574,7 +555,6 @@ 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) { @@ -608,7 +588,6 @@ 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) { @@ -642,7 +621,6 @@ 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) { @@ -676,7 +654,6 @@ 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) { @@ -710,7 +687,6 @@ 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". @@ -718,7 +694,6 @@ 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() @@ -739,7 +714,6 @@ 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) { @@ -762,7 +736,6 @@ 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) { @@ -785,7 +758,6 @@ 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) { @@ -808,7 +780,6 @@ 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) { @@ -831,7 +802,6 @@ 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) { @@ -854,7 +824,6 @@ 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) { @@ -877,7 +846,6 @@ 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) { @@ -900,7 +868,6 @@ 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) { @@ -923,7 +890,6 @@ 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) { @@ -946,7 +912,6 @@ 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) { @@ -969,7 +934,6 @@ 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 @@ -1012,7 +976,6 @@ 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() @@ -1030,7 +993,6 @@ 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) { @@ -1050,7 +1012,6 @@ 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) { @@ -1070,7 +1031,6 @@ 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) { @@ -1090,7 +1050,6 @@ 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) { @@ -1110,7 +1069,6 @@ 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) { @@ -1130,7 +1088,6 @@ 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) { @@ -1150,7 +1107,6 @@ 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) { @@ -1170,7 +1126,6 @@ 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) { @@ -1190,7 +1145,6 @@ 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) { @@ -1210,7 +1164,6 @@ 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) { @@ -1230,7 +1183,6 @@ 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 diff --git a/internal/gen/controller/api/services/role_service_grpc.pb.go b/internal/gen/controller/api/services/role_service_grpc.pb.go index e03fedf77..a55e13bc8 100644 --- a/internal/gen/controller/api/services/role_service_grpc.pb.go +++ b/internal/gen/controller/api/services/role_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -256,39 +257,48 @@ 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") } diff --git a/internal/gen/controller/api/services/scope_service.pb.go b/internal/gen/controller/api/services/scope_service.pb.go index fe98da67d..493f4b10c 100644 --- a/internal/gen/controller/api/services/scope_service.pb.go +++ b/internal/gen/controller/api/services/scope_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -674,21 +675,24 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/scope_service.pb.gw.go b/internal/gen/controller/api/services/scope_service.pb.gw.go index 55f05535c..e7961f737 100644 --- a/internal/gen/controller/api/services/scope_service.pb.gw.go +++ b/internal/gen/controller/api/services/scope_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,12 +113,9 @@ 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 @@ -144,7 +138,6 @@ 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) { @@ -168,12 +161,9 @@ 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 @@ -220,7 +210,6 @@ 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) { @@ -268,7 +257,6 @@ 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) { @@ -294,7 +282,6 @@ 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) { @@ -320,7 +307,6 @@ 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". @@ -328,7 +314,6 @@ 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() @@ -349,7 +334,6 @@ 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) { @@ -372,7 +356,6 @@ 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) { @@ -395,7 +378,6 @@ 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) { @@ -418,7 +400,6 @@ 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) { @@ -441,7 +422,6 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu } forward_ScopeService_DeleteScope_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -484,7 +464,6 @@ 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() @@ -502,7 +481,6 @@ 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) { @@ -522,7 +500,6 @@ 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) { @@ -542,7 +519,6 @@ 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) { @@ -562,7 +538,6 @@ 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) { @@ -582,7 +557,6 @@ func RegisterScopeServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu } forward_ScopeService_DeleteScope_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil diff --git a/internal/gen/controller/api/services/scope_service_grpc.pb.go b/internal/gen/controller/api/services/scope_service_grpc.pb.go index 4db429aed..e4db78ff2 100644 --- a/internal/gen/controller/api/services/scope_service_grpc.pb.go +++ b/internal/gen/controller/api/services/scope_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -132,21 +133,24 @@ 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") } diff --git a/internal/gen/controller/api/services/session_service.pb.go b/internal/gen/controller/api/services/session_service.pb.go index 862221fbf..f8ad67e74 100644 --- a/internal/gen/controller/api/services/session_service.pb.go +++ b/internal/gen/controller/api/services/session_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -412,16 +413,19 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/session_service.pb.gw.go b/internal/gen/controller/api/services/session_service.pb.gw.go index 256c211cc..bd3083375 100644 --- a/internal/gen/controller/api/services/session_service.pb.gw.go +++ b/internal/gen/controller/api/services/session_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -150,7 +146,6 @@ 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) { @@ -184,7 +179,6 @@ 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". @@ -192,7 +186,6 @@ 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() @@ -213,7 +206,6 @@ 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) { @@ -236,7 +228,6 @@ 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) { @@ -259,7 +250,6 @@ 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 @@ -302,7 +292,6 @@ 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() @@ -320,7 +309,6 @@ 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) { @@ -340,7 +328,6 @@ 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) { @@ -360,7 +347,6 @@ 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 diff --git a/internal/gen/controller/api/services/session_service_grpc.pb.go b/internal/gen/controller/api/services/session_service_grpc.pb.go index f0cc6e1fe..16bce897d 100644 --- a/internal/gen/controller/api/services/session_service_grpc.pb.go +++ b/internal/gen/controller/api/services/session_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -90,15 +91,16 @@ 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") } diff --git a/internal/gen/controller/api/services/target_service.pb.go b/internal/gen/controller/api/services/target_service.pb.go index 0c133d620..72f93ad01 100644 --- a/internal/gen/controller/api/services/target_service.pb.go +++ b/internal/gen/controller/api/services/target_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -1225,30 +1226,33 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/target_service.pb.gw.go b/internal/gen/controller/api/services/target_service.pb.gw.go index ac183a727..033ef9fb2 100644 --- a/internal/gen/controller/api/services/target_service.pb.gw.go +++ b/internal/gen/controller/api/services/target_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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) { @@ -472,7 +456,6 @@ 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) { @@ -506,7 +489,6 @@ 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) { @@ -540,7 +522,6 @@ 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) { @@ -574,7 +555,6 @@ 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". @@ -582,7 +562,6 @@ 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() @@ -603,7 +582,6 @@ 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) { @@ -626,7 +604,6 @@ 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) { @@ -649,7 +626,6 @@ 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) { @@ -672,7 +648,6 @@ 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) { @@ -695,7 +670,6 @@ 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) { @@ -718,7 +692,6 @@ 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) { @@ -741,7 +714,6 @@ 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) { @@ -764,7 +736,6 @@ 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) { @@ -787,7 +758,6 @@ 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 @@ -830,7 +800,6 @@ 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() @@ -848,7 +817,6 @@ 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) { @@ -868,7 +836,6 @@ 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) { @@ -888,7 +855,6 @@ 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) { @@ -908,7 +874,6 @@ 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) { @@ -928,7 +893,6 @@ 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) { @@ -948,7 +912,6 @@ 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) { @@ -968,7 +931,6 @@ 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) { @@ -988,7 +950,6 @@ 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) { @@ -1008,7 +969,6 @@ 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 diff --git a/internal/gen/controller/api/services/target_service_grpc.pb.go b/internal/gen/controller/api/services/target_service_grpc.pb.go index a987d0f5a..378a7624a 100644 --- a/internal/gen/controller/api/services/target_service_grpc.pb.go +++ b/internal/gen/controller/api/services/target_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -222,33 +223,40 @@ 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") } diff --git a/internal/gen/controller/api/services/user_service.pb.go b/internal/gen/controller/api/services/user_service.pb.go index f1849acb9..46df9b575 100644 --- a/internal/gen/controller/api/services/user_service.pb.go +++ b/internal/gen/controller/api/services/user_service.pb.go @@ -7,14 +7,15 @@ 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 ( @@ -1061,27 +1062,30 @@ 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) -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_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_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 diff --git a/internal/gen/controller/api/services/user_service.pb.gw.go b/internal/gen/controller/api/services/user_service.pb.gw.go index aa88a2f24..d105cd4ad 100644 --- a/internal/gen/controller/api/services/user_service.pb.gw.go +++ b/internal/gen/controller/api/services/user_service.pb.gw.go @@ -24,12 +24,14 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = 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 @@ -54,7 +56,6 @@ 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) { @@ -80,12 +81,9 @@ 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 @@ -100,7 +98,6 @@ 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) { @@ -116,7 +113,6 @@ 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) { @@ -133,7 +129,6 @@ 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) { @@ -150,12 +145,9 @@ 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 @@ -202,7 +194,6 @@ 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) { @@ -250,7 +241,6 @@ 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) { @@ -276,7 +266,6 @@ 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) { @@ -302,7 +291,6 @@ 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) { @@ -336,7 +324,6 @@ 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) { @@ -370,7 +357,6 @@ 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) { @@ -404,7 +390,6 @@ 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) { @@ -438,7 +423,6 @@ 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) { @@ -472,7 +456,6 @@ 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) { @@ -506,7 +489,6 @@ 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". @@ -514,7 +496,6 @@ 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() @@ -535,7 +516,6 @@ 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) { @@ -558,7 +538,6 @@ 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) { @@ -581,7 +560,6 @@ 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) { @@ -604,7 +582,6 @@ 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) { @@ -627,7 +604,6 @@ 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) { @@ -650,7 +626,6 @@ 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) { @@ -673,7 +648,6 @@ 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) { @@ -696,7 +670,6 @@ 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 @@ -739,7 +712,6 @@ 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() @@ -757,7 +729,6 @@ 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) { @@ -777,7 +748,6 @@ 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) { @@ -797,7 +767,6 @@ 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) { @@ -817,7 +786,6 @@ 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) { @@ -837,7 +805,6 @@ 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) { @@ -857,7 +824,6 @@ 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) { @@ -877,7 +843,6 @@ 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) { @@ -897,7 +862,6 @@ 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 diff --git a/internal/gen/controller/api/services/user_service_grpc.pb.go b/internal/gen/controller/api/services/user_service_grpc.pb.go index d48adbe45..535685ef6 100644 --- a/internal/gen/controller/api/services/user_service_grpc.pb.go +++ b/internal/gen/controller/api/services/user_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -203,30 +204,36 @@ 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") } diff --git a/internal/gen/controller/protooptions/options.pb.go b/internal/gen/controller/protooptions/options.pb.go index 0e0048e7c..85c8448a6 100644 --- a/internal/gen/controller/protooptions/options.pb.go +++ b/internal/gen/controller/protooptions/options.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -156,11 +157,14 @@ 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) -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_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_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 diff --git a/internal/gen/controller/protooptions/testing.pb.go b/internal/gen/controller/protooptions/testing.pb.go index bb19711f6..e954c0b9b 100644 --- a/internal/gen/controller/protooptions/testing.pb.go +++ b/internal/gen/controller/protooptions/testing.pb.go @@ -7,10 +7,11 @@ package protooptions import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -614,16 +615,19 @@ 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) -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_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_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/internal/gen/controller/servers/services/server_coordination_service.pb.go b/internal/gen/controller/servers/services/server_coordination_service.pb.go index 0424c5f70..b18a42b6e 100644 --- a/internal/gen/controller/servers/services/server_coordination_service.pb.go +++ b/internal/gen/controller/servers/services/server_coordination_service.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -772,22 +773,25 @@ 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) -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_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_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 diff --git a/internal/gen/controller/servers/services/server_coordination_service_grpc.pb.go b/internal/gen/controller/servers/services/server_coordination_service_grpc.pb.go index 83b10c34f..814c38236 100644 --- a/internal/gen/controller/servers/services/server_coordination_service_grpc.pb.go +++ b/internal/gen/controller/servers/services/server_coordination_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -52,12 +53,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() { } diff --git a/internal/gen/controller/servers/services/session_service.pb.go b/internal/gen/controller/servers/services/session_service.pb.go index 27caab49a..d9ce5d73b 100644 --- a/internal/gen/controller/servers/services/session_service.pb.go +++ b/internal/gen/controller/servers/services/session_service.pb.go @@ -7,13 +7,14 @@ 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 ( @@ -1124,27 +1125,30 @@ 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) -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_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_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 diff --git a/internal/gen/controller/servers/services/session_service_grpc.pb.go b/internal/gen/controller/servers/services/session_service_grpc.pb.go index a4db70aa2..4662b8eb3 100644 --- a/internal/gen/controller/servers/services/session_service_grpc.pb.go +++ b/internal/gen/controller/servers/services/session_service_grpc.pb.go @@ -4,6 +4,7 @@ package services import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -115,24 +116,28 @@ 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") } diff --git a/internal/gen/controller/tokens/tokens.pb.go b/internal/gen/controller/tokens/tokens.pb.go index df746eb6d..fd5a7cf0e 100644 --- a/internal/gen/controller/tokens/tokens.pb.go +++ b/internal/gen/controller/tokens/tokens.pb.go @@ -7,10 +7,11 @@ package tokens import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -105,10 +106,13 @@ 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) -var 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) + 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 diff --git a/internal/host/static/host_catalog_test.go b/internal/host/static/host_catalog_test.go index f3bbc62bf..f44992bd8 100644 --- a/internal/host/static/host_catalog_test.go +++ b/internal/host/static/host_catalog_test.go @@ -23,7 +23,7 @@ func TestHostCatalog_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *HostCatalog diff --git a/internal/host/static/host_set_member_test.go b/internal/host/static/host_set_member_test.go index 2fd203b9c..2eb6ad98c 100644 --- a/internal/host/static/host_set_member_test.go +++ b/internal/host/static/host_set_member_test.go @@ -25,7 +25,7 @@ func TestHostSetMember_Insert(t *testing.T) { greenCat := cats[1] greenSets := TestSets(t, conn, greenCat.GetPublicId(), 1) - var tests = []struct { + tests := []struct { name string set *HostSet host *Host diff --git a/internal/host/static/host_set_test.go b/internal/host/static/host_set_test.go index 05b7c84c8..e0c746805 100644 --- a/internal/host/static/host_set_test.go +++ b/internal/host/static/host_set_test.go @@ -23,7 +23,7 @@ func TestHostSet_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *HostSet diff --git a/internal/host/static/host_test.go b/internal/host/static/host_test.go index b4788c018..c3a437382 100644 --- a/internal/host/static/host_test.go +++ b/internal/host/static/host_test.go @@ -23,7 +23,7 @@ func TestHost_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *Host diff --git a/internal/host/static/immutable_fields_test.go b/internal/host/static/immutable_fields_test.go index ddbe2cc89..d5b593417 100644 --- a/internal/host/static/immutable_fields_test.go +++ b/internal/host/static/immutable_fields_test.go @@ -23,7 +23,7 @@ func TestHostCatalog_ImmutableFields(t *testing.T) { o, prj := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) new := testCatalog(t, conn, prj.PublicId) - var tests = []struct { + tests := []struct { name string update *HostCatalog fieldMask []string @@ -73,7 +73,6 @@ func TestHostCatalog_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } @@ -91,7 +90,7 @@ func TestStaticHost_ImmutableFields(t *testing.T) { new := hosts[0] - var tests = []struct { + tests := []struct { name string update *Host fieldMask []string @@ -141,7 +140,6 @@ func TestStaticHost_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } @@ -166,7 +164,7 @@ func TestStaticHostSet_ImmutableFields(t *testing.T) { new := sets[0] - var tests = []struct { + tests := []struct { name string update *HostSet fieldMask []string @@ -216,7 +214,6 @@ func TestStaticHostSet_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } @@ -244,7 +241,7 @@ func TestStaticHostSetMember_ImmutableFields(t *testing.T) { err = w.Create(context.Background(), new) assert.NoError(t, err) - var tests = []struct { + tests := []struct { name string update *HostSetMember fieldMask []string @@ -285,7 +282,6 @@ func TestStaticHostSetMember_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } diff --git a/internal/host/static/repository_host_catalog_test.go b/internal/host/static/repository_host_catalog_test.go index 526d74611..5b0d223f4 100644 --- a/internal/host/static/repository_host_catalog_test.go +++ b/internal/host/static/repository_host_catalog_test.go @@ -20,7 +20,7 @@ func TestRepository_CreateCatalog(t *testing.T) { rw := db.New(conn) wrapper := db.TestWrapper(t) - var tests = []struct { + tests := []struct { name string in *HostCatalog opts []Option @@ -229,7 +229,7 @@ func TestRepository_UpdateCatalog(t *testing.T) { } } - var tests = []struct { + tests := []struct { name string orig *HostCatalog chgFn func(*HostCatalog) *HostCatalog @@ -575,7 +575,7 @@ func TestRepository_LookupCatalog(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, badId) - var tests = []struct { + tests := []struct { name string id string want *HostCatalog @@ -637,7 +637,7 @@ func TestRepository_DeleteCatalog(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, badId) - var tests = []struct { + tests := []struct { name string id string want int diff --git a/internal/host/static/repository_host_set.go b/internal/host/static/repository_host_set.go index 5688f70ee..6dab30a78 100644 --- a/internal/host/static/repository_host_set.go +++ b/internal/host/static/repository_host_set.go @@ -216,7 +216,6 @@ func (r *Repository) LookupSet(ctx context.Context, publicId string, opt ...Opti } return nil }) - if err != nil { return nil, nil, errors.Wrap(err, op, errors.WithMsg(fmt.Sprintf("in %s", s.PublicId))) } diff --git a/internal/host/static/repository_host_set_member_test.go b/internal/host/static/repository_host_set_member_test.go index 774334395..03e15d8f5 100644 --- a/internal/host/static/repository_host_set_member_test.go +++ b/internal/host/static/repository_host_set_member_test.go @@ -413,7 +413,7 @@ func TestRepository_SetSetMembers_Parameters(t *testing.T) { // hostsA has the first 3 hosts, hostsB has the last 3 hosts // the middle host is shared in both. hostsA, hostsB := hosts[:3], hosts[2:] - //hostsA is the initial set of hosts in the host set + // hostsA is the initial set of hosts in the host set TestSetMembers(t, conn, set.PublicId, hostsA) var hostIds []string diff --git a/internal/host/static/repository_host_set_test.go b/internal/host/static/repository_host_set_test.go index b29b4bc97..7e4d3a984 100644 --- a/internal/host/static/repository_host_set_test.go +++ b/internal/host/static/repository_host_set_test.go @@ -28,7 +28,7 @@ func TestRepository_CreateSet(t *testing.T) { _, prj := iam.TestScopes(t, iamRepo) catalog := TestCatalogs(t, conn, prj.PublicId, 1)[0] - var tests = []struct { + tests := []struct { name string in *HostSet opts []Option @@ -257,7 +257,7 @@ func TestRepository_UpdateSet(t *testing.T) { } } - var tests = []struct { + tests := []struct { name string orig *HostSet chgFn func(*HostSet) *HostSet @@ -638,7 +638,7 @@ func TestRepository_UpdateSet_Limits(t *testing.T) { hosts := TestHosts(t, conn, catalog.PublicId, count) TestSetMembers(t, conn, hostSet.PublicId, hosts) - var tests = []struct { + tests := []struct { name string repoOpts []Option updateOpts []Option @@ -719,7 +719,7 @@ func TestRepository_LookupSet(t *testing.T) { hostSetId, err := newHostSetId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want *HostSet @@ -787,7 +787,7 @@ func TestRepository_LookupSet_Limits(t *testing.T) { hosts := TestHosts(t, conn, catalog.PublicId, count) TestSetMembers(t, conn, hostSet.PublicId, hosts) - var tests = []struct { + tests := []struct { name string repoOpts []Option lookupOpts []Option @@ -859,7 +859,7 @@ func TestRepository_ListSets(t *testing.T) { hostSets := TestSets(t, conn, catalogA.PublicId, 3) - var tests = []struct { + tests := []struct { name string in string opts []Option @@ -917,7 +917,7 @@ func TestRepository_ListSets_Limits(t *testing.T) { count := 10 hostSets := TestSets(t, conn, catalog.PublicId, count) - var tests = []struct { + tests := []struct { name string repoOpts []Option listOpts []Option @@ -988,7 +988,7 @@ func TestRepository_DeleteSet(t *testing.T) { newHostSetId, err := newHostSetId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want int diff --git a/internal/host/static/repository_host_test.go b/internal/host/static/repository_host_test.go index d7a0a5cf9..097f86687 100644 --- a/internal/host/static/repository_host_test.go +++ b/internal/host/static/repository_host_test.go @@ -28,7 +28,7 @@ func TestRepository_CreateHost(t *testing.T) { _, prj := iam.TestScopes(t, iamRepo) catalog := TestCatalogs(t, conn, prj.PublicId, 1)[0] - var tests = []struct { + tests := []struct { name string in *Host opts []Option @@ -313,7 +313,7 @@ func TestRepository_UpdateHost(t *testing.T) { } } - var tests = []struct { + tests := []struct { name string orig *Host chgFn func(*Host) *Host @@ -755,7 +755,7 @@ func TestRepository_LookupHost(t *testing.T) { hostId, err := newHostId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want *Host @@ -808,7 +808,7 @@ func TestRepository_ListHosts(t *testing.T) { hosts := TestHosts(t, conn, catalogA.PublicId, 3) - var tests = []struct { + tests := []struct { name string in string opts []Option @@ -866,7 +866,7 @@ func TestRepository_ListHosts_Limits(t *testing.T) { count := 10 hosts := TestHosts(t, conn, catalog.PublicId, count) - var tests = []struct { + tests := []struct { name string repoOpts []Option listOpts []Option @@ -937,7 +937,7 @@ func TestRepository_DeleteHost(t *testing.T) { newHostId, err := newHostId() require.NoError(t, err) - var tests = []struct { + tests := []struct { name string in string want int diff --git a/internal/host/static/repository_test.go b/internal/host/static/repository_test.go index f0018c5c0..03b46e289 100644 --- a/internal/host/static/repository_test.go +++ b/internal/host/static/repository_test.go @@ -24,7 +24,7 @@ func TestRepository_New(t *testing.T) { opts []Option } - var tests = []struct { + tests := []struct { name string args args want *Repository diff --git a/internal/host/static/store/static.pb.go b/internal/host/static/store/static.pb.go index 1e259194c..310e20fb5 100644 --- a/internal/host/static/store/static.pb.go +++ b/internal/host/static/store/static.pb.go @@ -10,12 +10,13 @@ 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 ( @@ -543,14 +544,17 @@ 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) -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_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_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 diff --git a/internal/host/store/host.pb.go b/internal/host/store/host.pb.go index 2c1fe9864..bb96c9642 100644 --- a/internal/host/store/host.pb.go +++ b/internal/host/store/host.pb.go @@ -9,12 +9,13 @@ 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 ( @@ -246,12 +247,15 @@ 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) -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_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_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/internal/iam/account.go b/internal/iam/account.go index aef09a203..742a2138d 100644 --- a/internal/iam/account.go +++ b/internal/iam/account.go @@ -22,9 +22,11 @@ type authAccount struct { tableName string `gorm:"-"` } -var _ Cloneable = (*authAccount)(nil) -var _ db.VetForWriter = (*authAccount)(nil) -var _ oplog.ReplayableMessage = (*authAccount)(nil) +var ( + _ Cloneable = (*authAccount)(nil) + _ db.VetForWriter = (*authAccount)(nil) + _ oplog.ReplayableMessage = (*authAccount)(nil) +) func allocAccount() authAccount { return authAccount{ diff --git a/internal/iam/group.go b/internal/iam/group.go index 7e8b7f753..b445582c6 100644 --- a/internal/iam/group.go +++ b/internal/iam/group.go @@ -23,9 +23,11 @@ type Group struct { } // ensure that Group implements the interfaces of: Resource, Cloneable, and db.VetForWriter. -var _ Resource = (*Group)(nil) -var _ Cloneable = (*Group)(nil) -var _ db.VetForWriter = (*Group)(nil) +var ( + _ Resource = (*Group)(nil) + _ Cloneable = (*Group)(nil) + _ db.VetForWriter = (*Group)(nil) +) // NewGroup creates a new in memory group with a scope (project/org) // and allowed options include: withDescripion, WithName. diff --git a/internal/iam/group_member.go b/internal/iam/group_member.go index 72e5491cc..6c88ef114 100644 --- a/internal/iam/group_member.go +++ b/internal/iam/group_member.go @@ -63,8 +63,10 @@ type GroupMemberUser struct { } // ensure that GroupMember implements the interfaces of: Cloneable, db.VetForWriter -var _ Cloneable = (*GroupMemberUser)(nil) -var _ db.VetForWriter = (*GroupMemberUser)(nil) +var ( + _ Cloneable = (*GroupMemberUser)(nil) + _ db.VetForWriter = (*GroupMemberUser)(nil) +) // NewGroupMemberUser creates a new in memory user member of the group. No // options are currently supported. diff --git a/internal/iam/immutable_fields_test.go b/internal/iam/immutable_fields_test.go index 12b93ef9c..2284ae3e3 100644 --- a/internal/iam/immutable_fields_test.go +++ b/internal/iam/immutable_fields_test.go @@ -23,7 +23,7 @@ func TestScope_ImmutableFields(t *testing.T) { ts := timestamp.Timestamp{Timestamp: ×tamppb.Timestamp{Seconds: 0, Nanos: 0}} new, _ := TestScopes(t, repo) - var tests = []struct { + tests := []struct { name string update *Scope fieldMask []string @@ -82,7 +82,6 @@ func TestScope_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*Scope), after.(*Scope))) - }) } } @@ -100,7 +99,7 @@ func TestConcreteScope_ImmutableFields(t *testing.T) { org, proj := TestScopes(t, repo) - var tests = []struct { + tests := []struct { name string scopeId string updateTo string @@ -155,7 +154,7 @@ func TestUser_ImmutableFields(t *testing.T) { org, proj := TestScopes(t, repo) new := TestUser(t, repo, org.PublicId) - var tests = []struct { + tests := []struct { name string update *User fieldMask []string @@ -205,7 +204,6 @@ func TestUser_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*User), after.(*User))) - }) } } @@ -222,7 +220,7 @@ func TestRole_ImmutableFields(t *testing.T) { org, proj := TestScopes(t, repo) new := TestRole(t, conn, org.PublicId) - var tests = []struct { + tests := []struct { name string update *Role fieldMask []string @@ -272,7 +270,6 @@ func TestRole_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*Role), after.(*Role))) - }) } } @@ -289,7 +286,7 @@ func TestGroup_ImmutableFields(t *testing.T) { org, proj := TestScopes(t, repo) new := TestGroup(t, conn, org.PublicId) - var tests = []struct { + tests := []struct { name string update *Group fieldMask []string @@ -339,7 +336,6 @@ func TestGroup_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*Group), after.(*Group))) - }) } } diff --git a/internal/iam/principal_role.go b/internal/iam/principal_role.go index 1b033537a..ce0f01968 100644 --- a/internal/iam/principal_role.go +++ b/internal/iam/principal_role.go @@ -67,8 +67,10 @@ type UserRole struct { // ensure that UserRole implements the interfaces of: Cloneable and // db.VetForWriter -var _ Cloneable = (*UserRole)(nil) -var _ db.VetForWriter = (*UserRole)(nil) +var ( + _ Cloneable = (*UserRole)(nil) + _ db.VetForWriter = (*UserRole)(nil) +) // NewUserRole creates a new user role in memory. No options are supported // currently. @@ -142,8 +144,10 @@ type GroupRole struct { // ensure that GroupRole implements the interfaces of: Cloneable and // db.VetForWriter -var _ Cloneable = (*GroupRole)(nil) -var _ db.VetForWriter = (*GroupRole)(nil) +var ( + _ Cloneable = (*GroupRole)(nil) + _ db.VetForWriter = (*GroupRole)(nil) +) // NewGroupRole creates a new group role in memory. No options are supported // currently. diff --git a/internal/iam/repository.go b/internal/iam/repository.go index ea9c3924d..d65abbf7b 100644 --- a/internal/iam/repository.go +++ b/internal/iam/repository.go @@ -12,9 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/types/scope" ) -var ( - ErrMetadataScopeNotFound = errors.New(errors.RecordNotFound, "iam", "scope not found for metadata") -) +var ErrMetadataScopeNotFound = errors.New(errors.RecordNotFound, "iam", "scope not found for metadata") // Repository is the iam database repository type Repository struct { diff --git a/internal/iam/repository_group_test.go b/internal/iam/repository_group_test.go index a26127343..3f55214ff 100644 --- a/internal/iam/repository_group_test.go +++ b/internal/iam/repository_group_test.go @@ -730,7 +730,6 @@ func TestRepository_ListMembers(t *testing.T) { require.Error(err) require.Nil(got) require.Truef(errors.Match(errors.T(errors.InvalidParameter), err), "unexpected error %s", err.Error()) - }) } @@ -855,7 +854,6 @@ func TestRepository_AddGroupMembers(t *testing.T) { assert.NotEmpty(gotMembers[m.MemberId]) assert.Equal(gotMembers[m.MemberId].GetGroupId(), m.GroupId) } - }) } } diff --git a/internal/iam/repository_scope_test.go b/internal/iam/repository_scope_test.go index 490f0daa5..1fb4cb157 100644 --- a/internal/iam/repository_scope_test.go +++ b/internal/iam/repository_scope_test.go @@ -160,7 +160,7 @@ func Test_Repository_Scope_Update(t *testing.T) { require.NotNil(s) assert.Equal("foo"+id, s.GetName()) // TODO: This isn't empty because of ICU-490 -- when that is resolved, fix this - //assert.Empty(s.GetDescription()) + // assert.Empty(s.GetDescription()) foundScope, err = repo.LookupScope(context.Background(), s.PublicId) require.NoError(err) @@ -248,7 +248,6 @@ func Test_Repository_Scope_Delete(t *testing.T) { foundScope, err = repo.LookupScope(context.Background(), s.PublicId) require.NoError(err) assert.Nil(foundScope) - }) t.Run("valid-with-bad-id", func(t *testing.T) { assert, require := assert.New(t), require.New(t) diff --git a/internal/iam/repository_test.go b/internal/iam/repository_test.go index 4696735d6..d8d33b7e1 100644 --- a/internal/iam/repository_test.go +++ b/internal/iam/repository_test.go @@ -100,6 +100,7 @@ func TestNewRepository(t *testing.T) { }) } } + func Test_Repository_create(t *testing.T) { t.Parallel() conn, _ := db.TestSetup(t, "postgres") diff --git a/internal/iam/role.go b/internal/iam/role.go index 32fc12b54..67559d19c 100644 --- a/internal/iam/role.go +++ b/internal/iam/role.go @@ -23,9 +23,11 @@ type Role struct { } // ensure that Role implements the interfaces of: Resource, Cloneable, and db.VetForWriter. -var _ Resource = (*Role)(nil) -var _ Cloneable = (*Role)(nil) -var _ db.VetForWriter = (*Role)(nil) +var ( + _ Resource = (*Role)(nil) + _ Cloneable = (*Role)(nil) + _ db.VetForWriter = (*Role)(nil) +) // NewRole creates a new in memory role with a scope (project/org) // allowed options include: withDescripion, WithName, withGrantScopeId. diff --git a/internal/iam/role_grant.go b/internal/iam/role_grant.go index 33f325bfd..012555db4 100644 --- a/internal/iam/role_grant.go +++ b/internal/iam/role_grant.go @@ -19,8 +19,10 @@ type RoleGrant struct { } // ensure that RoleGrant implements the interfaces of: Cloneable and db.VetForWriter -var _ Cloneable = (*RoleGrant)(nil) -var _ db.VetForWriter = (*RoleGrant)(nil) +var ( + _ Cloneable = (*RoleGrant)(nil) + _ db.VetForWriter = (*RoleGrant)(nil) +) // NewRoleGrant creates a new in memory role grant func NewRoleGrant(roleId string, grant string, _ ...Option) (*RoleGrant, error) { diff --git a/internal/iam/scope.go b/internal/iam/scope.go index 839ecddc2..6843d3329 100644 --- a/internal/iam/scope.go +++ b/internal/iam/scope.go @@ -28,9 +28,11 @@ type Scope struct { } // ensure that Scope implements the interfaces of: Resource, Cloneable, and db.VetForWriter -var _ Resource = (*Scope)(nil) -var _ db.VetForWriter = (*Scope)(nil) -var _ Cloneable = (*Scope)(nil) +var ( + _ Resource = (*Scope)(nil) + _ db.VetForWriter = (*Scope)(nil) + _ Cloneable = (*Scope)(nil) +) func NewOrg(opt ...Option) (*Scope, error) { global := allocScope() diff --git a/internal/iam/scope_test.go b/internal/iam/scope_test.go index a49dd7a0e..75a37bb47 100644 --- a/internal/iam/scope_test.go +++ b/internal/iam/scope_test.go @@ -52,6 +52,7 @@ func TestScope_New(t *testing.T) { assert.Contains(err.Error(), "iam.NewProject: iam.newScope: child scope is missing its parent: parameter violation: error #100") }) } + func TestScope_Create(t *testing.T) { t.Parallel() conn, _ := db.TestSetup(t, "postgres") @@ -120,6 +121,7 @@ func TestScope_Update(t *testing.T) { assert.Equal(0, updatedRows) }) } + func TestScope_GetScope(t *testing.T) { t.Parallel() conn, _ := db.TestSetup(t, "postgres") diff --git a/internal/iam/store/group.pb.go b/internal/iam/store/group.pb.go index c9fb1127f..1bceaf318 100644 --- a/internal/iam/store/group.pb.go +++ b/internal/iam/store/group.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -190,11 +191,14 @@ 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) -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_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_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 diff --git a/internal/iam/store/group_member.pb.go b/internal/iam/store/group_member.pb.go index c9c61217e..b943e4995 100644 --- a/internal/iam/store/group_member.pb.go +++ b/internal/iam/store/group_member.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -259,12 +260,15 @@ 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) -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_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_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 diff --git a/internal/iam/store/principal_role.pb.go b/internal/iam/store/principal_role.pb.go index d535036f7..a5bf00a32 100644 --- a/internal/iam/store/principal_role.pb.go +++ b/internal/iam/store/principal_role.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -337,13 +338,16 @@ 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) -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_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_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 diff --git a/internal/iam/store/role.pb.go b/internal/iam/store/role.pb.go index ad4749033..4f4e673ba 100644 --- a/internal/iam/store/role.pb.go +++ b/internal/iam/store/role.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -205,11 +206,14 @@ 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) -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_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_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 diff --git a/internal/iam/store/role_grant.pb.go b/internal/iam/store/role_grant.pb.go index 7a92f22be..bd2f8eac4 100644 --- a/internal/iam/store/role_grant.pb.go +++ b/internal/iam/store/role_grant.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -145,11 +146,14 @@ 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) -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_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_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 diff --git a/internal/iam/store/scope.pb.go b/internal/iam/store/scope.pb.go index d91ce7854..adda1283f 100644 --- a/internal/iam/store/scope.pb.go +++ b/internal/iam/store/scope.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -197,11 +198,14 @@ 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) -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_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_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 diff --git a/internal/iam/store/user.pb.go b/internal/iam/store/user.pb.go index f0f6f1bd9..0d44492e4 100644 --- a/internal/iam/store/user.pb.go +++ b/internal/iam/store/user.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -186,11 +187,14 @@ 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) -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_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_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 diff --git a/internal/iam/testing_test.go b/internal/iam/testing_test.go index a397a97af..9a58d6486 100644 --- a/internal/iam/testing_test.go +++ b/internal/iam/testing_test.go @@ -36,6 +36,7 @@ func Test_testProj(t *testing.T) { assert.Equal(id, proj.Description) assert.NotEmpty(proj.PublicId) } + func Test_testId(t *testing.T) { assert := assert.New(t) id := testId(t) @@ -48,6 +49,7 @@ func Test_testPublicId(t *testing.T) { require.NotEmpty(id) assert.True(strings.HasPrefix(id, "test_")) } + func Test_TestScopes(t *testing.T) { assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") @@ -219,5 +221,4 @@ func Test_TestGroupMember(t *testing.T) { require.NotNil(gm) require.Equal(pg.PublicId, gm.GroupId) require.Equal(u.PublicId, gm.MemberId) - } diff --git a/internal/iam/user.go b/internal/iam/user.go index 830069ce7..f414ba012 100644 --- a/internal/iam/user.go +++ b/internal/iam/user.go @@ -23,9 +23,11 @@ type User struct { } // ensure that User implements the interfaces of: Resource, Cloneable and db.VetForWriter -var _ Resource = (*User)(nil) -var _ Cloneable = (*User)(nil) -var _ db.VetForWriter = (*User)(nil) +var ( + _ Resource = (*User)(nil) + _ Cloneable = (*User)(nil) + _ db.VetForWriter = (*User)(nil) +) // NewUser creates a new in memory user and allows options: // WithName - to specify the user's friendly name and WithDescription - to diff --git a/internal/iam/user_test.go b/internal/iam/user_test.go index 0a267ed93..43911e22f 100644 --- a/internal/iam/user_test.go +++ b/internal/iam/user_test.go @@ -312,7 +312,6 @@ func Test_UserGetScope(t *testing.T) { require.NoError(err) assert.True(proto.Equal(org, userScope)) }) - } func TestUser_Clone(t *testing.T) { diff --git a/internal/kms/immutable_fields_test.go b/internal/kms/immutable_fields_test.go index a0dedeaec..b702c203f 100644 --- a/internal/kms/immutable_fields_test.go +++ b/internal/kms/immutable_fields_test.go @@ -35,7 +35,7 @@ func TestRootKeyVersion_ImmutableFields(t *testing.T) { rk := kms.TestRootKey(t, conn, org.PublicId) new, _ := kms.TestRootKeyVersion(t, conn, wrapper, rk.PrivateId) - var tests = []struct { + tests := []struct { name string update *kms.RootKeyVersion fieldMask []string @@ -105,7 +105,6 @@ func TestRootKeyVersion_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*kms.RootKeyVersion), after.(*kms.RootKeyVersion))) - }) } } @@ -122,7 +121,7 @@ func TestRootKey_ImmutableFields(t *testing.T) { require.NoError(t, conn.Where("1=1").Delete(kms.AllocRootKey()).Error) new := kms.TestRootKey(t, conn, org.PublicId) - var tests = []struct { + tests := []struct { name string update *kms.RootKey fieldMask []string @@ -172,7 +171,6 @@ func TestRootKey_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*kms.RootKey), after.(*kms.RootKey))) - }) } } @@ -191,7 +189,7 @@ func TestDatabaseKey_ImmutableFields(t *testing.T) { rk := kms.TestRootKey(t, conn, org.PublicId) new := kms.TestDatabaseKey(t, conn, rk.PrivateId) - var tests = []struct { + tests := []struct { name string update *kms.DatabaseKey fieldMask []string @@ -241,7 +239,6 @@ func TestDatabaseKey_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*kms.DatabaseKey), after.(*kms.DatabaseKey))) - }) } } @@ -261,7 +258,7 @@ func TestDatabaseKeyVersion_ImmutableFields(t *testing.T) { dk := kms.TestDatabaseKey(t, conn, rk.PrivateId) new := kms.TestDatabaseKeyVersion(t, conn, rkvWrapper, dk.PrivateId, []byte("database key")) - var tests = []struct { + tests := []struct { name string update *kms.DatabaseKeyVersion fieldMask []string @@ -340,7 +337,6 @@ func TestDatabaseKeyVersion_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*kms.DatabaseKeyVersion), after.(*kms.DatabaseKeyVersion))) - }) } } diff --git a/internal/kms/store/database_key.pb.go b/internal/kms/store/database_key.pb.go index 9e5eebcd5..d0fc6df4a 100644 --- a/internal/kms/store/database_key.pb.go +++ b/internal/kms/store/database_key.pb.go @@ -7,12 +7,13 @@ 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,12 +263,15 @@ 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) -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_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_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 diff --git a/internal/kms/store/oplog_key.pb.go b/internal/kms/store/oplog_key.pb.go index e0f1a8da6..49a498ae7 100644 --- a/internal/kms/store/oplog_key.pb.go +++ b/internal/kms/store/oplog_key.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -261,12 +262,15 @@ 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) -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_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_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 diff --git a/internal/kms/store/root_key.pb.go b/internal/kms/store/root_key.pb.go index 12025e8c2..951ca9517 100644 --- a/internal/kms/store/root_key.pb.go +++ b/internal/kms/store/root_key.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -248,12 +249,15 @@ 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) -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_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_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 diff --git a/internal/kms/store/session_key.pb.go b/internal/kms/store/session_key.pb.go index 97be20f64..9785b0833 100644 --- a/internal/kms/store/session_key.pb.go +++ b/internal/kms/store/session_key.pb.go @@ -7,12 +7,13 @@ 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,12 +263,15 @@ 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) -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_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_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 diff --git a/internal/kms/store/token_key.pb.go b/internal/kms/store/token_key.pb.go index 30c5f3791..d2d8a7203 100644 --- a/internal/kms/store/token_key.pb.go +++ b/internal/kms/store/token_key.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -261,12 +262,15 @@ 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) -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_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_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 diff --git a/internal/kms/token_key_test.go b/internal/kms/token_key_test.go index 8ea2301b6..cc1f654f9 100644 --- a/internal/kms/token_key_test.go +++ b/internal/kms/token_key_test.go @@ -2,7 +2,6 @@ package kms_test import ( "context" - "testing" "github.com/hashicorp/boundary/internal/db" diff --git a/internal/libs/alpnmux/mux_test.go b/internal/libs/alpnmux/mux_test.go index d5835792a..b002b227d 100644 --- a/internal/libs/alpnmux/mux_test.go +++ b/internal/libs/alpnmux/mux_test.go @@ -69,7 +69,7 @@ func TestListening(t *testing.T) { logger := hclog.Default() logger.SetLevel(hclog.Trace) - //log.SetOutput(logger.StandardWriter(new(hclog.StandardLoggerOptions))) + // log.SetOutput(logger.StandardWriter(new(hclog.StandardLoggerOptions))) mux := New(listener, logger) defer mux.Close() diff --git a/internal/oplog/any_operation.pb.go b/internal/oplog/any_operation.pb.go index 78b8acb49..b9f3a5680 100644 --- a/internal/oplog/any_operation.pb.go +++ b/internal/oplog/any_operation.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -216,13 +217,16 @@ 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) -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_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_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 diff --git a/internal/oplog/immutable_fields_test.go b/internal/oplog/immutable_fields_test.go index ecdd941e3..ace4912b7 100644 --- a/internal/oplog/immutable_fields_test.go +++ b/internal/oplog/immutable_fields_test.go @@ -15,7 +15,6 @@ import ( ) func Test_ImmutableFields(t *testing.T) { - cleanup, db := setup(t) defer testCleanup(t, cleanup, db) cipherer := testWrapper(t) @@ -58,7 +57,7 @@ func Test_ImmutableFields(t *testing.T) { future, err := ptypes.TimestampProto(time.Now().Add(time.Hour)) require.NoError(t, err) - var tests = []struct { + tests := []struct { name string update *Entry fieldMask []string @@ -131,7 +130,6 @@ func Test_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig, after)) - }) } } diff --git a/internal/oplog/oplog.go b/internal/oplog/oplog.go index 6a966818a..4d54b97a4 100644 --- a/internal/oplog/oplog.go +++ b/internal/oplog/oplog.go @@ -66,6 +66,7 @@ func NewEntry(aggregateName string, metadata Metadata, cipherer wrapping.Wrapper } return &entry, nil } + func (e *Entry) validate() error { if e.Cipherer == nil { return errors.New("entry Cipherer is nil") diff --git a/internal/oplog/oplog_test.go b/internal/oplog/oplog_test.go index 87d69a9bc..ac6bb6207 100644 --- a/internal/oplog/oplog_test.go +++ b/internal/oplog/oplog_test.go @@ -126,7 +126,6 @@ func Test_BasicOplog(t *testing.T) { require.NoError(err) assert.NotEmpty(newLogEntry.Id) }) - } // Test_NewEntry provides some basic unit tests for NewEntry @@ -497,7 +496,6 @@ func Test_Replay(t *testing.T) { var foundReplayedUser2 oplog_test.TestUser err = tx2.Where("id = ?", userCreate2.Id).First(&foundReplayedUser2).Error assert.Equal(gorm.ErrRecordNotFound, err, err.Error()) - }) } diff --git a/internal/oplog/oplog_test/oplog_test.pb.go b/internal/oplog/oplog_test/oplog_test.pb.go index b30e6b1ea..ed874098e 100644 --- a/internal/oplog/oplog_test/oplog_test.pb.go +++ b/internal/oplog/oplog_test/oplog_test.pb.go @@ -9,10 +9,11 @@ package oplog_test import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -370,13 +371,16 @@ 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) -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_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_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/internal/oplog/store/oplog.pb.go b/internal/oplog/store/oplog.pb.go index dff3b14d0..0e0ef6598 100644 --- a/internal/oplog/store/oplog.pb.go +++ b/internal/oplog/store/oplog.pb.go @@ -9,11 +9,12 @@ 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 ( @@ -399,13 +400,16 @@ 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) -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_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_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 diff --git a/internal/oplog/ticketer_gorm_test.go b/internal/oplog/ticketer_gorm_test.go index 391749f0a..50654b222 100644 --- a/internal/oplog/ticketer_gorm_test.go +++ b/internal/oplog/ticketer_gorm_test.go @@ -106,5 +106,4 @@ func Test_Redeem(t *testing.T) { err = secondTicketer.Redeem(secondTicket) assert.Equal("ticket already redeemed", err.Error()) }) - } diff --git a/internal/oplog/type_catalog.go b/internal/oplog/type_catalog.go index ea61856fe..f3f3ff4e7 100644 --- a/internal/oplog/type_catalog.go +++ b/internal/oplog/type_catalog.go @@ -25,7 +25,6 @@ func NewTypeCatalog(withTypes ...Type) (*TypeCatalog, error) { for _, t := range withTypes { if t == (Type{}) { return nil, errors.New("error type is {} (in NewTypeCatalog)") - } if err := reg.Set(t.Interface, t.Name); err != nil { return nil, fmt.Errorf("error setting the type: %w (in NewTypeCatalog)", err) diff --git a/internal/oplog/type_catalog_test.go b/internal/oplog/type_catalog_test.go index a50806fa7..ee7218c3e 100644 --- a/internal/oplog/type_catalog_test.go +++ b/internal/oplog/type_catalog_test.go @@ -83,7 +83,6 @@ func Test_NewTypeCatalog(t *testing.T) { assert.Error(err) assert.Equal("error type is {} (in NewTypeCatalog)", err.Error()) }) - } // Test_GetTypeName provides unit tests for GetTypeName diff --git a/internal/proxy/proxy.pb.go b/internal/proxy/proxy.pb.go index 2905ec230..fcd411605 100644 --- a/internal/proxy/proxy.pb.go +++ b/internal/proxy/proxy.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -236,14 +237,17 @@ 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) -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_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_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 diff --git a/internal/servers/controller/handler_test.go b/internal/servers/controller/handler_test.go index c3497e05e..1805116cc 100644 --- a/internal/servers/controller/handler_test.go +++ b/internal/servers/controller/handler_test.go @@ -186,7 +186,6 @@ func TestHandleImplementedPaths(t *testing.T) { } { for _, p := range paths { t.Run(fmt.Sprintf("%s/%s", verb, p), func(t *testing.T) { - var expCode int if !strings.HasPrefix(p, "v1/") { sp := strings.Split(p, "_") diff --git a/internal/servers/controller/handler_ui_test.go b/internal/servers/controller/handler_ui_test.go index ba01807d2..f885783f9 100644 --- a/internal/servers/controller/handler_ui_test.go +++ b/internal/servers/controller/handler_ui_test.go @@ -33,9 +33,9 @@ func TestUiRouting(t *testing.T) { for k, v := range nameContentsMap { dir := filepath.Dir(k) if dir != "/" { - require.NoError(t, os.MkdirAll(filepath.Join(tempDir, dir), 0755)) + require.NoError(t, os.MkdirAll(filepath.Join(tempDir, dir), 0o755)) } - require.NoError(t, ioutil.WriteFile(filepath.Join(tempDir, k), []byte(v), 0644)) + require.NoError(t, ioutil.WriteFile(filepath.Join(tempDir, k), []byte(v), 0o644)) } c := NewTestController(t, &TestControllerOpts{DisableAutoStart: true}) diff --git a/internal/servers/controller/handlers/accounts/account_service.go b/internal/servers/controller/handlers/accounts/account_service.go index 8572a4828..de5e0125e 100644 --- a/internal/servers/controller/handlers/accounts/account_service.go +++ b/internal/servers/controller/handlers/accounts/account_service.go @@ -18,9 +18,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/accounts/account_service_test.go b/internal/servers/controller/handlers/accounts/account_service_test.go index 28bfb3d05..36eab9f28 100644 --- a/internal/servers/controller/handlers/accounts/account_service_test.go +++ b/internal/servers/controller/handlers/accounts/account_service_test.go @@ -491,7 +491,8 @@ func TestUpdate(t *testing.T) { Description: wrapperspb.String("default"), Type: "password", Attributes: defaultAttributes, - }}, + }, + }, ) require.NoError(t, err) @@ -718,7 +719,8 @@ func TestUpdate(t *testing.T) { Id: password.AccountPrefix + "_somethinge", Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service.go b/internal/servers/controller/handlers/authmethods/authmethod_service.go index 95c0f1e33..f9f796a4f 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service.go +++ b/internal/servers/controller/handlers/authmethods/authmethod_service.go @@ -31,9 +31,7 @@ const ( pwKey = "password" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go b/internal/servers/controller/handlers/authmethods/authmethod_service_test.go index ce046858c..95c64cefa 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go +++ b/internal/servers/controller/handlers/authmethods/authmethod_service_test.go @@ -738,7 +738,8 @@ func TestUpdate(t *testing.T) { Id: password.AuthMethodPrefix + "_somethinge", Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/errors.go b/internal/servers/controller/handlers/errors.go index 2ed22873c..24febf60a 100644 --- a/internal/servers/controller/handlers/errors.go +++ b/internal/servers/controller/handlers/errors.go @@ -53,7 +53,8 @@ func ApiErrorWithCode(c codes.Code) error { status: int32(runtime.HTTPStatusFromCode(c)), inner: &pb.Error{ Kind: c.String(), - }} + }, + } } // ApiErrorWithCodeAndMessage returns an api error with the provided code and message. @@ -63,7 +64,8 @@ func ApiErrorWithCodeAndMessage(c codes.Code, msg string, args ...interface{}) e inner: &pb.Error{ Kind: c.String(), Message: fmt.Sprintf(msg, args...), - }} + }, + } } // NotFoundError returns an ApiError indicating a resource couldn't be found. @@ -73,7 +75,8 @@ func NotFoundError() error { inner: &pb.Error{ Kind: codes.NotFound.String(), Message: "Resource not found.", - }} + }, + } } // NotFoundErrorf returns an ApiError indicating a resource couldn't be found. @@ -83,7 +86,8 @@ func NotFoundErrorf(msg string, a ...interface{}) error { inner: &pb.Error{ Kind: codes.NotFound.String(), Message: fmt.Sprintf(msg, a...), - }} + }, + } } func ForbiddenError() error { @@ -92,7 +96,8 @@ func ForbiddenError() error { inner: &pb.Error{ Kind: codes.PermissionDenied.String(), Message: "Forbidden.", - }} + }, + } } func UnauthenticatedError() error { @@ -101,7 +106,8 @@ func UnauthenticatedError() error { inner: &pb.Error{ Kind: codes.Unauthenticated.String(), Message: "Unauthenticated, or invalid token.", - }} + }, + } } func InvalidArgumentErrorf(msg string, fields map[string]string) error { @@ -136,7 +142,8 @@ func backendErrorToApiError(inErr error) error { inner: &pb.Error{ Kind: codes.NotFound.String(), Message: http.StatusText(http.StatusNotFound), - }} + }, + } case status.Code(inErr) == codes.Unimplemented: // Instead of returning a 501 we always want to return a 405 when a method isn't implemented. return &apiError{ @@ -144,7 +151,8 @@ func backendErrorToApiError(inErr error) error { inner: &pb.Error{ Kind: codes.Unimplemented.String(), Message: stErr.Message(), - }} + }, + } case errors.Is(inErr, errors.ErrRecordNotFound), errors.Match(errors.T(errors.RecordNotFound), inErr): return NotFoundErrorf(genericNotFoundMsg) case errors.Is(inErr, errors.ErrInvalidFieldMask), errors.Is(inErr, errors.ErrEmptyFieldMask), diff --git a/internal/servers/controller/handlers/groups/group_service.go b/internal/servers/controller/handlers/groups/group_service.go index 1519125b4..a9dc8064f 100644 --- a/internal/servers/controller/handlers/groups/group_service.go +++ b/internal/servers/controller/handlers/groups/group_service.go @@ -20,9 +20,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/groups/group_service_test.go b/internal/servers/controller/handlers/groups/group_service_test.go index 2d22ad1bd..02cb29b5c 100644 --- a/internal/servers/controller/handlers/groups/group_service_test.go +++ b/internal/servers/controller/handlers/groups/group_service_test.go @@ -823,7 +823,8 @@ func TestUpdate(t *testing.T) { Id: iam.GroupPrefix + "_somethinge", Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go b/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go index f23aadb35..b95c2db7a 100644 --- a/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go +++ b/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go @@ -20,9 +20,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go b/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go index e5a9d1fe5..28d5073a2 100644 --- a/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go +++ b/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go @@ -659,7 +659,8 @@ func TestUpdate(t *testing.T) { Scope: &scopepb.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()}, Name: &wrappers.StringValue{Value: "new"}, Description: &wrappers.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, @@ -736,7 +737,7 @@ func TestUpdate(t *testing.T) { require.NoError(err, "Failed to convert proto to timestamp") // Verify it is a catalog updated after it was created // TODO: This is currently failing. - //assert.True(gotUpdateTime.After(hcCreated), "Updated catalog should have been updated after it's creation. Was updated %v, which is after %v", gotUpdateTime, hcCreated) + // assert.True(gotUpdateTime.After(hcCreated), "Updated catalog should have been updated after it's creation. Was updated %v, which is after %v", gotUpdateTime, hcCreated) _ = gotUpdateTime _ = hcCreated diff --git a/internal/servers/controller/handlers/host_sets/host_set_service.go b/internal/servers/controller/handlers/host_sets/host_set_service.go index 3ea503b52..57614e652 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service.go +++ b/internal/servers/controller/handlers/host_sets/host_set_service.go @@ -20,9 +20,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/host_sets/host_set_service_test.go b/internal/servers/controller/handlers/host_sets/host_set_service_test.go index f393772fc..95f372f9a 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service_test.go +++ b/internal/servers/controller/handlers/host_sets/host_set_service_test.go @@ -675,7 +675,8 @@ func TestUpdate(t *testing.T) { Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()}, Name: &wrappers.StringValue{Value: "new"}, Description: &wrappers.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/hosts/host_service.go b/internal/servers/controller/handlers/hosts/host_service.go index 1178994d7..4a5f8e025 100644 --- a/internal/servers/controller/handlers/hosts/host_service.go +++ b/internal/servers/controller/handlers/hosts/host_service.go @@ -21,9 +21,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/hosts/host_service_test.go b/internal/servers/controller/handlers/hosts/host_service_test.go index 56f520695..1c4420b57 100644 --- a/internal/servers/controller/handlers/hosts/host_service_test.go +++ b/internal/servers/controller/handlers/hosts/host_service_test.go @@ -702,7 +702,8 @@ func TestUpdate(t *testing.T) { Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()}, Name: &wrappers.StringValue{Value: "new"}, Description: &wrappers.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, @@ -717,7 +718,8 @@ func TestUpdate(t *testing.T) { Attributes: &structpb.Struct{Fields: map[string]*structpb.Value{ "address": structpb.NewNullValue(), }}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, @@ -732,7 +734,8 @@ func TestUpdate(t *testing.T) { Attributes: &structpb.Struct{Fields: map[string]*structpb.Value{ "address": structpb.NewStringValue(""), }}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/roles/role_service.go b/internal/servers/controller/handlers/roles/role_service.go index ea4298671..b63a858bd 100644 --- a/internal/servers/controller/handlers/roles/role_service.go +++ b/internal/servers/controller/handlers/roles/role_service.go @@ -21,9 +21,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/roles/role_service_test.go b/internal/servers/controller/handlers/roles/role_service_test.go index fc084674e..d24abac0c 100644 --- a/internal/servers/controller/handlers/roles/role_service_test.go +++ b/internal/servers/controller/handlers/roles/role_service_test.go @@ -342,7 +342,6 @@ func TestDelete_twice(t *testing.T) { _, gErr = s.DeleteRole(ctx, projReq) assert.Error(gErr, "Second attempt") assert.True(errors.Is(gErr, handlers.ApiErrorWithCode(codes.NotFound)), "Expected permission denied for the second delete.") - } func TestCreate(t *testing.T) { @@ -822,7 +821,8 @@ func TestUpdate(t *testing.T) { Id: iam.RolePrefix + "_somethinge", Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/scopes/scope_service.go b/internal/servers/controller/handlers/scopes/scope_service.go index 1fde82c51..5279588df 100644 --- a/internal/servers/controller/handlers/scopes/scope_service.go +++ b/internal/servers/controller/handlers/scopes/scope_service.go @@ -21,9 +21,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/scopes/scope_service_test.go b/internal/servers/controller/handlers/scopes/scope_service_test.go index 2b9224f43..ca57e8364 100644 --- a/internal/servers/controller/handlers/scopes/scope_service_test.go +++ b/internal/servers/controller/handlers/scopes/scope_service_test.go @@ -932,7 +932,8 @@ func TestUpdate(t *testing.T) { Scope: &pb.ScopeInfo{Id: org.GetPublicId(), Type: scope.Org.String()}, Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/targets/target_service.go b/internal/servers/controller/handlers/targets/target_service.go index 165512d19..19c8d658a 100644 --- a/internal/servers/controller/handlers/targets/target_service.go +++ b/internal/servers/controller/handlers/targets/target_service.go @@ -34,9 +34,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/targets/target_service_test.go b/internal/servers/controller/handlers/targets/target_service_test.go index 70f65e37c..dd0331367 100644 --- a/internal/servers/controller/handlers/targets/target_service_test.go +++ b/internal/servers/controller/handlers/targets/target_service_test.go @@ -693,7 +693,8 @@ func TestUpdate(t *testing.T) { Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()}, Name: wrapperspb.String("new"), Description: wrapperspb.String("new desc"), - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/users/user_service.go b/internal/servers/controller/handlers/users/user_service.go index 6fe2b238d..ad2be85ea 100644 --- a/internal/servers/controller/handlers/users/user_service.go +++ b/internal/servers/controller/handlers/users/user_service.go @@ -21,9 +21,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" ) -var ( - maskManager handlers.MaskManager -) +var maskManager handlers.MaskManager func init() { var err error diff --git a/internal/servers/controller/handlers/users/user_service_test.go b/internal/servers/controller/handlers/users/user_service_test.go index b4556de9b..3bedd07fa 100644 --- a/internal/servers/controller/handlers/users/user_service_test.go +++ b/internal/servers/controller/handlers/users/user_service_test.go @@ -533,7 +533,8 @@ func TestUpdate(t *testing.T) { Id: iam.UserPrefix + "_somethinge", Name: &wrapperspb.StringValue{Value: "new"}, Description: &wrapperspb.StringValue{Value: "new desc"}, - }}, + }, + }, res: nil, err: handlers.ApiErrorWithCode(codes.InvalidArgument), }, diff --git a/internal/servers/controller/handlers/workers/worker_service.go b/internal/servers/controller/handlers/workers/worker_service.go index fbc003d1c..8e5157022 100644 --- a/internal/servers/controller/handlers/workers/worker_service.go +++ b/internal/servers/controller/handlers/workers/worker_service.go @@ -42,8 +42,10 @@ func NewWorkerServiceServer( } } -var _ pbs.SessionServiceServer = &workerServiceServer{} -var _ pbs.ServerCoordinationServiceServer = &workerServiceServer{} +var ( + _ pbs.SessionServiceServer = &workerServiceServer{} + _ pbs.ServerCoordinationServiceServer = &workerServiceServer{} +) func (ws *workerServiceServer) Status(ctx context.Context, req *pbs.StatusRequest) (*pbs.StatusResponse, error) { ws.logger.Trace("got status request from worker", "name", req.Worker.Name, "address", req.Worker.Address, "jobs", req.GetJobs()) diff --git a/internal/servers/repository.go b/internal/servers/repository.go index 32bb81ee6..3759dcaa3 100644 --- a/internal/servers/repository.go +++ b/internal/servers/repository.go @@ -97,12 +97,14 @@ func (r *Repository) UpsertServer(ctx context.Context, server *Server, opt ...Op ` rowsAffected, err := r.writer.Exec(ctx, q, - []interface{}{server.PrivateId, + []interface{}{ + server.PrivateId, server.Type, server.Name, server.Description, server.Address, - time.Now().Format(time.RFC3339)}) + time.Now().Format(time.RFC3339), + }) if err != nil { return nil, db.NoRowsAffected, fmt.Errorf("error performing status upsert: %w", err) } diff --git a/internal/servers/servers.pb.go b/internal/servers/servers.pb.go index 16d634639..b0cedc4de 100644 --- a/internal/servers/servers.pb.go +++ b/internal/servers/servers.pb.go @@ -7,11 +7,12 @@ 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 ( @@ -171,11 +172,14 @@ 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) -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_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_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 diff --git a/internal/servers/worker/handler.go b/internal/servers/worker/handler.go index cbe1e6c73..6b42661ad 100644 --- a/internal/servers/worker/handler.go +++ b/internal/servers/worker/handler.go @@ -71,7 +71,7 @@ func (w *Worker) handleProxy() http.HandlerFunc { tofuToken := si.lookupSessionResponse.GetTofuToken() version := si.lookupSessionResponse.GetVersion() endpoint := si.lookupSessionResponse.GetEndpoint() - //userId := si.lookupSessionResponse.GetAuthorization() + // userId := si.lookupSessionResponse.GetAuthorization() sessStatus := si.status si.RUnlock() diff --git a/internal/session/connection.go b/internal/session/connection.go index e66c46126..075cf00cd 100644 --- a/internal/session/connection.go +++ b/internal/session/connection.go @@ -48,8 +48,10 @@ func (c *Connection) GetPublicId() string { return c.PublicId } -var _ Cloneable = (*Connection)(nil) -var _ db.VetForWriter = (*Connection)(nil) +var ( + _ Cloneable = (*Connection)(nil) + _ db.VetForWriter = (*Connection)(nil) +) // New creates a new in memory session. No options // are currently supported. diff --git a/internal/session/connection_closed_reason.go b/internal/session/connection_closed_reason.go index dcc5fd90c..b2bc83564 100644 --- a/internal/session/connection_closed_reason.go +++ b/internal/session/connection_closed_reason.go @@ -22,6 +22,7 @@ const ( func (r ClosedReason) String() string { return string(r) } + func convertToClosedReason(s string) (ClosedReason, error) { switch s { case UnknownReason.String(): diff --git a/internal/session/connection_state.go b/internal/session/connection_state.go index 4ecd162e4..bc38a3226 100644 --- a/internal/session/connection_state.go +++ b/internal/session/connection_state.go @@ -59,8 +59,10 @@ type ConnectionState struct { tableName string `gorm:"-"` } -var _ Cloneable = (*ConnectionState)(nil) -var _ db.VetForWriter = (*ConnectionState)(nil) +var ( + _ Cloneable = (*ConnectionState)(nil) + _ db.VetForWriter = (*ConnectionState)(nil) +) // NewConnectionState creates a new in memory connection state. No options // are currently supported. diff --git a/internal/session/immutable_fields_test.go b/internal/session/immutable_fields_test.go index 0643ec863..ec90235a1 100644 --- a/internal/session/immutable_fields_test.go +++ b/internal/session/immutable_fields_test.go @@ -24,7 +24,7 @@ func TestSession_ImmutableFields(t *testing.T) { _, _ = iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) new := TestDefaultSession(t, conn, wrapper, iamRepo) - var tests = []struct { + tests := []struct { name string update *Session fieldMask []string @@ -83,7 +83,6 @@ func TestSession_ImmutableFields(t *testing.T) { require.NoError(err) assert.Equal(orig.(*Session), after) - }) } } @@ -105,7 +104,7 @@ func TestState_ImmutableFields(t *testing.T) { err := rw.LookupWhere(context.Background(), &new, "session_id = ? and state = ?", state.SessionId, state.Status) require.NoError(t, err) - var tests = []struct { + tests := []struct { name string update *State fieldMask []string @@ -180,7 +179,7 @@ func TestConnection_ImmutableFields(t *testing.T) { session := TestDefaultSession(t, conn, wrapper, iamRepo) new := TestConnection(t, conn, session.PublicId, "127.0.0.1", 22, "127.0.0.1", 2222) - var tests = []struct { + tests := []struct { name string update *Connection fieldMask []string @@ -230,7 +229,6 @@ func TestConnection_ImmutableFields(t *testing.T) { require.NoError(err) assert.Equal(orig.(*Connection), after) - }) } } @@ -253,7 +251,7 @@ func TestConnectionState_ImmutableFields(t *testing.T) { err := rw.LookupWhere(context.Background(), &new, "connection_id = ? and state = ?", state.ConnectionId, state.Status) require.NoError(t, err) - var tests = []struct { + tests := []struct { name string update *ConnectionState fieldMask []string diff --git a/internal/session/repository.go b/internal/session/repository.go index 9d9030ebb..f4debef40 100644 --- a/internal/session/repository.go +++ b/internal/session/repository.go @@ -104,7 +104,8 @@ func (r *Repository) convertToSessions(ctx context.Context, sessionsWithState [] Version: sv.Version, Endpoint: sv.Endpoint, ConnectionLimit: sv.ConnectionLimit, - KeyId: sv.KeyId} + KeyId: sv.KeyId, + } if opts.withListingConvert { workingSession.CtTofuToken = nil // CtTofuToken should not returned in lists workingSession.TofuToken = nil // TofuToken should not returned in lists diff --git a/internal/session/repository_session_test.go b/internal/session/repository_session_test.go index b5cad6433..c90e1ff74 100644 --- a/internal/session/repository_session_test.go +++ b/internal/session/repository_session_test.go @@ -1008,7 +1008,6 @@ func TestRepository_CloseConnections(t *testing.T) { cw := setupFn(2) cw[1].ConnectionId = "" return cw - }(), reason: ClosedByUser, wantErr: true, diff --git a/internal/session/session.go b/internal/session/session.go index 85d560c3c..704a55b0c 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -106,8 +106,10 @@ func (s *Session) GetPublicId() string { return s.PublicId } -var _ Cloneable = (*Session)(nil) -var _ db.VetForWriter = (*Session)(nil) +var ( + _ Cloneable = (*Session)(nil) + _ db.VetForWriter = (*Session)(nil) +) // New creates a new in memory session. func New(c ComposedOf, opt ...Option) (*Session, error) { diff --git a/internal/session/state.go b/internal/session/state.go index f3e0197fb..3afb8a830 100644 --- a/internal/session/state.go +++ b/internal/session/state.go @@ -62,8 +62,10 @@ type State struct { tableName string `gorm:"-"` } -var _ Cloneable = (*State)(nil) -var _ db.VetForWriter = (*State)(nil) +var ( + _ Cloneable = (*State)(nil) + _ db.VetForWriter = (*State)(nil) +) // NewState creates a new in memory session state. No options // are currently supported. diff --git a/internal/session/term_reason.go b/internal/session/term_reason.go index 41450f25f..c37a44a1b 100644 --- a/internal/session/term_reason.go +++ b/internal/session/term_reason.go @@ -24,6 +24,7 @@ const ( func (r TerminationReason) String() string { return string(r) } + func convertToReason(s string) (TerminationReason, error) { switch s { case UnknownTermination.String(): diff --git a/internal/session/testing_test.go b/internal/session/testing_test.go index 803530d6b..4049a2710 100644 --- a/internal/session/testing_test.go +++ b/internal/session/testing_test.go @@ -76,6 +76,7 @@ func Test_TestWorker(t *testing.T) { w := TestWorker(t, conn, wrapper) require.NotNil(w) } + func Test_TestCert(t *testing.T) { t.Helper() assert, require := assert.New(t), require.New(t) diff --git a/internal/target/immutable_fields_test.go b/internal/target/immutable_fields_test.go index 6f0befc3e..542dd0888 100644 --- a/internal/target/immutable_fields_test.go +++ b/internal/target/immutable_fields_test.go @@ -26,7 +26,7 @@ func TestTarget_ImmutableFields(t *testing.T) { _, proj := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) new := TestTcpTarget(t, conn, proj.PublicId, testId(t)) - var tests = []struct { + tests := []struct { name string update *TcpTarget fieldMask []string @@ -80,7 +80,6 @@ func TestTarget_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*TcpTarget), after.(*TcpTarget))) - }) } } @@ -96,7 +95,7 @@ func TestTcpTarget_ImmutableFields(t *testing.T) { _, proj := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) new := TestTcpTarget(t, conn, proj.PublicId, testId(t)) - var tests = []struct { + tests := []struct { name string update *TcpTarget fieldMask []string @@ -146,7 +145,6 @@ func TestTcpTarget_ImmutableFields(t *testing.T) { require.NoError(err) assert.True(proto.Equal(orig.(*TcpTarget), after.(*TcpTarget))) - }) } } @@ -177,7 +175,7 @@ func TestTargetHostSet_ImmutableFields(t *testing.T) { new, err := NewTargetHostSet(projTarget.PublicId, gotHostSets[0].PublicId) require.NoError(t, err) - var tests = []struct { + tests := []struct { name string update *TargetHostSet fieldMask []string diff --git a/internal/target/repository.go b/internal/target/repository.go index 6b06f8d00..2cf9dffca 100644 --- a/internal/target/repository.go +++ b/internal/target/repository.go @@ -12,9 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/oplog" ) -var ( - ErrMetadataScopeNotFound = stderrors.New("scope not found for metadata") -) +var ErrMetadataScopeNotFound = stderrors.New("scope not found for metadata") // Clonable provides a cloning interface type Cloneable interface { diff --git a/internal/target/store/target.pb.go b/internal/target/store/target.pb.go index a33d92d52..144befa25 100644 --- a/internal/target/store/target.pb.go +++ b/internal/target/store/target.pb.go @@ -7,12 +7,13 @@ 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 ( @@ -496,13 +497,16 @@ 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) -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_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_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 diff --git a/internal/target/tcp_target.go b/internal/target/tcp_target.go index ef5493168..533afe265 100644 --- a/internal/target/tcp_target.go +++ b/internal/target/tcp_target.go @@ -20,9 +20,11 @@ type TcpTarget struct { tableName string `gorm:"-"` } -var _ Target = (*TcpTarget)(nil) -var _ db.VetForWriter = (*TcpTarget)(nil) -var _ oplog.ReplayableMessage = (*TcpTarget)(nil) +var ( + _ Target = (*TcpTarget)(nil) + _ db.VetForWriter = (*TcpTarget)(nil) + _ oplog.ReplayableMessage = (*TcpTarget)(nil) +) // NewTcpTarget creates a new in memory tcp target. WithName, WithDescription and // WithDefaultPort options are supported diff --git a/internal/types/resource/resource_test.go b/internal/types/resource/resource_test.go index bf5643e27..9f242d2bd 100644 --- a/internal/types/resource/resource_test.go +++ b/internal/types/resource/resource_test.go @@ -7,7 +7,6 @@ import ( ) func Test_Resource(t *testing.T) { - tests := []struct { typeString string want Type diff --git a/internal/website/permstable/permstable.go b/internal/website/permstable/permstable.go index d3b896e0e..cea342a67 100644 --- a/internal/website/permstable/permstable.go +++ b/internal/website/permstable/permstable.go @@ -113,7 +113,7 @@ func main() { strings.Join(table.Marshal(), "\n"), strings.Join(post, "\n")) - if err := ioutil.WriteFile(permsFile, []byte(final), 0644); err != nil { + if err := ioutil.WriteFile(permsFile, []byte(final), 0o644); err != nil { fmt.Println(err) os.Exit(1) } diff --git a/sdk/strutil/strutil_test.go b/sdk/strutil/strutil_test.go index 18cd52bec..9da041b47 100644 --- a/sdk/strutil/strutil_test.go +++ b/sdk/strutil/strutil_test.go @@ -86,7 +86,6 @@ func TestStrutil_ListContainsGlob(t *testing.T) { if !StrListContainsGlob(haystack, "_test_") { t.Fatalf("Value should exist") } - } func TestStrutil_ListContains(t *testing.T) { diff --git a/tools/tools.go b/tools/tools.go index 0ac253361..a1d7b10c4 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -13,6 +13,7 @@ package tools // NOTE: This must not be indented, so to stop goimports from trying to be // helpful, it's separated out from the import block below. Please try to keep // them in the same order. +//go:generate go install mvdan.cc/gofumpt //go:generate go install github.com/bufbuild/buf/cmd/buf //go:generate go install github.com/favadi/protoc-go-inject-tag //go:generate go install github.com/go-swagger/go-swagger/cmd/swagger @@ -26,6 +27,8 @@ package tools //go:generate go install google.golang.org/grpc/cmd/protoc-gen-go-grpc import ( + _ "mvdan.cc/gofumpt" + _ "github.com/bufbuild/buf/cmd/buf" _ "github.com/favadi/protoc-go-inject-tag"