From 6661117d4cde91c1ff9b1d437eb64e2fd7a24d2c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 10 Aug 2020 17:15:02 -0400 Subject: [PATCH] The name. The name. The name! --- .circleci/config.yml | 2 +- Makefile | 6 +- README.md | 76 ++++++------- api/authmethods/account.gen.go | 4 +- api/authmethods/authenticate.go | 6 +- api/authmethods/authenticate_test.go | 4 +- api/authmethods/authmethods.gen.go | 4 +- api/authmethods/option.gen.go | 2 +- api/authtokens/authtoken_test.go | 8 +- api/authtokens/authtokens.gen.go | 4 +- api/authtokens/option.gen.go | 2 +- api/client.go | 106 +++++++++--------- api/groups/group.gen.go | 4 +- api/groups/group_test.go | 12 +- api/groups/option.gen.go | 2 +- api/hosts/host.gen.go | 4 +- api/hosts/host_catalog.gen.go | 4 +- api/hosts/option.gen.go | 2 +- api/internal/genapi/input.go | 16 +-- api/internal/genapi/parse.go | 2 +- api/internal/genapi/templates.go | 6 +- api/internal/parseutil/parseutil.go | 2 +- api/roles/option.gen.go | 2 +- api/roles/role.gen.go | 4 +- api/roles/role_test.go | 16 +-- api/scopes/option.gen.go | 2 +- api/scopes/project_test.go | 6 +- api/scopes/scope.gen.go | 2 +- api/users/option.gen.go | 2 +- api/users/user.gen.go | 4 +- api/users/user_test.go | 8 +- cmd/{watchtower => boundary}/main.go | 2 +- go.mod | 2 +- internal/auth/auth.go | 12 +- internal/auth/auth_test.go | 10 +- internal/auth/db_test.go | 4 +- internal/auth/password/account.go | 6 +- internal/auth/password/account_test.go | 6 +- internal/auth/password/argon2.go | 6 +- internal/auth/password/argon2_test.go | 6 +- internal/auth/password/authmethod.go | 6 +- internal/auth/password/authmethod_test.go | 6 +- internal/auth/password/private_ids.go | 2 +- internal/auth/password/public_ids.go | 2 +- internal/auth/password/repository.go | 4 +- internal/auth/password/repository_account.go | 4 +- .../auth/password/repository_account_test.go | 8 +- .../auth/password/repository_authmethod.go | 6 +- .../password/repository_authmethod_test.go | 10 +- .../auth/password/repository_configuration.go | 6 +- .../password/repository_configuration_test.go | 8 +- internal/auth/password/repository_password.go | 4 +- .../auth/password/repository_password_test.go | 8 +- internal/auth/password/repository_test.go | 2 +- internal/auth/password/store/argon2.pb.go | 12 +- internal/auth/password/store/password.pb.go | 15 ++- internal/auth/password/testing.go | 2 +- internal/auth/password/testing_test.go | 4 +- internal/auth/store/account.pb.go | 15 ++- internal/auth/store/auth_method.pb.go | 12 +- internal/authtoken/account.go | 2 +- internal/authtoken/authtoken.go | 4 +- internal/authtoken/authtoken_test.go | 10 +- internal/authtoken/gorm_test.go | 2 +- internal/authtoken/immutable_fields_test.go | 6 +- internal/authtoken/repository.go | 10 +- internal/authtoken/repository_test.go | 10 +- internal/authtoken/store/authtoken.pb.go | 14 +-- internal/authtoken/testing.go | 6 +- internal/cmd/base/base.go | 36 +++--- internal/cmd/base/const.go | 6 +- internal/cmd/base/format.go | 4 +- internal/cmd/base/listener.go | 2 +- internal/cmd/base/profiling_on.go | 2 +- internal/cmd/base/servers.go | 22 ++-- internal/cmd/base/ui.go | 2 +- internal/cmd/commands.go | 18 +-- .../cmd/commands/authenticate/authenticate.go | 10 +- .../cmd/commands/authenticate/password.go | 22 ++-- internal/cmd/commands/config/config.go | 12 +- .../cmd/commands/config/encryptdecrypt.go | 8 +- .../commands/config/encryptdecrypt_test.go | 2 +- .../cmd/commands/controller/controller.go | 32 +++--- internal/cmd/commands/controller/dev_flags.go | 4 +- internal/cmd/commands/dev/dev.go | 26 ++--- internal/cmd/commands/dev/dev_flags.go | 4 +- internal/cmd/commands/hosts/host_create.go | 8 +- internal/cmd/commands/roles/funcs.go | 50 ++++----- internal/cmd/commands/roles/role.go | 10 +- internal/cmd/commands/scopes/create.go | 8 +- internal/cmd/commands/scopes/funcs.go | 4 +- internal/cmd/commands/scopes/read.go | 8 +- internal/cmd/commands/worker/worker.go | 26 ++--- internal/cmd/config/config.go | 6 +- internal/cmd/main.go | 22 ++-- internal/db/assert/asserts.go | 2 +- internal/db/assert/asserts_test.go | 2 +- internal/db/assert/docs.go | 2 +- internal/db/common/update_test.go | 2 +- internal/db/db.go | 4 +- internal/db/db_test/db_test.pb.go | 14 +-- internal/db/migrations/postgres.gen.go | 2 +- internal/db/migrations/postgres/03_db.up.sql | 2 +- internal/db/option.go | 2 +- internal/db/option_test.go | 2 +- internal/db/read_writer.go | 12 +- internal/db/read_writer_test.go | 8 +- internal/db/testing.go | 4 +- internal/db/testing_test.go | 4 +- internal/db/timestamp/timestamp.pb.go | 10 +- internal/gen/controller/api/error.pb.go | 10 +- .../api/resources/authmethods/account.pb.go | 18 +-- .../resources/authmethods/auth_method.pb.go | 18 +-- .../api/resources/authtokens/authtoken.pb.go | 18 +-- .../api/resources/groups/group.pb.go | 17 ++- .../controller/api/resources/hosts/host.pb.go | 16 +-- .../api/resources/hosts/host_catalog.pb.go | 18 +-- .../api/resources/hosts/host_set.pb.go | 17 ++- .../controller/api/resources/roles/role.pb.go | 18 +-- .../api/resources/scopes/scope.pb.go | 16 +-- .../controller/api/resources/users/user.pb.go | 16 +-- .../api/services/auth_method_service.pb.go | 26 ++--- .../api/services/authaccount_service.pb.go | 26 ++--- .../api/services/authenticate_service.pb.go | 14 +-- .../api/services/authtokens_service.pb.go | 18 +-- .../api/services/group_service.pb.go | 28 ++--- .../api/services/host_catalog_service.pb.go | 26 ++--- .../api/services/host_service.pb.go | 14 +-- .../api/services/host_set_service.pb.go | 26 ++--- .../api/services/role_service.pb.go | 22 ++-- .../api/services/scope_service.pb.go | 26 ++--- .../api/services/user_service.pb.go | 26 ++--- .../gen/controller/protooptions/options.pb.go | 12 +- .../gen/controller/protooptions/testing.pb.go | 13 +-- internal/host/static/example_test.go | 2 +- internal/host/static/gorm_test.go | 2 +- internal/host/static/immutable_fields_test.go | 8 +- internal/host/static/repository.go | 6 +- internal/host/static/repository_test.go | 8 +- internal/host/static/static.go | 4 +- internal/host/static/static_test.go | 6 +- internal/host/static/store/static.pb.go | 16 +-- internal/iam/account.go | 8 +- internal/iam/account_test.go | 6 +- internal/iam/action.go | 2 +- internal/iam/action_test.go | 2 +- internal/iam/docs.go | 2 +- internal/iam/group.go | 10 +- internal/iam/group_member.go | 4 +- internal/iam/group_member_test.go | 4 +- internal/iam/group_test.go | 12 +- internal/iam/ids.go | 4 +- internal/iam/ids_test.go | 4 +- internal/iam/immutable_fields_test.go | 4 +- internal/iam/principal_role.go | 4 +- internal/iam/principal_role_test.go | 4 +- internal/iam/repository.go | 8 +- internal/iam/repository_group.go | 6 +- internal/iam/repository_group_test.go | 6 +- internal/iam/repository_principal_role.go | 4 +- .../iam/repository_principal_role_test.go | 4 +- internal/iam/repository_role.go | 4 +- internal/iam/repository_role_grant.go | 6 +- internal/iam/repository_role_grant_test.go | 4 +- internal/iam/repository_role_test.go | 8 +- internal/iam/repository_scope.go | 6 +- internal/iam/repository_scope_test.go | 10 +- internal/iam/repository_test.go | 12 +- internal/iam/repository_user.go | 8 +- internal/iam/repository_user_test.go | 6 +- internal/iam/resource.go | 8 +- internal/iam/resource_test.go | 2 +- internal/iam/role.go | 10 +- internal/iam/role_grant.go | 8 +- internal/iam/role_grant_test.go | 6 +- internal/iam/role_test.go | 12 +- internal/iam/scope.go | 10 +- internal/iam/scope_test.go | 10 +- internal/iam/store/group.pb.go | 14 +-- internal/iam/store/group_member.pb.go | 12 +- internal/iam/store/principal_role.pb.go | 10 +- internal/iam/store/role.pb.go | 12 +- internal/iam/store/role_grant.pb.go | 10 +- internal/iam/store/scope.pb.go | 14 +-- internal/iam/store/user.pb.go | 14 +-- internal/iam/testing.go | 6 +- internal/iam/testing_test.go | 2 +- internal/iam/user.go | 12 +- internal/iam/user_test.go | 8 +- internal/oplog/README.md | 6 +- internal/oplog/any_operation.pb.go | 10 +- internal/oplog/docs.go | 2 +- internal/oplog/immutable_fields_test.go | 6 +- internal/oplog/oplog.go | 4 +- internal/oplog/oplog_test.go | 2 +- internal/oplog/oplog_test/oplog_test.pb.go | 10 +- internal/oplog/queue.go | 2 +- internal/oplog/queue_test.go | 2 +- internal/oplog/store/oplog.pb.go | 16 +-- internal/oplog/testing.go | 4 +- internal/oplog/ticketer.go | 2 +- internal/oplog/type_catalog_test.go | 2 +- internal/oplog/writer.go | 2 +- internal/oplog/writer_test.go | 2 +- internal/perms/acl.go | 6 +- internal/perms/acl_test.go | 4 +- internal/perms/doc.go | 2 +- internal/perms/grants.go | 6 +- internal/perms/grants_test.go | 6 +- .../resources/authmethods/v1/account.proto | 2 +- .../authmethods/v1/auth_method.proto | 2 +- .../resources/authtokens/v1/authtoken.proto | 2 +- .../api/resources/groups/v1/group.proto | 2 +- .../api/resources/hosts/v1/host.proto | 2 +- .../api/resources/hosts/v1/host_catalog.proto | 2 +- .../api/resources/hosts/v1/host_set.proto | 2 +- .../api/resources/roles/v1/role.proto | 2 +- .../api/resources/scopes/v1/scope.proto | 2 +- .../api/resources/users/v1/user.proto | 2 +- .../api/services/v1/auth_method_service.proto | 8 +- .../api/services/v1/authaccount_service.proto | 8 +- .../services/v1/authenticate_service.proto | 2 +- .../api/services/v1/authtokens_service.proto | 4 +- .../api/services/v1/group_service.proto | 8 +- .../services/v1/host_catalog_service.proto | 8 +- .../api/services/v1/host_service.proto | 2 +- .../api/services/v1/host_set_service.proto | 2 +- .../api/services/v1/role_service.proto | 6 +- .../api/services/v1/scope_service.proto | 8 +- .../api/services/v1/user_service.proto | 8 +- .../proto/local/controller/api/v1/error.proto | 2 +- .../custom_options/v1/options.proto | 2 +- .../custom_options/v1/testing.proto | 2 +- .../auth/password/store/v1/argon2.proto | 2 +- .../auth/password/store/v1/password.proto | 2 +- .../storage/auth/store/v1/account.proto | 2 +- .../storage/auth/store/v1/auth_method.proto | 2 +- .../authtoken/store/v1/authtoken.proto | 4 +- .../storage/db/db_test/v1/db_test.proto | 4 +- .../storage/host/static/store/v1/static.proto | 2 +- .../storage/iam/store/v1/group.proto | 2 +- .../storage/iam/store/v1/group_member.proto | 2 +- .../storage/iam/store/v1/principal_role.proto | 2 +- .../storage/iam/store/v1/role.proto | 2 +- .../storage/iam/store/v1/role_grant.proto | 2 +- .../storage/iam/store/v1/scope.proto | 2 +- .../storage/iam/store/v1/user.proto | 2 +- .../storage/oplog/store/v1/oplog.proto | 4 +- .../storage/oplog/test/v1/oplog_test.proto | 2 +- .../storage/oplog/v1/any_operation.proto | 2 +- .../storage/timestamp/v1/timestamp.proto | 2 +- internal/servers/controller/common/common.go | 8 +- internal/servers/controller/config.go | 4 +- internal/servers/controller/controller.go | 16 +-- internal/servers/controller/cors_test.go | 2 +- internal/servers/controller/handler.go | 32 +++--- internal/servers/controller/handler_ui.go | 2 +- .../servers/controller/handler_ui_test.go | 2 +- .../handlers/accounts/account_service.go | 16 +-- .../handlers/accounts/account_service_test.go | 22 ++-- .../authenticate/authenticate_service.go | 18 +-- .../authenticate/authenticate_service_test.go | 14 +-- .../authmethods/authmethod_service.go | 16 +-- .../authmethods/authmethod_service_test.go | 18 +-- .../handlers/authtokens/authtoken_service.go | 14 +-- .../authtokens/authtoken_service_test.go | 18 +-- .../servers/controller/handlers/errors.go | 2 +- .../controller/handlers/errors_test.go | 2 +- .../handlers/groups/group_service.go | 16 +-- .../handlers/groups/group_service_test.go | 16 +-- .../host_catalogs/host_catalog_service.go | 16 +-- .../host_catalog_service_test.go | 18 +-- .../controller/handlers/mask_manager.go | 2 +- .../controller/handlers/mask_manager_test.go | 2 +- .../controller/handlers/roles/role_service.go | 20 ++-- .../handlers/roles/role_service_test.go | 18 +-- .../handlers/scopes/scope_service.go | 20 ++-- .../handlers/scopes/scope_service_test.go | 14 +-- .../controller/handlers/subtypes_test.go | 4 +- .../controller/handlers/users/user_service.go | 16 +-- .../handlers/users/user_service_test.go | 16 +-- internal/servers/controller/listeners.go | 2 +- internal/servers/controller/testing.go | 6 +- .../servers/controller/worker_tls_config.go | 2 +- internal/servers/worker/cluster_tls.go | 2 +- internal/servers/worker/config.go | 4 +- internal/servers/worker/handler.go | 2 +- internal/servers/worker/worker.go | 4 +- scripts/build.sh | 12 +- scripts/uigen.sh | 6 +- testing/controller/controller.go | 4 +- version/version.go | 4 +- website/README.md | 4 +- website/data/metadata.js | 4 +- website/layouts/docs.jsx | 2 +- website/pages/docs/admin-console/index.mdx | 2 +- website/pages/docs/admin-console/login.mdx | 2 +- .../docs/architecture/concepts/actions.mdx | 4 +- .../architecture/concepts/auth-methods.mdx | 2 +- .../docs/architecture/concepts/grants.mdx | 2 +- .../docs/architecture/concepts/groups.mdx | 2 +- .../architecture/concepts/host-catalogs.mdx | 2 +- .../docs/architecture/concepts/host-sets.mdx | 2 +- .../docs/architecture/concepts/hosts.mdx | 4 +- .../docs/architecture/concepts/index.mdx | 4 +- .../architecture/concepts/organization.mdx | 2 +- .../docs/architecture/concepts/principals.mdx | 2 +- .../docs/architecture/concepts/projects.mdx | 2 +- .../docs/architecture/concepts/resources.mdx | 2 +- .../docs/architecture/concepts/roles.mdx | 2 +- .../docs/architecture/concepts/scopes.mdx | 2 +- .../docs/architecture/concepts/targets.mdx | 4 +- .../docs/architecture/concepts/users.mdx | 4 +- .../architecture/reference-architecture.mdx | 4 +- .../docs/architecture/security-model.mdx | 2 +- .../pages/docs/architecture/terminology.mdx | 2 +- website/pages/docs/command-line/index.mdx | 2 +- website/pages/docs/command-line/login.mdx | 2 +- website/pages/docs/index.mdx | 6 +- website/pages/docs/sdk/index.mdx | 2 +- website/pages/docs/sdk/login.mdx | 2 +- 321 files changed, 1295 insertions(+), 1300 deletions(-) rename cmd/{watchtower => boundary}/main.go (62%) diff --git a/.circleci/config.yml b/.circleci/config.yml index b115655fd..43d1f91a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: build: machine: image: 'ubuntu-1604:201903-01' - working_directory: ~/watchtower + working_directory: ~/boundary steps: - add_ssh_keys: fingerprints: diff --git a/Makefile b/Makefile index 06726072a..72ba7e134 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST)) THIS_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) TMP_DIR := $(shell mktemp -d) -REPO_PATH := github.com/hashicorp/watchtower +REPO_PATH := github.com/hashicorp/boundary GENERATED_CODE := $(shell find ${THIS_DIR} -name '*.gen.go' && find ${THIS_DIR} -name '*.pb.go' && find ${THIS_DIR} -name '*.pb.gw.go') @@ -24,8 +24,8 @@ cleangen: dev: BUILD_TAGS+=dev dev: BUILD_TAGS+=ui dev: build-ui-ifne - @echo "==> Building Watchtower with dev and UI features enabled" - @CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' WATCHTOWER_DEV_BUILD=1 sh -c "'$(CURDIR)/scripts/build.sh'" + @echo "==> Building Boundary with dev and UI features enabled" + @CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' BOUNDARY_DEV_BUILD=1 sh -c "'$(CURDIR)/scripts/build.sh'" build-ui: @scripts/uigen.sh diff --git a/README.md b/README.md index 1cbe8296e..45335cd24 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,49 @@ -# Watchtower +# Boundary ---- -**Please note**: We take Watchtower's security and our users' trust very -seriously. If you believe you have found a security issue in Watchtower, +**Please note**: We take Boundary's security and our users' trust very +seriously. If you believe you have found a security issue in Boundary, _please responsibly disclose_ by contacting us at [security@hashicorp.com](mailto:security@hashicorp.com). ---- -Watchtower is a tool for controlling access to networked resources in the +Boundary is a tool for controlling access to networked resources in the [SDP](https://en.wikipedia.org/wiki/Software_Defined_Perimeter) model. It is designed to be straightforward to understand, highly scalable, and resilient. It can run in clouds, on-prem, secure enclaves and more, and does not require an agent to be installed on every end host. -Unlike firewalls, Watchtower performs per-access authentication and +Unlike firewalls, Boundary performs per-access authentication and authorization checks, allowing for much higher level mappings of users to services or hosts than at network layers. Although complementary to secrets managers (like HashiCorp's own [Vault](https://www.vaultproject.io/)), -Watchtower fills a different niche, allowing the credential that is eventually +Boundary fills a different niche, allowing the credential that is eventually used to be hidden entirely from the user. Getting Started ------------------------------- -Watchtower consists of two server components: Controllers, which serve the API +Boundary consists of two server components: Controllers, which serve the API and coordinate session requests; and Workers, which perform the actual session -handling. A normal Watchtower installation will consist of one or more -Controllers paired with one or more Workers. A single Watchtower binary can act +handling. A normal Boundary installation will consist of one or more +Controllers paired with one or more Workers. A single Boundary binary can act in either of these two modes. -Additionally, Watchtower desktop clients are provided that simplify providing +Additionally, Boundary desktop clients are provided that simplify providing access to request and connect to authorized sessions from desktop machines. -Watchtower does _not_ require software to be installed on the endpoint hosts +Boundary does _not_ require software to be installed on the endpoint hosts and services. ## Requirements -Watchtower has two external dependencies: a SQL database, and one or more +Boundary has two external dependencies: a SQL database, and one or more KMSes. Both are readily available from cloud vendors, but can be satisfied by on-premise technologies as well. -* The database contains Watchtower's configuration and session information and +* The database contains Boundary's configuration and session information and must be accessible by Controller nodes. Values that are secrets (such as credentials) are encrypted in the database. Currently, PostgreSQL is supported as a database. This need can be satisfied by both hosted and @@ -60,7 +60,7 @@ on-premise technologies as well. decryption needs), and key derivation is used extensively to avoid key sprawl of these high-value keys. -Watchtower has a `dev` mode that can be used for testing. In this mode both a +Boundary has a `dev` mode that can be used for testing. In this mode both a Controller and Worker are started with a single command, and they have the following properties: @@ -69,30 +69,30 @@ following properties: Controller is (gracefully) shut down. * The Controller will use an internal KMS with an ephemeral key -## Trying out Watchtower -Running Watchtower in a more permanent context requires a few more steps, such +## Trying out Boundary +Running Boundary in a more permanent context requires a few more steps, such as writing some simple configuration files to tell the nodes how to reach their database and KMS. The steps below, along with the extra information for needed for permanent installations, are detailed in our [Installation Guide]. -### Build and Start Watchtower in Dev Mode +### Build and Start Boundary in Dev Mode If you have the following requirements met locally: - Golang v1.14 or greater - Docker -You can get up and running with Watchtower quickly. Simply run: +You can get up and running with Boundary quickly. Simply run: ```make dev``` -This will build Watchtower. Once complete, run Watchtower in `dev` mode: +This will build Boundary. Once complete, run Boundary in `dev` mode: - ```./$GOPATH/bin/watchtower dev``` + ```./$GOPATH/bin/boundary dev``` #### Specify a UI Commitish at Build Time The default UI build branch is `develop` from [the UI -repo](https://github.com/hashicorp/watchtower-ui). A different commitish from +repo](https://github.com/hashicorp/boundary-ui). A different commitish from which to build UI assets may be specified via the UI_COMMITISH environment variable. For example: @@ -103,11 +103,11 @@ variable. For example: Download the latest release of the server binary and appropriate desktop client(s) from our [releases page] -### Start Watchtower +### Start Boundary Start the server binary with: - ```watchtower dev``` + ```boundary dev``` This will start a Controller service listening on `http://127.0.0.1:9200` for incoming API requests and a Worker service listening on the same address/port for @@ -117,11 +117,11 @@ be used to log in. ### Configuring Resources -For a simple test of Watchtower in `dev` mode you don't generally need to +For a simple test of Boundary in `dev` mode you don't generally need to configure any resources at all! But it's useful to understand what `dev` mode did for you so you can then take further steps: -In Watchtower, a Set is a grouping of resources that share a similarity +In Boundary, a Set is a grouping of resources that share a similarity suitable for using in configuration; for instance, a User Set combines groups of users that should have equivalent permissions. Most Sets are automatically created and managed by Catalogs; for instance, an AWS Catalog can create Host @@ -138,36 +138,36 @@ you suitable for local testing: * A Permissions Set mapping the given User Set to a set of permissions, in this case granting access to make connections to resources * A Credentials Catalog with a default Credential Set that is empty (meaning - Watchtower will require and use the user's credentials when connecting to the + Boundary will require and use the user's credentials when connecting to the networked resource; in other words, in this situation it will run in a TCP-only mode) To actually make the connection to the networked resource, a Target must be defined. Targets group a Host Set, a Credential Set, and a User Set, which, along with validation against the permissions defined by relevant Permissions -Sets, together allow Watchtower to understand what user principals are allowed -to connect where and using what authentication information. A `dev` Watchtower +Sets, together allow Boundary to understand what user principals are allowed +to connect where and using what authentication information. A `dev` Boundary will create a default Target that allows the generated user to make SSH connections to the local machine on port 22. -You can of course go into Watchtower's web UI or use its API to change these +You can of course go into Boundary's web UI or use its API to change these default values, for instance if you instead want to connect to a different host or need to modify the port to connect to, or want to test out the capabilities -of Watchtower to supply the credentials for the session without user +of Boundary to supply the credentials for the session without user input/knowledge. ### Making the Connection -Next, let's actually make a connection to your local SSH daemon via Watchtower: +Next, let's actually make a connection to your local SSH daemon via Boundary: -3. Start the desktop client and point it at the local Watchtower `dev` session. +3. Start the desktop client and point it at the local Boundary `dev` session. Log in with the generated username and password. 4. You can now select the Target that grants access to the local machine and - hit "Request Session". Doing so will cause Watchtower to check whether this + hit "Request Session". Doing so will cause Boundary to check whether this action is allowed, and if so, send session information back to the client, allowing it to start a local authenticated proxy to the Worker. You will be shown a CLI command that can be copied and pasted into the CLI to connect to - the local machine via Watchtower. + the local machine via Boundary. 5. Paste the CLI command into your terminal, or use the given address and port in the SSH client of your choice, and connect! 6. When the session has ended, look in the given temporary directory to see @@ -180,9 +180,9 @@ This example is a simple way to get started but omits several key steps that could be taken in a production context: * Using a firewall or other means to restrict the set of hosts allowed to - connect to a local SSH daemon to only Watchtower Worker nodes, thereby making - Watchtower the _only_ means of ingress to a host -* Using credentials specified within Watchtower rather than the client's own + connect to a local SSH daemon to only Boundary Worker nodes, thereby making + Boundary the _only_ means of ingress to a host +* Using credentials specified within Boundary rather than the client's own credentials. Because these credentials are not divulged to users, even if a user gets around some network-level firewall or other restriction to gain direct network access to a host, they will be unable to authenticate. @@ -190,7 +190,7 @@ could be taken in a production context: `dev` mode by default is operating in a direct proxying mode, where it is simply passing the network streams along once the session has been authorized. -However, Watchtower is built to be flexible and eventually able to understand a +However, Boundary is built to be flexible and eventually able to understand a variety of networked protocols, with more capabilities to come in the future. We have a long roadmap planned out so stay tuned for information about new features and capabilities! diff --git a/api/authmethods/account.gen.go b/api/authmethods/account.gen.go index 2649cc4a5..91ec8bfc3 100644 --- a/api/authmethods/account.gen.go +++ b/api/authmethods/account.gen.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type Account struct { diff --git a/api/authmethods/authenticate.go b/api/authmethods/authenticate.go index 620d6930a..578053f4f 100644 --- a/api/authmethods/authenticate.go +++ b/api/authmethods/authenticate.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/authtokens" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/authtokens" ) -// TODO: This will need to be changed when we add Auth Method API to watchtower. We'll also need a better +// TODO: This will need to be changed when we add Auth Method API to boundary. We'll also need a better // way to handle different auth method types. func (c *authmethodsClient) Authenticate(ctx context.Context, authMethodId, name, password string, opt ...Option) (*authtokens.AuthToken, *api.Error, error) { if c.client == nil { diff --git a/api/authmethods/authenticate_test.go b/api/authmethods/authenticate_test.go index 3e655acec..38383c813 100644 --- a/api/authmethods/authenticate_test.go +++ b/api/authmethods/authenticate_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - "github.com/hashicorp/watchtower/api/authmethods" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api/authmethods" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api/authmethods/authmethods.gen.go b/api/authmethods/authmethods.gen.go index 8d9775ee3..7db7a5f8a 100644 --- a/api/authmethods/authmethods.gen.go +++ b/api/authmethods/authmethods.gen.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type AuthMethod struct { diff --git a/api/authmethods/option.gen.go b/api/authmethods/option.gen.go index 6bd66377d..42f96e3d9 100644 --- a/api/authmethods/option.gen.go +++ b/api/authmethods/option.gen.go @@ -1,7 +1,7 @@ package authmethods import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/authtokens/authtoken_test.go b/api/authtokens/authtoken_test.go index f9669aada..9bfec87bd 100644 --- a/api/authtokens/authtoken_test.go +++ b/api/authtokens/authtoken_test.go @@ -5,10 +5,10 @@ import ( "sort" "testing" - "github.com/hashicorp/watchtower/api/authmethods" - "github.com/hashicorp/watchtower/api/authtokens" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api/authmethods" + "github.com/hashicorp/boundary/api/authtokens" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api/authtokens/authtokens.gen.go b/api/authtokens/authtokens.gen.go index 27a7e092d..428cdf534 100644 --- a/api/authtokens/authtokens.gen.go +++ b/api/authtokens/authtokens.gen.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type AuthToken struct { diff --git a/api/authtokens/option.gen.go b/api/authtokens/option.gen.go index ede5c23e9..3911ad71a 100644 --- a/api/authtokens/option.gen.go +++ b/api/authtokens/option.gen.go @@ -1,7 +1,7 @@ package authtokens import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/client.go b/api/client.go index 701e27a5f..a130ffbe3 100644 --- a/api/client.go +++ b/api/client.go @@ -19,42 +19,42 @@ import ( "time" "unicode" + "github.com/hashicorp/boundary/api/internal/parseutil" cleanhttp "github.com/hashicorp/go-cleanhttp" retryablehttp "github.com/hashicorp/go-retryablehttp" rootcerts "github.com/hashicorp/go-rootcerts" - "github.com/hashicorp/watchtower/api/internal/parseutil" "golang.org/x/time/rate" ) -const EnvWatchtowerAddr = "WATCHTOWER_ADDR" -const EnvWatchtowerCACert = "WATCHTOWER_CACERT" -const EnvWatchtowerCAPath = "WATCHTOWER_CAPATH" -const EnvWatchtowerClientCert = "WATCHTOWER_CLIENT_CERT" -const EnvWatchtowerClientKey = "WATCHTOWER_CLIENT_KEY" -const EnvWatchtowerClientTimeout = "WATCHTOWER_CLIENT_TIMEOUT" -const EnvWatchtowerTLSInsecure = "WATCHTOWER_TLS_INSECURE" -const EnvWatchtowerTLSServerName = "WATCHTOWER_TLS_SERVER_NAME" -const EnvWatchtowerMaxRetries = "WATCHTOWER_MAX_RETRIES" -const EnvWatchtowerToken = "WATCHTOWER_TOKEN" -const EnvWatchtowerRateLimit = "WATCHTOWER_RATE_LIMIT" -const EnvWatchtowerSRVLookup = "WATCHTOWER_SRV_LOOKUP" -const EnvWatchtowerScopeId = "WATCHTOWER_SCOPE_ID" +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 EnvBoundaryScopeId = "BOUNDARY_SCOPE_ID" // Config is used to configure the creation of the client type Config struct { - // Addr is the address of the Watchtower controller. This should be a - // complete URL such as "http://watchtower.example.com". If you need a custom + // Addr is the address of the Boundary controller. This should be a + // complete URL such as "http://boundary.example.com". If you need a custom // SSL cert or want to enable insecure mode, you need to specify a custom // HttpClient. Addr string // Token is the client token that reuslts from authentication and can be - // used to make calls into Watchtower + // used to make calls into Boundary Token string - // HttpClient is the HTTP client to use. Watchtower sets sane defaults for + // HttpClient is the HTTP client to use. Boundary sets sane defaults for // the http.Client and its associated http.Transport created in - // DefaultConfig. If you must modify Watchtower's defaults, it is + // DefaultConfig. If you must modify Boundary's defaults, it is // suggested that you start with that client and modify as needed rather // than start with an empty client (or http.DefaultClient). HttpClient *http.Client @@ -103,20 +103,20 @@ type Config struct { } // TLSConfig contains the parameters needed to configure TLS on the HTTP client -// used to communicate with Watchtower. +// used to communicate with Boundary. type TLSConfig struct { // CACert is the path to a PEM-encoded CA cert file to use to verify the - // Watchtower server SSL certificate. + // Boundary server SSL certificate. CACert string // CAPath is the path to a directory of PEM-encoded CA cert files to verify - // the Watchtower server SSL certificate. + // the Boundary server SSL certificate. CAPath string - // ClientCert is the path to the certificate for Watchtower communication + // ClientCert is the path to the certificate for Boundary communication ClientCert string - // ClientKey is the path to the private key for Watchtower communication + // ClientKey is the path to the private key for Boundary communication ClientKey string // ServerName, if set, is used to set the SNI host when connecting via @@ -131,7 +131,7 @@ type TLSConfig struct { // safe to modify the return value of this function. // // The default Addr is https://127.0.0.1:9200, but this can be overridden by -// setting the `WATCHTOWER_ADDR` environment variable. +// setting the `BOUNDARY_ADDR` environment variable. // // If an error is encountered, this will return nil. func DefaultConfig() (*Config, error) { @@ -237,7 +237,7 @@ func (c *Config) setAddr(addr string) error { // Remove trailing or leading slashes path := strings.Trim(u.Path, "/") // Remove v1 in front or back (e.g. they could have - // https://watchtower.example.com/myinstall/v1 which would put it at the + // https://boundary.example.com/myinstall/v1 which would put it at the // back) path = strings.Trim(path, "v1") // Finally check again to make sure any slashes are removed before we join @@ -262,19 +262,19 @@ func (c *Config) ReadEnvironment() error { var envServerName string // Parse the environment variables - if v := os.Getenv(EnvWatchtowerAddr); v != "" { + if v := os.Getenv(EnvBoundaryAddr); v != "" { c.Addr = v } - if v := os.Getenv(EnvWatchtowerToken); v != "" { + if v := os.Getenv(EnvBoundaryToken); v != "" { c.Token = v } - if v := os.Getenv(EnvWatchtowerScopeId); v != "" { + if v := os.Getenv(EnvBoundaryScopeId); v != "" { c.ScopeId = v } - if v := os.Getenv(EnvWatchtowerMaxRetries); v != "" { + if v := os.Getenv(EnvBoundaryMaxRetries); v != "" { maxRetries, err := strconv.ParseUint(v, 10, 32) if err != nil { return err @@ -282,24 +282,24 @@ func (c *Config) ReadEnvironment() error { c.MaxRetries = int(maxRetries) } - if v := os.Getenv(EnvWatchtowerSRVLookup); v != "" { + if v := os.Getenv(EnvBoundarySRVLookup); v != "" { var err error lookup, err := strconv.ParseBool(v) if err != nil { - return fmt.Errorf("could not parse %s", EnvWatchtowerSRVLookup) + return fmt.Errorf("could not parse %s", EnvBoundarySRVLookup) } c.SRVLookup = lookup } - if t := os.Getenv(EnvWatchtowerClientTimeout); t != "" { + if t := os.Getenv(EnvBoundaryClientTimeout); t != "" { clientTimeout, err := parseutil.ParseDurationSecond(t) if err != nil { - return fmt.Errorf("could not parse %q", EnvWatchtowerClientTimeout) + return fmt.Errorf("could not parse %q", EnvBoundaryClientTimeout) } c.Timeout = clientTimeout } - if v := os.Getenv(EnvWatchtowerRateLimit); v != "" { + if v := os.Getenv(EnvBoundaryRateLimit); v != "" { rateLimit, burstLimit, err := parseRateLimit(v) if err != nil { return err @@ -310,31 +310,31 @@ func (c *Config) ReadEnvironment() error { // TLS Config { var foundTLSConfig bool - if v := os.Getenv(EnvWatchtowerCACert); v != "" { + if v := os.Getenv(EnvBoundaryCACert); v != "" { foundTLSConfig = true envCACert = v } - if v := os.Getenv(EnvWatchtowerCAPath); v != "" { + if v := os.Getenv(EnvBoundaryCAPath); v != "" { foundTLSConfig = true envCAPath = v } - if v := os.Getenv(EnvWatchtowerClientCert); v != "" { + if v := os.Getenv(EnvBoundaryClientCert); v != "" { foundTLSConfig = true envClientCert = v } - if v := os.Getenv(EnvWatchtowerClientKey); v != "" { + if v := os.Getenv(EnvBoundaryClientKey); v != "" { foundTLSConfig = true envClientKey = v } - if v := os.Getenv(EnvWatchtowerTLSInsecure); v != "" { + if v := os.Getenv(EnvBoundaryTLSInsecure); v != "" { foundTLSConfig = true var err error envInsecure, err = strconv.ParseBool(v) if err != nil { - return fmt.Errorf("could not parse WATCHTOWER_TLS_INSECURE") + return fmt.Errorf("could not parse BOUNDARY_TLS_INSECURE") } } - if v := os.Getenv(EnvWatchtowerTLSServerName); v != "" { + if v := os.Getenv(EnvBoundaryTLSServerName); v != "" { foundTLSConfig = true envServerName = v } @@ -361,7 +361,7 @@ func parseRateLimit(val string) (rate float64, burst int, err error) { if err != nil { rate, err = strconv.ParseFloat(val, 64) if err != nil { - err = fmt.Errorf("%v was provided but incorrectly formatted", EnvWatchtowerRateLimit) + err = fmt.Errorf("%v was provided but incorrectly formatted", EnvBoundaryRateLimit) } burst = int(rate) } @@ -369,7 +369,7 @@ func parseRateLimit(val string) (rate float64, burst int, err error) { return rate, burst, err } -// Client is the client to the Watchtower API. Create a client with NewClient. +// Client is the client to the Boundary API. Create a client with NewClient. type Client struct { modifyLock sync.RWMutex config *Config @@ -377,10 +377,10 @@ type Client struct { // NewClient returns a new client for the given configuration. // -// If the configuration is nil, Watchtower will use configuration from +// If the configuration is nil, Boundary will use configuration from // DefaultConfig(), which is the recommended starting configuration. // -// If the environment variable `WATCHTOWER_TOKEN` is present, the token will be +// If the environment variable `BOUNDARY_TOKEN` is present, the token will be // automatically added to the client. Otherwise, you must manually call // `SetToken()`. func NewClient(c *Config) (*Client, error) { @@ -421,9 +421,9 @@ func NewClient(c *Config) (*Client, error) { }, nil } -// Sets the address of Watchtower in the client. The format of address should +// Sets the address of Boundary in the client. The format of address should // be "://:". Setting this on a client will override the -// value of the WATCHTOWER_ADDR environment variable. +// value of the BOUNDARY_ADDR environment variable. func (c *Client) SetAddr(addr string) error { c.modifyLock.Lock() defer c.modifyLock.Unlock() @@ -595,7 +595,7 @@ func getBufferForJSON(val interface{}) (*bytes.Buffer, error) { return bytes.NewBuffer(b), nil } -// NewRequest creates a new raw request object to query the Watchtower controller +// NewRequest creates a new raw request object to query the Boundary controller // configured for this client. This is an advanced method and generally // doesn't need to be called externally. func (c *Client) NewRequest(ctx context.Context, method, requestPath string, body interface{}, opt ...Option) (*retryablehttp.Request, error) { @@ -742,7 +742,7 @@ func (c *Client) Do(r *retryablehttp.Request) (*Response, error) { return !unicode.IsPrint(c) }) if idx != -1 { - return nil, fmt.Errorf("configured Watchtower token contains non-printable characters and cannot be used") + return nil, fmt.Errorf("configured Boundary token contains non-printable characters and cannot be used") } if outputCurlString { @@ -803,9 +803,9 @@ func (c *Client) Do(r *retryablehttp.Request) (*Response, error) { "but the client is configured to use TLS. Please either enable TLS\n"+ "on the server or run the client with -address set to an address\n"+ "that uses the http protocol:\n\n"+ - " watchtower -address http://
\n\n"+ - "You can also set the WATCHTOWER_ADDR environment variable:\n\n\n"+ - " WATCHTOWER_ADDR=http://
watchtower \n\n"+ + " boundary -address http://
\n\n"+ + "You can also set the BOUNDARY_ADDR environment variable:\n\n\n"+ + " BOUNDARY_ADDR=http://
boundary \n\n"+ "where
is replaced by the actual address to the controller.", err) } diff --git a/api/groups/group.gen.go b/api/groups/group.gen.go index bb86e5128..2a6d4994c 100644 --- a/api/groups/group.gen.go +++ b/api/groups/group.gen.go @@ -10,8 +10,8 @@ import ( "github.com/kr/pretty" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type Group struct { diff --git a/api/groups/group_test.go b/api/groups/group_test.go index 401118175..29ef42442 100644 --- a/api/groups/group_test.go +++ b/api/groups/group_test.go @@ -5,12 +5,12 @@ import ( "net/http" "testing" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/groups" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/api/users" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/groups" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api/groups/option.gen.go b/api/groups/option.gen.go index 9b57a55cd..ad3586de4 100644 --- a/api/groups/option.gen.go +++ b/api/groups/option.gen.go @@ -1,7 +1,7 @@ package groups import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/hosts/host.gen.go b/api/hosts/host.gen.go index 0eff2d0c8..a9287e796 100644 --- a/api/hosts/host.gen.go +++ b/api/hosts/host.gen.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type Host struct { diff --git a/api/hosts/host_catalog.gen.go b/api/hosts/host_catalog.gen.go index 0cce885f6..6ab60dd06 100644 --- a/api/hosts/host_catalog.gen.go +++ b/api/hosts/host_catalog.gen.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type HostCatalog struct { diff --git a/api/hosts/option.gen.go b/api/hosts/option.gen.go index 8513743e5..4bdf0b507 100644 --- a/api/hosts/option.gen.go +++ b/api/hosts/option.gen.go @@ -1,7 +1,7 @@ package hosts import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/internal/genapi/input.go b/api/internal/genapi/input.go index bc981f8d3..e5d29a8e6 100644 --- a/api/internal/genapi/input.go +++ b/api/internal/genapi/input.go @@ -3,14 +3,14 @@ package main import ( "text/template" - "github.com/hashicorp/watchtower/internal/gen/controller/api" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/groups" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/roles" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/users" + "github.com/hashicorp/boundary/internal/gen/controller/api" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users" "google.golang.org/protobuf/proto" ) diff --git a/api/internal/genapi/parse.go b/api/internal/genapi/parse.go index 7c382d0fa..740ff7a55 100644 --- a/api/internal/genapi/parse.go +++ b/api/internal/genapi/parse.go @@ -10,7 +10,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + "github.com/hashicorp/boundary/internal/gen/controller/protooptions" "github.com/iancoleman/strcase" ) diff --git a/api/internal/genapi/templates.go b/api/internal/genapi/templates.go index f5e8dcf46..a8268f710 100644 --- a/api/internal/genapi/templates.go +++ b/api/internal/genapi/templates.go @@ -470,8 +470,8 @@ import ( "github.com/kr/pretty" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type {{ .Name }} struct { {{ range .Fields }} @@ -497,7 +497,7 @@ import ( "fmt" "time" - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/internal/parseutil/parseutil.go b/api/internal/parseutil/parseutil.go index c59f68215..09a28a9d7 100644 --- a/api/internal/parseutil/parseutil.go +++ b/api/internal/parseutil/parseutil.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/hashicorp/boundary/api/internal/strutil" "github.com/hashicorp/errwrap" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/watchtower/api/internal/strutil" "github.com/mitchellh/mapstructure" ) diff --git a/api/roles/option.gen.go b/api/roles/option.gen.go index 138fed101..ebb1c890f 100644 --- a/api/roles/option.gen.go +++ b/api/roles/option.gen.go @@ -1,7 +1,7 @@ package roles import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/roles/role.gen.go b/api/roles/role.gen.go index 5ce35190e..9aea2d9e7 100644 --- a/api/roles/role.gen.go +++ b/api/roles/role.gen.go @@ -10,8 +10,8 @@ import ( "github.com/kr/pretty" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type Role struct { diff --git a/api/roles/role_test.go b/api/roles/role_test.go index b62be2ea7..f3d81b722 100644 --- a/api/roles/role_test.go +++ b/api/roles/role_test.go @@ -5,14 +5,14 @@ import ( "net/http" "testing" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/groups" - "github.com/hashicorp/watchtower/api/internal/strutil" - "github.com/hashicorp/watchtower/api/roles" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/api/users" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/groups" + "github.com/hashicorp/boundary/api/internal/strutil" + "github.com/hashicorp/boundary/api/roles" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/api/scopes/option.gen.go b/api/scopes/option.gen.go index 8b9ff4f56..82fe83335 100644 --- a/api/scopes/option.gen.go +++ b/api/scopes/option.gen.go @@ -1,7 +1,7 @@ package scopes import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/scopes/project_test.go b/api/scopes/project_test.go index cb1965645..f59bcfa97 100644 --- a/api/scopes/project_test.go +++ b/api/scopes/project_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api/scopes/scope.gen.go b/api/scopes/scope.gen.go index 03a36c375..4bf3b0a9f 100644 --- a/api/scopes/scope.gen.go +++ b/api/scopes/scope.gen.go @@ -10,7 +10,7 @@ import ( "github.com/kr/pretty" - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) type Scope struct { diff --git a/api/users/option.gen.go b/api/users/option.gen.go index 28402c1f5..64287dcf9 100644 --- a/api/users/option.gen.go +++ b/api/users/option.gen.go @@ -1,7 +1,7 @@ package users import ( - "github.com/hashicorp/watchtower/api" + "github.com/hashicorp/boundary/api" ) // Option is a func that sets optional attributes for a call. This does not need diff --git a/api/users/user.gen.go b/api/users/user.gen.go index 5994eef65..56e37882c 100644 --- a/api/users/user.gen.go +++ b/api/users/user.gen.go @@ -10,8 +10,8 @@ import ( "github.com/kr/pretty" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/scopes" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/scopes" ) type User struct { diff --git a/api/users/user_test.go b/api/users/user_test.go index cef7578ad..af4b7ada0 100644 --- a/api/users/user_test.go +++ b/api/users/user_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/users" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/watchtower/main.go b/cmd/boundary/main.go similarity index 62% rename from cmd/watchtower/main.go rename to cmd/boundary/main.go index 2d55c0385..510ab7d08 100644 --- a/cmd/watchtower/main.go +++ b/cmd/boundary/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/hashicorp/watchtower/internal/cmd" + "github.com/hashicorp/boundary/internal/cmd" ) func main() { diff --git a/go.mod b/go.mod index 6f29a7dad..65680b853 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hashicorp/watchtower +module github.com/hashicorp/boundary go 1.13 diff --git a/internal/auth/auth.go b/internal/auth/auth.go index d5074d8f1..393029185 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + "github.com/hashicorp/boundary/internal/perms" + "github.com/hashicorp/boundary/internal/servers/controller/common" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - "github.com/hashicorp/watchtower/internal/perms" - "github.com/hashicorp/watchtower/internal/servers/controller/common" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" "github.com/kr/pretty" ) diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index 46623e215..bfe53b8be 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -7,11 +7,11 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/auth/db_test.go b/internal/auth/db_test.go index 61bbe7d70..0d92fbbaf 100644 --- a/internal/auth/db_test.go +++ b/internal/auth/db_test.go @@ -3,8 +3,8 @@ package auth import ( "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/account.go b/internal/auth/password/account.go index 9f6bb2285..af697a408 100644 --- a/internal/auth/password/account.go +++ b/internal/auth/password/account.go @@ -3,9 +3,9 @@ package password import ( "fmt" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" "google.golang.org/protobuf/proto" ) diff --git a/internal/auth/password/account_test.go b/internal/auth/password/account_test.go index e5654723e..ef9acbb44 100644 --- a/internal/auth/password/account_test.go +++ b/internal/auth/password/account_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/argon2.go b/internal/auth/password/argon2.go index 6539de065..1947778e4 100644 --- a/internal/auth/password/argon2.go +++ b/internal/auth/password/argon2.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-kms-wrapping/structwrapping" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" "golang.org/x/crypto/argon2" "google.golang.org/protobuf/proto" ) diff --git a/internal/auth/password/argon2_test.go b/internal/auth/password/argon2_test.go index 3130715af..01d09add7 100644 --- a/internal/auth/password/argon2_test.go +++ b/internal/auth/password/argon2_test.go @@ -5,9 +5,9 @@ import ( "errors" "testing" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/auth/password/authmethod.go b/internal/auth/password/authmethod.go index 97aa00c08..5a2d4be1f 100644 --- a/internal/auth/password/authmethod.go +++ b/internal/auth/password/authmethod.go @@ -3,9 +3,9 @@ package password import ( "fmt" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" "google.golang.org/protobuf/proto" ) diff --git a/internal/auth/password/authmethod_test.go b/internal/auth/password/authmethod_test.go index 863526e7b..650c480bc 100644 --- a/internal/auth/password/authmethod_test.go +++ b/internal/auth/password/authmethod_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/private_ids.go b/internal/auth/password/private_ids.go index b76a6eb0e..ea99286ca 100644 --- a/internal/auth/password/private_ids.go +++ b/internal/auth/password/private_ids.go @@ -3,7 +3,7 @@ package password import ( "fmt" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" ) // Prefixes for private ids for types in the password package. diff --git a/internal/auth/password/public_ids.go b/internal/auth/password/public_ids.go index 1d20b45ac..810884db9 100644 --- a/internal/auth/password/public_ids.go +++ b/internal/auth/password/public_ids.go @@ -3,7 +3,7 @@ package password import ( "fmt" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" ) // PublicId prefixes for the resources in the password package. diff --git a/internal/auth/password/repository.go b/internal/auth/password/repository.go index e6ac22119..a4045e5aa 100644 --- a/internal/auth/password/repository.go +++ b/internal/auth/password/repository.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/boundary/internal/db" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db" ) // A Repository stores and retrieves the persistent types in the password @@ -34,7 +34,7 @@ func NewRepository(r db.Reader, w db.Writer, wrapper wrapping.Wrapper, opt ...Op opts := getOpts(opt...) if opts.withLimit == 0 { - // zero signals the watchtower defaults should be used. + // zero signals the boundary defaults should be used. opts.withLimit = db.DefaultLimit } diff --git a/internal/auth/password/repository_account.go b/internal/auth/password/repository_account.go index 9b5c3c235..ca0e5c356 100644 --- a/internal/auth/password/repository_account.go +++ b/internal/auth/password/repository_account.go @@ -6,8 +6,8 @@ import ( "fmt" "regexp" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" ) // CreateAccount inserts a into the repository and returns a new diff --git a/internal/auth/password/repository_account_test.go b/internal/auth/password/repository_account_test.go index d905332aa..79730cc7f 100644 --- a/internal/auth/password/repository_account_test.go +++ b/internal/auth/password/repository_account_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/repository_authmethod.go b/internal/auth/password/repository_authmethod.go index 2dbecfbed..999bcced0 100644 --- a/internal/auth/password/repository_authmethod.go +++ b/internal/auth/password/repository_authmethod.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - dbcommon "github.com/hashicorp/watchtower/internal/db/common" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + dbcommon "github.com/hashicorp/boundary/internal/db/common" + "github.com/hashicorp/boundary/internal/oplog" ) // CreateAuthMethod inserts m into the repository and returns a new diff --git a/internal/auth/password/repository_authmethod_test.go b/internal/auth/password/repository_authmethod_test.go index eaef678cf..1a1ab5ab2 100644 --- a/internal/auth/password/repository_authmethod_test.go +++ b/internal/auth/password/repository_authmethod_test.go @@ -8,11 +8,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/auth/password/repository_configuration.go b/internal/auth/password/repository_configuration.go index 7a7aba21f..37b63fdd7 100644 --- a/internal/auth/password/repository_configuration.go +++ b/internal/auth/password/repository_configuration.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" ) // A Configuration is an interface holding one of the configuration types diff --git a/internal/auth/password/repository_configuration_test.go b/internal/auth/password/repository_configuration_test.go index bd5945e0d..8a1c2787d 100644 --- a/internal/auth/password/repository_configuration_test.go +++ b/internal/auth/password/repository_configuration_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/repository_password.go b/internal/auth/password/repository_password.go index dd263a4d3..84662b6ef 100644 --- a/internal/auth/password/repository_password.go +++ b/internal/auth/password/repository_password.go @@ -5,8 +5,8 @@ import ( "crypto/subtle" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" "golang.org/x/crypto/argon2" ) diff --git a/internal/auth/password/repository_password_test.go b/internal/auth/password/repository_password_test.go index 960bf0182..b23dfd7ff 100644 --- a/internal/auth/password/repository_password_test.go +++ b/internal/auth/password/repository_password_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/repository_test.go b/internal/auth/password/repository_test.go index 4aa4e2e98..700cb3d4a 100644 --- a/internal/auth/password/repository_test.go +++ b/internal/auth/password/repository_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" + "github.com/hashicorp/boundary/internal/db" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/password/store/argon2.pb.go b/internal/auth/password/store/argon2.pb.go index 71e14cb34..907ea694c 100644 --- a/internal/auth/password/store/argon2.pb.go +++ b/internal/auth/password/store/argon2.pb.go @@ -10,7 +10,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -342,12 +342,12 @@ var file_controller_storage_auth_password_store_v1_argon2_proto_rawDesc = []byte 0x06, 0x63, 0x74, 0x53, 0x61, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x73, 0x61, 0x6c, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x0a, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x42, 0x44, 0x5a, 0x42, + 0x52, 0x0a, 0x64, 0x65, 0x72, 0x69, 0x76, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, - 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, - 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/auth/password/store/password.pb.go b/internal/auth/password/store/password.pb.go index cd5109154..73a5c86dd 100644 --- a/internal/auth/password/store/password.pb.go +++ b/internal/auth/password/store/password.pb.go @@ -10,8 +10,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -327,12 +327,11 @@ var file_controller_storage_auth_password_store_v1_password_proto_rawDesc = []by 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, - 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, - 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2f, 0x73, - 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, + 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, + 0x75, 0x74, 0x68, 0x2f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2f, 0x73, 0x74, 0x6f, + 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/auth/password/testing.go b/internal/auth/password/testing.go index efbf2a67c..900487a54 100644 --- a/internal/auth/password/testing.go +++ b/internal/auth/password/testing.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/auth/password/testing_test.go b/internal/auth/password/testing_test.go index c8e121801..b985048b1 100644 --- a/internal/auth/password/testing_test.go +++ b/internal/auth/password/testing_test.go @@ -3,8 +3,8 @@ package password import ( "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/auth/store/account.pb.go b/internal/auth/store/account.pb.go index 58c20490c..e3371a8c0 100644 --- a/internal/auth/store/account.pb.go +++ b/internal/auth/store/account.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.12.3 +// protoc v3.12.4 // source: controller/storage/auth/store/v1/account.proto package store import ( proto "github.com/golang/protobuf/proto" - _ "github.com/hashicorp/watchtower/internal/db/timestamp" + _ "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -128,12 +128,11 @@ var file_controller_storage_auth_store_v1_account_proto_rawDesc = []byte{ 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0b, 0x69, 0x61, 0x6d, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x69, 0x61, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x42, 0x3b, 0x5a, - 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x73, - 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x28, 0x09, 0x52, 0x09, 0x69, 0x61, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x42, 0x39, 0x5a, + 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x73, 0x74, 0x6f, + 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/auth/store/auth_method.pb.go b/internal/auth/store/auth_method.pb.go index 4e0a15cfb..5c6a4852c 100644 --- a/internal/auth/store/auth_method.pb.go +++ b/internal/auth/store/auth_method.pb.go @@ -8,7 +8,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - _ "github.com/hashicorp/watchtower/internal/db/timestamp" + _ "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -185,11 +185,11 @@ var file_controller_storage_auth_store_v1_auth_method_proto_rawDesc = []byte{ 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x61, 0x6d, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0b, 0x69, 0x61, 0x6d, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x61, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x42, - 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, - 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, - 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, - 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, + 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x73, + 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/internal/authtoken/account.go b/internal/authtoken/account.go index 59b638118..195ae50bc 100644 --- a/internal/authtoken/account.go +++ b/internal/authtoken/account.go @@ -1,7 +1,7 @@ package authtoken import ( - authStore "github.com/hashicorp/watchtower/internal/auth/store" + authStore "github.com/hashicorp/boundary/internal/auth/store" "google.golang.org/protobuf/proto" ) diff --git a/internal/authtoken/authtoken.go b/internal/authtoken/authtoken.go index 6abf1303c..7b236609f 100644 --- a/internal/authtoken/authtoken.go +++ b/internal/authtoken/authtoken.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + "github.com/hashicorp/boundary/internal/authtoken/store" + "github.com/hashicorp/boundary/internal/db" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-kms-wrapping/structwrapping" "github.com/hashicorp/vault/sdk/helper/base62" - "github.com/hashicorp/watchtower/internal/authtoken/store" - "github.com/hashicorp/watchtower/internal/db" "google.golang.org/protobuf/proto" ) diff --git a/internal/authtoken/authtoken_test.go b/internal/authtoken/authtoken_test.go index 7c47b24bc..bd53299f2 100644 --- a/internal/authtoken/authtoken_test.go +++ b/internal/authtoken/authtoken_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/authtoken/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/authtoken/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/authtoken/gorm_test.go b/internal/authtoken/gorm_test.go index 320565066..4771826c8 100644 --- a/internal/authtoken/gorm_test.go +++ b/internal/authtoken/gorm_test.go @@ -3,7 +3,7 @@ package authtoken import ( "testing" - "github.com/hashicorp/watchtower/internal/authtoken/store" + "github.com/hashicorp/boundary/internal/authtoken/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/authtoken/immutable_fields_test.go b/internal/authtoken/immutable_fields_test.go index 9e2f6c099..fbae6c8a6 100644 --- a/internal/authtoken/immutable_fields_test.go +++ b/internal/authtoken/immutable_fields_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/authtoken/repository.go b/internal/authtoken/repository.go index 3d3a6e3f3..e8cf369ef 100644 --- a/internal/authtoken/repository.go +++ b/internal/authtoken/repository.go @@ -7,11 +7,11 @@ import ( "time" "github.com/golang/protobuf/ptypes" + "github.com/hashicorp/boundary/internal/authtoken/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/oplog" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/authtoken/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/oplog" ) // TODO (ICU-406): Make these fields configurable. @@ -45,7 +45,7 @@ func NewRepository(r db.Reader, w db.Writer, wrapper wrapping.Wrapper, opt ...Op opts := getOpts(opt...) if opts.withLimit == 0 { - // zero signals the watchtower defaults should be used. + // zero signals the boundary defaults should be used. opts.withLimit = db.DefaultLimit } return &Repository{ diff --git a/internal/authtoken/repository_test.go b/internal/authtoken/repository_test.go index e8001e83c..c71dd50c7 100644 --- a/internal/authtoken/repository_test.go +++ b/internal/authtoken/repository_test.go @@ -9,16 +9,16 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/oplog" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/testing/protocmp" - "github.com/hashicorp/watchtower/internal/authtoken/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/authtoken/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" ) func TestRepository_New(t *testing.T) { diff --git a/internal/authtoken/store/authtoken.pb.go b/internal/authtoken/store/authtoken.pb.go index 974b3e65b..73884e98e 100644 --- a/internal/authtoken/store/authtoken.pb.go +++ b/internal/authtoken/store/authtoken.pb.go @@ -8,7 +8,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -40,7 +40,7 @@ type AuthToken struct { // update_time from the RDBMS // @inject_tag: `gorm:"default:current_timestamp"` UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty" gorm:"default:current_timestamp"` - // last_access_time indicates the last time the auth token was used on the watchtower API. + // last_access_time indicates the last time the auth token was used on the boundary API. // @inject_tag: `gorm:"default:current_timestamp"` ApproximateLastAccessTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=approximate_last_access_time,json=approximateLastAccessTime,proto3" json:"approximate_last_access_time,omitempty" gorm:"default:current_timestamp"` // expiration_time indicates when this session will expire. @@ -227,11 +227,11 @@ var file_controller_storage_authtoken_store_v1_authtoken_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x0c, 0x61, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0b, 0x69, 0x61, 0x6d, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x61, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, - 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, - 0x68, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, - 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, + 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/authtoken/testing.go b/internal/authtoken/testing.go index b6381e19f..f0aca7e4c 100644 --- a/internal/authtoken/testing.go +++ b/internal/authtoken/testing.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" "github.com/jinzhu/gorm" "github.com/stretchr/testify/require" ) diff --git a/internal/cmd/base/base.go b/internal/cmd/base/base.go index fe19f5ee8..73d263e5a 100644 --- a/internal/cmd/base/base.go +++ b/internal/cmd/base/base.go @@ -16,8 +16,8 @@ import ( "sync" "syscall" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/authtokens" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/authtokens" "github.com/mitchellh/cli" "github.com/pkg/errors" "github.com/posener/complete" @@ -31,7 +31,7 @@ const ( // NotSetValue is a flag value for a not-set value NotSetValue = "(not set)" - envTokenName = "WATCHTOWER_TOKEN_NAME" + envTokenName = "BOUNDARY_TOKEN_NAME" ) // reRemoveWhitespace is a regular expression for stripping whitespace from @@ -159,7 +159,7 @@ func (c *Command) Client() (*api.Client, error) { } // Turn off retries on the CLI - if os.Getenv(api.EnvWatchtowerMaxRetries) == "" { + if os.Getenv(api.EnvBoundaryMaxRetries) == "" { c.client.SetMaxRetries(0) } @@ -169,7 +169,7 @@ func (c *Command) Client() (*api.Client, error) { tokenName = c.FlagTokenName } if tokenName != "none" { - token, err := keyring.Get("HashiCorp Watchtower Auth Token", tokenName) + token, err := keyring.Get("HashiCorp Boundary Auth Token", tokenName) if err != nil { if err == keyring.ErrNotFound { c.UI.Info("No saved credential found, continuing without") @@ -235,16 +235,16 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagNameAddr, Target: &c.flagAddr, Default: NotSetValue, - EnvVar: api.EnvWatchtowerAddr, + EnvVar: api.EnvBoundaryAddr, Completion: complete.PredictAnything, - Usage: "Addr of the Watchtower controller, as a complete URL (e.g. https://watchtower.example.com:9200).", + Usage: "Addr of the Boundary controller, as a complete URL (e.g. https://boundary.example.com:9200).", }) f.StringVar(&StringVar{ Name: FlagNameScope, Target: &c.flagScope, Default: NotSetValue, - EnvVar: api.EnvWatchtowerScopeId, + EnvVar: api.EnvBoundaryScopeId, Completion: complete.PredictAnything, Usage: `Scope in which to make the request. If not specified, will default to the scope of a saved token (if found), otherwise will default to "global".`, }) @@ -253,7 +253,7 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagNameCACert, Target: &c.flagTLSCACert, Default: NotSetValue, - EnvVar: api.EnvWatchtowerCACert, + EnvVar: api.EnvBoundaryCACert, Completion: complete.PredictFiles("*"), Usage: "Path on the local disk to a single PEM-encoded CA " + "certificate to verify the Controller or Worker's server's SSL certificate. This " + @@ -264,7 +264,7 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagNameCAPath, Target: &c.flagTLSCAPath, Default: NotSetValue, - EnvVar: api.EnvWatchtowerCAPath, + EnvVar: api.EnvBoundaryCAPath, Completion: complete.PredictDirs("*"), Usage: "Path on the local disk to a directory of PEM-encoded CA " + "certificates to verify the SSL certificate of the Controller.", @@ -274,10 +274,10 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagNameClientCert, Target: &c.flagTLSClientCert, Default: NotSetValue, - EnvVar: api.EnvWatchtowerClientCert, + EnvVar: api.EnvBoundaryClientCert, Completion: complete.PredictFiles("*"), Usage: "Path on the local disk to a single PEM-encoded CA " + - "certificate to use for TLS authentication to the Watchtower Controller. If " + + "certificate to use for TLS authentication to the Boundary Controller. If " + "this flag is specified, -client-key is also required.", }) @@ -285,7 +285,7 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagNameClientKey, Target: &c.flagTLSClientKey, Default: NotSetValue, - EnvVar: api.EnvWatchtowerClientKey, + EnvVar: api.EnvBoundaryClientKey, Completion: complete.PredictFiles("*"), Usage: "Path on the local disk to a single PEM-encoded private key " + "matching the client certificate from -client-cert.", @@ -295,19 +295,19 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: FlagTLSServerName, Target: &c.flagTLSServerName, Default: NotSetValue, - EnvVar: api.EnvWatchtowerTLSServerName, + EnvVar: api.EnvBoundaryTLSServerName, Completion: complete.PredictAnything, - Usage: "Name to use as the SNI host when connecting to the Watchtower " + + Usage: "Name to use as the SNI host when connecting to the Boundary " + "server via TLS.", }) f.BoolVar(&BoolVar{ Name: FlagNameTLSInsecure, Target: &c.flagTLSInsecure, - EnvVar: api.EnvWatchtowerTLSInsecure, + EnvVar: api.EnvBoundaryTLSInsecure, Usage: "Disable verification of TLS certificates. Using this option " + "is highly discouraged as it decreases the security of data " + - "transmissions to and from the Watchtower server.", + "transmissions to and from the Boundary server.", }) } @@ -350,7 +350,7 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets { Name: "format", Target: &c.flagFormat, Default: "table", - EnvVar: EnvWatchtowerCLIFormat, + EnvVar: EnvBoundaryCLIFormat, Completion: complete.PredictSet("table", "json", "yaml"), Usage: "Print the output in the given format. Valid formats " + "are \"table\", \"json\", or \"yaml\".", diff --git a/internal/cmd/base/const.go b/internal/cmd/base/const.go index a3cadcefc..16a8248d8 100644 --- a/internal/cmd/base/const.go +++ b/internal/cmd/base/const.go @@ -2,7 +2,7 @@ package base const ( // FlagNameAddr is the flag used in the base command to read in the - // address of the Watchtower server. + // address of the Boundary server. FlagNameAddr = "addr" // FlagNameScope is the flag used in the base command to read in the scope // in which to make a request. @@ -28,6 +28,6 @@ const ( ) const ( - EnvWatchtowerCLINoColor = `WATCHTOWER_CLI_NO_COLOR` - EnvWatchtowerCLIFormat = `WATCHTOWER_CLI_FORMAT` + EnvBoundaryCLINoColor = `BOUNDARY_CLI_NO_COLOR` + EnvBoundaryCLIFormat = `BOUNDARY_CLI_FORMAT` ) diff --git a/internal/cmd/base/format.go b/internal/cmd/base/format.go index 6486ae264..076035668 100644 --- a/internal/cmd/base/format.go +++ b/internal/cmd/base/format.go @@ -398,11 +398,11 @@ var Formatters = map[string]Formatter{ func Format(ui cli.Ui) string { switch t := ui.(type) { - case *WatchtowerUI: + case *BoundaryUI: return t.Format } - format := os.Getenv(EnvWatchtowerCLIFormat) + format := os.Getenv(EnvBoundaryCLIFormat) if format == "" { format = "table" } diff --git a/internal/cmd/base/listener.go b/internal/cmd/base/listener.go index c77b7221c..91538ea86 100644 --- a/internal/cmd/base/listener.go +++ b/internal/cmd/base/listener.go @@ -96,7 +96,7 @@ func tcpListenerFactory(l *configutil.Listener, logger hclog.Logger, ui cli.Ui) "addr": l.Address, } - if _, ok := os.LookupEnv("WATCHTOWER_LOG_CONNECTION_MUXING"); !ok { + if _, ok := os.LookupEnv("BOUNDARY_LOG_CONNECTION_MUXING"); !ok { logger = nil } alpnMux := alpnmux.New(ln, logger) diff --git a/internal/cmd/base/profiling_on.go b/internal/cmd/base/profiling_on.go index 3a00fc84d..30608032d 100644 --- a/internal/cmd/base/profiling_on.go +++ b/internal/cmd/base/profiling_on.go @@ -13,7 +13,7 @@ import ( ) func StartMemProfiler(logger hclog.Logger) { - profileDir := filepath.Join(os.TempDir(), "watchtowerprof") + profileDir := filepath.Join(os.TempDir(), "boundaryprof") if err := os.MkdirAll(profileDir, 0700); 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 8a54cf749..84afb28bc 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -14,6 +14,11 @@ import ( "sync" "github.com/armon/go-metrics" + "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/version" "github.com/hashicorp/errwrap" "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" @@ -25,11 +30,6 @@ import ( "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/sdk/helper/mlock" "github.com/hashicorp/vault/sdk/logical" - "github.com/hashicorp/watchtower/globals" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/version" "github.com/jinzhu/gorm" "github.com/mitchellh/cli" "google.golang.org/grpc/grpclog" @@ -107,7 +107,7 @@ func (b *Server) SetupLogging(flagLogLevel, flagLogFormat, configLogLevel, confi namedGRPCLogFaker := b.Logger.Named("grpclogfaker") grpclog.SetLogger(&GRPCLogFaker{ Logger: namedGRPCLogFaker, - Log: os.Getenv("WATCHTOWER_GRPC_LOGGING") != "", + Log: os.Getenv("BOUNDARY_GRPC_LOGGING") != "", }) b.Info["log level"] = logLevel.String() @@ -181,9 +181,9 @@ func (b *Server) SetupMetrics(ui cli.Ui, telemetry *configutil.Telemetry) error b.InmemSink, _, b.PrometheusEnabled, err = configutil.SetupTelemetry(&configutil.SetupTelemetryOpts{ Config: telemetry, Ui: ui, - ServiceName: "watchtower", - DisplayName: "Watchtower", - UserAgent: "watchtower", + ServiceName: "boundary", + DisplayName: "Boundary", + UserAgent: "boundary", }) if err != nil { return fmt.Errorf("Error initializing telemetry: %w", err) @@ -209,7 +209,7 @@ func (b *Server) PrintInfo(ui cli.Ui, mode string) { // Server configuration output padding := 24 sort.Strings(b.InfoKeys) - ui.Output(fmt.Sprintf("==> Watchtower %s configuration:\n", mode)) + ui.Output(fmt.Sprintf("==> Boundary %s configuration:\n", mode)) for _, k := range b.InfoKeys { ui.Output(fmt.Sprintf( "%s%s: %s", @@ -221,7 +221,7 @@ func (b *Server) PrintInfo(ui cli.Ui, mode string) { // Output the header that the server has started if !b.CombineLogs { - ui.Output(fmt.Sprintf("==> Watchtower %s started! Log data will stream in below:\n", mode)) + ui.Output(fmt.Sprintf("==> Boundary %s started! Log data will stream in below:\n", mode)) } } diff --git a/internal/cmd/base/ui.go b/internal/cmd/base/ui.go index 88f438587..abfb24064 100644 --- a/internal/cmd/base/ui.go +++ b/internal/cmd/base/ui.go @@ -7,7 +7,7 @@ import ( "golang.org/x/crypto/ssh/terminal" ) -type WatchtowerUI struct { +type BoundaryUI struct { cli.Ui Format string } diff --git a/internal/cmd/commands.go b/internal/cmd/commands.go index 8536047cd..176a212f0 100644 --- a/internal/cmd/commands.go +++ b/internal/cmd/commands.go @@ -5,15 +5,15 @@ import ( "os/signal" "syscall" - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/commands/authenticate" - "github.com/hashicorp/watchtower/internal/cmd/commands/config" - "github.com/hashicorp/watchtower/internal/cmd/commands/controller" - "github.com/hashicorp/watchtower/internal/cmd/commands/dev" - "github.com/hashicorp/watchtower/internal/cmd/commands/hosts" - "github.com/hashicorp/watchtower/internal/cmd/commands/roles" - "github.com/hashicorp/watchtower/internal/cmd/commands/scopes" - "github.com/hashicorp/watchtower/internal/cmd/commands/worker" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/commands/authenticate" + "github.com/hashicorp/boundary/internal/cmd/commands/config" + "github.com/hashicorp/boundary/internal/cmd/commands/controller" + "github.com/hashicorp/boundary/internal/cmd/commands/dev" + "github.com/hashicorp/boundary/internal/cmd/commands/hosts" + "github.com/hashicorp/boundary/internal/cmd/commands/roles" + "github.com/hashicorp/boundary/internal/cmd/commands/scopes" + "github.com/hashicorp/boundary/internal/cmd/commands/worker" "github.com/mitchellh/cli" ) diff --git a/internal/cmd/commands/authenticate/authenticate.go b/internal/cmd/commands/authenticate/authenticate.go index 7092c0b65..dec005b4a 100644 --- a/internal/cmd/commands/authenticate/authenticate.go +++ b/internal/cmd/commands/authenticate/authenticate.go @@ -1,7 +1,7 @@ package authenticate import ( - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/mitchellh/cli" "github.com/mitchellh/go-wordwrap" ) @@ -13,18 +13,18 @@ type Command struct { } func (c *Command) Synopsis() string { - return wordwrap.WrapString("Authenticate the Watchtower commandline client", base.TermWidth) + return wordwrap.WrapString("Authenticate the Boundary commandline client", base.TermWidth) } func (c *Command) Help() string { return base.WrapForHelpText([]string{ - "Usage: watchtower authenticate [sub command] [options] [args]", + "Usage: boundary authenticate [sub command] [options] [args]", "", - " This command authenticates the Watchtower commandline client using a specified auth method. Examples:", + " This command authenticates the Boundary commandline client using a specified auth method. Examples:", "", " Authenticate with password auth method:", "", - " $ watchtower authenticate password -name foo -password bar", + " $ boundary authenticate password -name foo -password bar", "", " Please see the auth method subcommand help for detailed usage information.", }) diff --git a/internal/cmd/commands/authenticate/password.go b/internal/cmd/commands/authenticate/password.go index 317f9da8d..334d0947b 100644 --- a/internal/cmd/commands/authenticate/password.go +++ b/internal/cmd/commands/authenticate/password.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/hashicorp/boundary/api/authmethods" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/vault/sdk/helper/password" - "github.com/hashicorp/watchtower/api/authmethods" - "github.com/hashicorp/watchtower/internal/cmd/base" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/mitchellh/go-wordwrap" @@ -21,9 +21,9 @@ import ( var _ cli.Command = (*PasswordCommand)(nil) var _ cli.CommandAutocomplete = (*PasswordCommand)(nil) -var envPassword = "WATCHTOWER_AUTHENTICATE_PASSWORD" -var envName = "WATCHTOWER_AUTHENTICATE_NAME" -var envMethodId = "WATCHTOWER_AUTHENTICATE_METHOD_ID" +var envPassword = "BOUNDARY_AUTHENTICATE_PASSWORD" +var envName = "BOUNDARY_AUTHENTICATE_NAME" +var envMethodId = "BOUNDARY_AUTHENTICATE_METHOD_ID" type PasswordCommand struct { *base.Command @@ -34,20 +34,20 @@ type PasswordCommand struct { } func (c *PasswordCommand) Synopsis() string { - return wordwrap.WrapString("Invoke the password auth method to authenticate with Watchtower", base.TermWidth) + return wordwrap.WrapString("Invoke the password auth method to authenticate with Boundary", base.TermWidth) } func (c *PasswordCommand) Help() string { return base.WrapForHelpText([]string{ - "Usage: watchtower authenticate password [options] [args]", + "Usage: boundary authenticate password [options] [args]", "", - " Invoke the password auth method to authenticate the Watchtower CLI:", + " Invoke the password auth method to authenticate the Boundary CLI:", "", - " $ watchtower authenticate password -name=foo -password=bar", + " $ boundary authenticate password -name=foo -password=bar", "", " If more than one instance of the password auth method exists, use the -method-id flag:", "", - ` $ watchtower authenticate password -method-id am_12345 -name foo -password "bar"`, + ` $ boundary authenticate password -method-id am_12345 -name foo -password "bar"`, }) + c.Flags().Help() } @@ -156,7 +156,7 @@ func (c *PasswordCommand) Run(args []string) int { c.UI.Error(fmt.Sprintf("Error marshaling auth token to save to system credential store: %s", err)) return 1 } - if err := keyring.Set("HashiCorp Watchtower Auth Token", tokenName, base64.RawStdEncoding.EncodeToString(marshaled)); err != nil { + if err := keyring.Set("HashiCorp Boundary Auth Token", tokenName, base64.RawStdEncoding.EncodeToString(marshaled)); err != nil { c.UI.Error(fmt.Sprintf("Error saving auth token to system credential store: %s", err)) return 1 } diff --git a/internal/cmd/commands/config/config.go b/internal/cmd/commands/config/config.go index 0412a96f0..89855b1f8 100644 --- a/internal/cmd/commands/config/config.go +++ b/internal/cmd/commands/config/config.go @@ -3,7 +3,7 @@ package config import ( "strings" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/mitchellh/cli" ) @@ -14,23 +14,23 @@ type Command struct { } func (c *Command) Synopsis() string { - return "Manage sensitive values in Watchtower's configuration files" + return "Manage sensitive values in Boundary's configuration files" } func (c *Command) Help() string { helpText := ` -Usage: watchtower config [options] [args] +Usage: boundary config [options] [args] - This command groups subcommands for operators interacting with Watchtower's + This command groups subcommands for operators interacting with Boundary's config files. Here are a few examples of config commands: Encrypt sensitive values in a config file: - $ watchtower config encrypt config.hcl + $ boundary config encrypt config.hcl Decrypt sensitive values in a config file: - $ watchtower config decrypt config.hcl + $ boundary config decrypt config.hcl Please see the individual subcommand help for detailed usage information.` diff --git a/internal/cmd/commands/config/encryptdecrypt.go b/internal/cmd/commands/config/encryptdecrypt.go index bd8057985..e9e5ad674 100644 --- a/internal/cmd/commands/config/encryptdecrypt.go +++ b/internal/cmd/commands/config/encryptdecrypt.go @@ -6,9 +6,9 @@ import ( "os" "strings" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/hashicorp/watchtower/internal/cmd/base" "github.com/mitchellh/cli" "github.com/posener/complete" ) @@ -38,9 +38,9 @@ func (c *EncryptDecryptCommand) Help() string { subCmd = "Encrypt" } helpText := ` -Usage: watchtower config %s [options] [args] +Usage: boundary config %s [options] [args] - %s sensitive values in a Watchtower's configuration file. These values must be marked + %s sensitive values in a Boundary's configuration file. These values must be marked with {{%s()}} as appropriate. This can only be used with string parameters, and the markers must be inside the quote marks delimiting the string; as an example: @@ -49,7 +49,7 @@ Usage: watchtower config %s [options] [args] By default this will print the new configuration out. To overwrite into the same file use the -overwrite flag. - $ watchtower config %s -overwrite config.hcl + $ boundary config %s -overwrite config.hcl ` helpText = fmt.Sprintf(helpText, strings.ToLower(subCmd), subCmd, strings.ToLower(subCmd), strings.ToLower(subCmd)) diff --git a/internal/cmd/commands/config/encryptdecrypt_test.go b/internal/cmd/commands/config/encryptdecrypt_test.go index a0e05d1c5..d0646cf79 100644 --- a/internal/cmd/commands/config/encryptdecrypt_test.go +++ b/internal/cmd/commands/config/encryptdecrypt_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/internal/cmd/commands/controller/controller.go b/internal/cmd/commands/controller/controller.go index 3cd4b7c23..97be99326 100644 --- a/internal/cmd/commands/controller/controller.go +++ b/internal/cmd/commands/controller/controller.go @@ -6,16 +6,16 @@ import ( "strings" "sync" + "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/servers/controller" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/sdk/helper/mlock" "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/hashicorp/watchtower/globals" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/config" - "github.com/hashicorp/watchtower/internal/servers/controller" "github.com/mitchellh/cli" "github.com/posener/complete" ) @@ -55,16 +55,16 @@ type Command struct { } func (c *Command) Synopsis() string { - return "Start a Watchtower controller" + return "Start a Boundary controller" } func (c *Command) Help() string { helpText := ` -Usage: watchtower controller [options] +Usage: boundary controller [options] Start a controller with a configuration file: - $ watchtower controller -config=/etc/watchtower/controller.hcl + $ boundary controller -config=/etc/boundary/controller.hcl For a full list of examples, please see the documentation. @@ -91,7 +91,7 @@ func (c *Command) Flags() *base.FlagSets { Name: "log-level", Target: &c.flagLogLevel, Default: base.NotSetValue, - EnvVar: "WATCHTOWER_LOG_LEVEL", + EnvVar: "BOUNDARY_LOG_LEVEL", Completion: complete.PredictSet("trace", "debug", "info", "warn", "err"), Usage: "Log verbosity level. Supported values (in order of more detail to less) are " + "\"trace\", \"debug\", \"info\", \"warn\", and \"err\".", @@ -149,14 +149,14 @@ func (c *Command) Flags() *base.FlagSets { f.StringVar(&base.StringVar{ Name: "dev-api-listen-address", Target: &c.flagDevControllerAPIListenAddr, - EnvVar: "WATCHTOWER_DEV_CONTROLLER_API_LISTEN_ADDRESS", + EnvVar: "BOUNDARY_DEV_CONTROLLER_API_LISTEN_ADDRESS", Usage: "Address to bind the controller to in \"dev\" mode for \"api\" purpose.", }) f.StringVar(&base.StringVar{ Name: "dev-cluster-listen-address", Target: &c.flagDevControllerClusterListenAddr, - EnvVar: "WATCHTOWER_DEV_CONTROLLER_CLUSTER_LISTEN_ADDRESS", + EnvVar: "BOUNDARY_DEV_CONTROLLER_CLUSTER_LISTEN_ADDRESS", Usage: "Address to bind the controller to in \"dev\" mode for \"cluster\" purpose.", }) @@ -216,14 +216,14 @@ func (c *Command) Run(args []string) int { } // If mlockall(2) isn't supported, show a warning. We disable this in dev - // because it is quite scary to see when first using Watchtower. We also disable + // because it is quite scary to see when first using Boundary. We also disable // this if the user has explicitly disabled mlock in configuration. if !c.flagDev && !c.Config.DisableMlock && !mlock.Supported() { c.UI.Warn(base.WrapAtLength( "WARNING! mlock is not supported on this system! An mlockall(2)-like " + "syscall to prevent memory from being swapped to disk is not " + - "supported on this system. For better security, only run Watchtower on " + - "systems where this call is supported. If you are running Watchtower" + + "supported on this system. For better security, only run Boundary on " + + "systems where this call is supported. If you are running Boundary" + "in a Docker container, provide the IPC_LOCK cap to the container.")) } @@ -452,7 +452,7 @@ func (c *Command) WaitForInterrupt() int { for !shutdownTriggered { select { case <-shutdownCh: - c.UI.Output("==> Watchtower controller shutdown triggered") + c.UI.Output("==> Boundary controller shutdown triggered") if err := c.controller.Shutdown(); err != nil { c.UI.Error(fmt.Errorf("Error with controller shutdown: %w", err).Error()) @@ -461,7 +461,7 @@ func (c *Command) WaitForInterrupt() int { shutdownTriggered = true case <-c.SighupCh: - c.UI.Output("==> Watchtower controller reload triggered") + c.UI.Output("==> Boundary controller reload triggered") // Check for new log level var level hclog.Level diff --git a/internal/cmd/commands/controller/dev_flags.go b/internal/cmd/commands/controller/dev_flags.go index 2723bb3a5..305b746ef 100644 --- a/internal/cmd/commands/controller/dev_flags.go +++ b/internal/cmd/commands/controller/dev_flags.go @@ -2,7 +2,7 @@ package controller -import "github.com/hashicorp/watchtower/internal/cmd/base" +import "github.com/hashicorp/boundary/internal/cmd/base" func init() { devOnlyControllerFlags = addDevOnlyControllerFlags @@ -12,7 +12,7 @@ func addDevOnlyControllerFlags(c *Command, f *base.FlagSet) { f.StringVar(&base.StringVar{ Name: "dev-passthrough-directory", Target: &c.flagDevPassthroughDirectory, - EnvVar: "WATCHTOWER_DEV_PASSTHROUGH_DIRECTORY", + EnvVar: "BOUNDARY_DEV_PASSTHROUGH_DIRECTORY", Usage: "Enables a passthrough directory in the webserver at /", }) } diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go index 02b61cfca..5bb01edef 100644 --- a/internal/cmd/commands/dev/dev.go +++ b/internal/cmd/commands/dev/dev.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/cmd/base" - controllercmd "github.com/hashicorp/watchtower/internal/cmd/commands/controller" - workercmd "github.com/hashicorp/watchtower/internal/cmd/commands/worker" - "github.com/hashicorp/watchtower/internal/cmd/config" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/cmd/base" + controllercmd "github.com/hashicorp/boundary/internal/cmd/commands/controller" + workercmd "github.com/hashicorp/boundary/internal/cmd/commands/worker" + "github.com/hashicorp/boundary/internal/cmd/config" "github.com/mitchellh/cli" "github.com/posener/complete" ) @@ -45,16 +45,16 @@ type Command struct { } func (c *Command) Synopsis() string { - return "Start a Watchtower dev environment" + return "Start a Boundary dev environment" } func (c *Command) Help() string { helpText := ` -Usage: watchtower dev [options] +Usage: boundary dev [options] Start a dev environment: - $ watchtower dev + $ boundary dev For a full list of examples, please see the documentation. @@ -71,7 +71,7 @@ func (c *Command) Flags() *base.FlagSets { Name: "log-level", Target: &c.flagLogLevel, Default: base.NotSetValue, - EnvVar: "WATCHTOWER_LOG_LEVEL", + EnvVar: "BOUNDARY_LOG_LEVEL", Completion: complete.PredictSet("trace", "debug", "info", "warn", "err"), Usage: "Log verbosity level. Supported values (in order of more detail to less) are " + "\"trace\", \"debug\", \"info\", \"warn\", and \"err\".", @@ -122,14 +122,14 @@ func (c *Command) Flags() *base.FlagSets { f.StringVar(&base.StringVar{ Name: "dev-api-listen-address", Target: &c.flagDevControllerAPIListenAddr, - EnvVar: "WATCHTOWER_DEV_CONTROLLER_API_LISTEN_ADDRESS", + EnvVar: "BOUNDARY_DEV_CONTROLLER_API_LISTEN_ADDRESS", Usage: "Address to bind to for controller \"api\" purpose.", }) f.StringVar(&base.StringVar{ Name: "dev-cluster-listen-address", Target: &c.flagDevControllerClusterListenAddr, - EnvVar: "WATCHTOWER_DEV_CONTROLLER_CLUSTER_LISTEN_ADDRESS", + EnvVar: "BOUNDARY_DEV_CONTROLLER_CLUSTER_LISTEN_ADDRESS", Usage: "Address to bind to for controller \"cluster\" purpose.", }) @@ -321,7 +321,7 @@ func (c *Command) Run(args []string) int { for !shutdownTriggered { select { case <-c.ShutdownCh: - c.UI.Output("==> Watchtower dev environment shutdown triggered") + c.UI.Output("==> Boundary dev environment shutdown triggered") childShutdownCh <- struct{}{} childShutdownCh <- struct{}{} @@ -329,7 +329,7 @@ func (c *Command) Run(args []string) int { shutdownTriggered = true case <-c.SighupCh: - c.UI.Output("==> Watchtower dev environment reload triggered") + c.UI.Output("==> Boundary dev environment reload triggered") for _, v := range c.childSighupCh { v <- struct{}{} } diff --git a/internal/cmd/commands/dev/dev_flags.go b/internal/cmd/commands/dev/dev_flags.go index 0cb86cb2f..9c34b6f90 100644 --- a/internal/cmd/commands/dev/dev_flags.go +++ b/internal/cmd/commands/dev/dev_flags.go @@ -2,7 +2,7 @@ package dev -import "github.com/hashicorp/watchtower/internal/cmd/base" +import "github.com/hashicorp/boundary/internal/cmd/base" func init() { devOnlyControllerFlags = addDevOnlyControllerFlags @@ -12,7 +12,7 @@ func addDevOnlyControllerFlags(c *Command, f *base.FlagSet) { f.StringVar(&base.StringVar{ Name: "dev-passthrough-directory", Target: &c.flagDevPassthroughDirectory, - EnvVar: "WATCHTOWER_DEV_PASSTHROUGH_DIRECTORY", + EnvVar: "BOUNDARY_DEV_PASSTHROUGH_DIRECTORY", Usage: "Enables a passthrough directory in the webserver at /", }) } diff --git a/internal/cmd/commands/hosts/host_create.go b/internal/cmd/commands/hosts/host_create.go index f2db96919..6a8fc0ba6 100644 --- a/internal/cmd/commands/hosts/host_create.go +++ b/internal/cmd/commands/hosts/host_create.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/api/hosts" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api/hosts" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/posener/complete" @@ -29,14 +29,14 @@ func (c *CreateCommand) Synopsis() string { func (c *CreateCommand) Help() string { helpText := ` -Usage: watchtower hosts create +Usage: boundary hosts create Creates a host in the given host catalog. This command will result in an error for any catalog that does not support manual host creation. Example: - $ watchtower hosts create -catalog-id= -address= -name= + $ boundary hosts create -catalog-id= -address= -name= ` + c.Flags().Help() diff --git a/internal/cmd/commands/roles/funcs.go b/internal/cmd/commands/roles/funcs.go index 351d1c3d7..0f90c2865 100644 --- a/internal/cmd/commands/roles/funcs.go +++ b/internal/cmd/commands/roles/funcs.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "github.com/hashicorp/watchtower/api/roles" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api/roles" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/mitchellh/go-wordwrap" ) func synopsisFunc(inFunc string) string { if inFunc == "" { - return wordwrap.WrapString("Manage Watchtower roles", base.TermWidth) + return wordwrap.WrapString("Manage Boundary roles", base.TermWidth) } - return wordwrap.WrapString(fmt.Sprintf("%s a role within Watchtower", textproto.CanonicalMIMEHeaderKey(inFunc)), base.TermWidth) + return wordwrap.WrapString(fmt.Sprintf("%s a role within Boundary", textproto.CanonicalMIMEHeaderKey(inFunc)), base.TermWidth) } func principalsGrantsSynopsisFunc(inFunc string, principals bool) string { @@ -32,22 +32,22 @@ func principalsGrantsSynopsisFunc(inFunc string, principals bool) string { case strings.HasPrefix(inFunc, "remove"): in = fmt.Sprintf("Remove %s from", switchStr) } - return wordwrap.WrapString(fmt.Sprintf("%s a role within Watchtower", in), base.TermWidth) + return wordwrap.WrapString(fmt.Sprintf("%s a role within Boundary", in), base.TermWidth) } func baseHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles [sub command] [options] [args]", + "Usage: boundary roles [sub command] [options] [args]", "", - " This command allows operations on Watchtower roles. Examples:", + " This command allows operations on Boundary roles. Examples:", "", " Create a role:", "", - ` $ watchtower roles create -name foo -description "For ProdOps usage"`, + ` $ boundary roles create -name foo -description "For ProdOps usage"`, "", " Add a grant to a role:", "", - ` $ watchtower roles add-grants -id r_1234567890 -grant "type=host-catalog;actions=create,delete"`, + ` $ boundary roles add-grants -id r_1234567890 -grant "type=host-catalog;actions=create,delete"`, "", " Please see the role subcommand help for detailed usage information.", }) @@ -55,11 +55,11 @@ func baseHelp() string { func createHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles create [options] [args]", + "Usage: boundary roles create [options] [args]", "", " Create a role. Example:", "", - ` $ watchtower roles create -name ops -description "Role for ops grants"`, + ` $ boundary roles create -name ops -description "Role for ops grants"`, "", "", }) @@ -67,71 +67,71 @@ func createHelp() string { func updateHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles update [options] [args]", + "Usage: boundary roles update [options] [args]", "", " Update a role given its ID. Example:", "", - ` $ watchtower roles update -id r_1234567890 -description "Development host grants"`, + ` $ boundary roles update -id r_1234567890 -description "Development host grants"`, }) } func readHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles read [options] [args]", + "Usage: boundary roles read [options] [args]", "", " Read a role given its ID. Example:", "", - ` $ watchtower roles read -id r_1234567890`, + ` $ boundary roles read -id r_1234567890`, }) } func deleteHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles delete [options] [args]", + "Usage: boundary roles delete [options] [args]", "", " Delete a role given its ID. Example:", "", - ` $ watchtower roles delete -id r_1234567890`, + ` $ boundary roles delete -id r_1234567890`, }) } func listHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles list [options] [args]", + "Usage: boundary roles list [options] [args]", "", " List roles within a scope. Example:", "", - ` $ watchtower roles list -org o_1234567890`, + ` $ boundary roles list -org o_1234567890`, }) } func addPrincipalsHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles add-principals [options] [args]", + "Usage: boundary roles add-principals [options] [args]", "", ` Adds principals (users, groups) to a role given its ID. The "user" and "group" flags can be specified multiple times. Example:`, "", - ` $ watchtower roles add-principals -id r_1234567890 -user u_1234567890`, + ` $ boundary roles add-principals -id r_1234567890 -user u_1234567890`, }) } func setPrincipalsHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles set-principals [options] [args]", + "Usage: boundary roles set-principals [options] [args]", "", ` Sets the complete set of principals (users, groups) on a role given its ID. The "user" and "group" flags can be specified multiple times. Example:`, "", - ` $ watchtower roles set-principals -id r_1234567890 -user u_anon -group sg_1234567890`, + ` $ boundary roles set-principals -id r_1234567890 -user u_anon -group sg_1234567890`, }) } func removePrincipalsHelp() string { return base.WrapForHelpText([]string{ - "Usage: watchtower roles remove-principals [options] [args]", + "Usage: boundary roles remove-principals [options] [args]", "", ` Removes principals (users, groups) from a role given its ID. The "user" and "group" flags can be specified multiple times. Example:`, "", - ` $ watchtower roles remove-principals -id r_1234567890 -group sg_1234567890`, + ` $ boundary roles remove-principals -id r_1234567890 -group sg_1234567890`, }) } diff --git a/internal/cmd/commands/roles/role.go b/internal/cmd/commands/roles/role.go index c0c073ede..8076f215c 100644 --- a/internal/cmd/commands/roles/role.go +++ b/internal/cmd/commands/roles/role.go @@ -3,11 +3,11 @@ package roles import ( "fmt" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/api/roles" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/api/roles" - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/perms" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/posener/complete" @@ -39,7 +39,7 @@ func (c *Command) Synopsis() string { case "add-grants", "set-grants", "remove-grants": return principalsGrantsSynopsisFunc(c.Func, false) } - return "Manage Watchtower roles" + return "Manage Boundary roles" } var helpMap = map[string]func() string{ diff --git a/internal/cmd/commands/scopes/create.go b/internal/cmd/commands/scopes/create.go index 040138d94..af9289122 100644 --- a/internal/cmd/commands/scopes/create.go +++ b/internal/cmd/commands/scopes/create.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/posener/complete" @@ -27,14 +27,14 @@ func (c *CreateScopeCommand) Synopsis() string { func (c *CreateScopeCommand) Help() string { helpText := ` -Usage: watchtower scopes create +Usage: boundary scopes create Creates a new scope within the scope specified by the ID from the "scope" parameter or the associated environment variable. Example: - $ watchtower scopes create -scope= -name= + $ boundary scopes create -scope= -name= ` + c.Flags().Help() diff --git a/internal/cmd/commands/scopes/funcs.go b/internal/cmd/commands/scopes/funcs.go index 687a94746..7a7e6ede5 100644 --- a/internal/cmd/commands/scopes/funcs.go +++ b/internal/cmd/commands/scopes/funcs.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/internal/cmd/base" ) func printScope(in *scopes.Scope) string { diff --git a/internal/cmd/commands/scopes/read.go b/internal/cmd/commands/scopes/read.go index d475315d7..71427cb87 100644 --- a/internal/cmd/commands/scopes/read.go +++ b/internal/cmd/commands/scopes/read.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/api/scopes" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/posener/complete" @@ -26,13 +26,13 @@ func (c *ReadScopeCommand) Synopsis() string { func (c *ReadScopeCommand) Help() string { helpText := ` -Usage: watchtower scopes read +Usage: boundary scopes read Returns information about a scope specified by the ID. The request will take place within the scope of the caller's authentication token. Example: - $ watchtower scopes read -id= + $ boundary scopes read -id= ` + c.Flags().Help() diff --git a/internal/cmd/commands/worker/worker.go b/internal/cmd/commands/worker/worker.go index 222d95f91..7f81c4d41 100644 --- a/internal/cmd/commands/worker/worker.go +++ b/internal/cmd/commands/worker/worker.go @@ -6,13 +6,13 @@ import ( "strings" "sync" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/sdk/helper/mlock" - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/config" - "github.com/hashicorp/watchtower/internal/servers/worker" "github.com/mitchellh/cli" "github.com/posener/complete" ) @@ -44,16 +44,16 @@ type Command struct { } func (c *Command) Synopsis() string { - return "Start a Watchtower worker" + return "Start a Boundary worker" } func (c *Command) Help() string { helpText := ` -Usage: watchtower worker [options] +Usage: boundary worker [options] Start a worker with a configuration file: - $ watchtower worker -config=/etc/watchtower/worker.hcl + $ boundary worker -config=/etc/boundary/worker.hcl For a full list of examples, please see the documentation. @@ -80,7 +80,7 @@ func (c *Command) Flags() *base.FlagSets { Name: "log-level", Target: &c.flagLogLevel, Default: base.NotSetValue, - EnvVar: "WATCHTOWER_LOG_LEVEL", + EnvVar: "BOUNDARY_LOG_LEVEL", Completion: complete.PredictSet("trace", "debug", "info", "warn", "err"), Usage: "Log verbosity level. Supported values (in order of more detail to less) are " + "\"trace\", \"debug\", \"info\", \"warn\", and \"err\".", @@ -106,7 +106,7 @@ func (c *Command) Flags() *base.FlagSets { f.StringVar(&base.StringVar{ Name: "dev-listen-address", Target: &c.flagDevWorkerListenAddr, - EnvVar: "WATCHTOWER_DEV_WORKER_LISTEN_ADDRESS", + EnvVar: "BOUNDARY_DEV_WORKER_LISTEN_ADDRESS", Usage: "Address to bind the worker to in \"dev\" mode.", }) @@ -157,14 +157,14 @@ func (c *Command) Run(args []string) int { } // If mlockall(2) isn't supported, show a warning. We disable this in dev - // because it is quite scary to see when first using Watchtower. We also disable + // because it is quite scary to see when first using Boundary. We also disable // this if the user has explicitly disabled mlock in configuration. if !c.flagDev && !c.Config.DisableMlock && !mlock.Supported() { c.UI.Warn(base.WrapAtLength( "WARNING! mlock is not supported on this system! An mlockall(2)-like " + "syscall to prevent memory from being swapped to disk is not " + - "supported on this system. For better security, only run Watchtower on " + - "systems where this call is supported. If you are running Watchtower" + + "supported on this system. For better security, only run Boundary on " + + "systems where this call is supported. If you are running Boundary" + "in a Docker container, provide the IPC_LOCK cap to the container.")) } @@ -287,7 +287,7 @@ func (c *Command) WaitForInterrupt() int { for !shutdownTriggered { select { case <-shutdownCh: - c.UI.Output("==> Watchtower worker shutdown triggered") + c.UI.Output("==> Boundary worker shutdown triggered") if err := c.worker.Shutdown(); err != nil { c.UI.Error(fmt.Errorf("Error with worker shutdown: %w", err).Error()) @@ -296,7 +296,7 @@ func (c *Command) WaitForInterrupt() int { shutdownTriggered = true case <-c.SighupCh: - c.UI.Output("==> Watchtower worker reload triggered") + c.UI.Output("==> Boundary worker reload triggered") // Check for new log level var level hclog.Level diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index d3e8b3333..0a416f72b 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -69,7 +69,7 @@ worker { ` ) -// Config is the configuration for the watchtower controller +// Config is the configuration for the boundary controller type Config struct { *configutil.SharedConfig `hcl:"-"` @@ -85,7 +85,7 @@ type Worker struct { Controllers []string `hcl:"controllers"` } -// DevWorker is a Config that is used for dev mode of Watchtower +// DevWorker is a Config that is used for dev mode of Boundary // workers func DevWorker() (*Config, error) { parsed, err := Parse(devConfig + devWorkerExtraConfig) @@ -112,7 +112,7 @@ func devKeyGeneration() (string, string) { return controllerKey, workerAuthKey } -// DevController is a Config that is used for dev mode of Watchtower +// DevController is a Config that is used for dev mode of Boundary // controllers func DevController() (*Config, error) { controllerKey, workerAuthKey := devKeyGeneration() diff --git a/internal/cmd/main.go b/internal/cmd/main.go index 8b7346c9e..e504a5a11 100644 --- a/internal/cmd/main.go +++ b/internal/cmd/main.go @@ -12,8 +12,8 @@ import ( "text/tabwriter" "github.com/fatih/color" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/internal/cmd/base" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/internal/cmd/base" colorable "github.com/mattn/go-colorable" "github.com/mitchellh/cli" ) @@ -57,10 +57,10 @@ func setupEnv(args []string) (retArgs []string, format string, outputCurlString } } - envWatchtowerCLIFormat := os.Getenv(base.EnvWatchtowerCLIFormat) + envBoundaryCLIFormat := os.Getenv(base.EnvBoundaryCLIFormat) // If we did not parse a value, fetch the env var - if format == "" && envWatchtowerCLIFormat != "" { - format = envWatchtowerCLIFormat + if format == "" && envBoundaryCLIFormat != "" { + format = envBoundaryCLIFormat } // Lowercase for consistency format = strings.ToLower(format) @@ -94,7 +94,7 @@ func RunCustom(args []string, runOpts *RunOptions) int { // Don't use color if disabled useColor := true - if os.Getenv(base.EnvWatchtowerCLINoColor) != "" || color.NoColor { + if os.Getenv(base.EnvBoundaryCLINoColor) != "" || color.NoColor { useColor = false } @@ -123,7 +123,7 @@ func RunCustom(args []string, runOpts *RunOptions) int { uiErrWriter = ioutil.Discard } - ui := &base.WatchtowerUI{ + ui := &base.BoundaryUI{ Ui: &cli.ColoredUi{ ErrorColor: cli.UiColorRed, WarnColor: cli.UiColorYellow, @@ -136,7 +136,7 @@ func RunCustom(args []string, runOpts *RunOptions) int { Format: format, } - serverCmdUi := &base.WatchtowerUI{ + serverCmdUi := &base.BoundaryUI{ Ui: &cli.ColoredUi{ ErrorColor: cli.UiColorRed, WarnColor: cli.UiColorYellow, @@ -158,11 +158,11 @@ func RunCustom(args []string, runOpts *RunOptions) int { hiddenCommands := []string{"version"} cli := &cli.CLI{ - Name: "watchtower", + Name: "boundary", Args: args, Commands: Commands, HelpFunc: groupedHelpFunc( - cli.BasicHelpFunc("watchtower"), + cli.BasicHelpFunc("boundary"), ), HelpWriter: runOpts.Stderr, HiddenCommands: hiddenCommands, @@ -206,7 +206,7 @@ func groupedHelpFunc(f cli.HelpFunc) cli.HelpFunc { var b bytes.Buffer tw := tabwriter.NewWriter(&b, 0, 2, 6, ' ', 0) - fmt.Fprintf(tw, "Usage: watchtower [args]\n\n") + fmt.Fprintf(tw, "Usage: boundary [args]\n\n") fmt.Fprintf(tw, "Common commands:\n") for _, v := range commonCommands { printCommand(tw, v, commands[v]) diff --git a/internal/db/assert/asserts.go b/internal/db/assert/asserts.go index 55d013eb8..f567e53e5 100644 --- a/internal/db/assert/asserts.go +++ b/internal/db/assert/asserts.go @@ -3,8 +3,8 @@ package dbassert import ( dbassert "github.com/hashicorp/dbassert" + "github.com/hashicorp/boundary/internal/db" gormAssert "github.com/hashicorp/dbassert/gorm" - "github.com/hashicorp/watchtower/internal/db" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/assert/asserts_test.go b/internal/db/assert/asserts_test.go index 2ad705ea8..861261be6 100644 --- a/internal/db/assert/asserts_test.go +++ b/internal/db/assert/asserts_test.go @@ -6,7 +6,7 @@ import ( dbassert "github.com/hashicorp/dbassert" gormAssert "github.com/hashicorp/dbassert/gorm" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/assert/docs.go b/internal/db/assert/docs.go index 8ef881bac..27ce15d26 100644 --- a/internal/db/assert/docs.go +++ b/internal/db/assert/docs.go @@ -1,4 +1,4 @@ -// Package dbassert provides a set of assertions for testing the watchtower database +// Package dbassert provides a set of assertions for testing the boundary database // applications. // // Example Usage: diff --git a/internal/db/common/update_test.go b/internal/db/common/update_test.go index e1c69cf86..c715176f7 100644 --- a/internal/db/common/update_test.go +++ b/internal/db/common/update_test.go @@ -3,9 +3,9 @@ package common import ( "testing" + "github.com/hashicorp/boundary/internal/db/db_test" "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/sdk/helper/base62" - "github.com/hashicorp/watchtower/internal/db/db_test" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/db.go b/internal/db/db.go index 3c62f7e36..0d1aec9f3 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/golang-migrate/migrate/v4" + "github.com/hashicorp/boundary/internal/db/migrations" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/watchtower/internal/db/migrations" "github.com/jinzhu/gorm" "github.com/lib/pq" "github.com/ory/dockertest/v3" @@ -91,7 +91,7 @@ func StartDbInDocker(dialect string) (cleanup func() error, retURL, container st var url string switch dialect { case "postgres": - resource, err = pool.Run("postgres", "latest", []string{"POSTGRES_PASSWORD=secret", "POSTGRES_DB=watchtower"}) + resource, err = pool.Run("postgres", "latest", []string{"POSTGRES_PASSWORD=secret", "POSTGRES_DB=boundary"}) url = "postgres://postgres:secret@localhost:%s?sslmode=disable" default: panic(fmt.Sprintf("unknown dialect %q", dialect)) diff --git a/internal/db/db_test/db_test.pb.go b/internal/db/db_test/db_test.pb.go index d306d5c82..c11e45725 100644 --- a/internal/db/db_test/db_test.pb.go +++ b/internal/db/db_test/db_test.pb.go @@ -5,14 +5,14 @@ // source: controller/storage/db/db_test/v1/db_test.proto // define a test proto package for the internal/db package. These protos -// are only used for unit tests and are not part of the rest of the watchtower +// are only used for unit tests and are not part of the rest of the boundary // domain model package db_test import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -540,12 +540,12 @@ var file_controller_storage_db_db_test_v1_db_test_proto_rawDesc = []byte{ 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x70, - 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x70, 0x67, 0x42, 0x3d, 0x5a, 0x3b, + 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x70, 0x67, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, - 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x62, 0x2f, 0x64, 0x62, 0x5f, 0x74, - 0x65, 0x73, 0x74, 0x3b, 0x64, 0x62, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x62, 0x2f, 0x64, 0x62, 0x5f, 0x74, 0x65, 0x73, + 0x74, 0x3b, 0x64, 0x62, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/internal/db/migrations/postgres.gen.go b/internal/db/migrations/postgres.gen.go index dadc4e0e3..4557aa2ba 100644 --- a/internal/db/migrations/postgres.gen.go +++ b/internal/db/migrations/postgres.gen.go @@ -331,7 +331,7 @@ begin; -- create test tables used in the unit tests for the internal/db package -- these tables (db_test_user, db_test_car, db_test_rental, db_test_scooter) are --- not part of the watchtower domain model... they are simply used for testing +-- not part of the boundary domain model... they are simply used for testing -- the internal/db package create table if not exists db_test_user ( id bigint generated always as identity primary key, diff --git a/internal/db/migrations/postgres/03_db.up.sql b/internal/db/migrations/postgres/03_db.up.sql index d4e754fe6..246887df7 100644 --- a/internal/db/migrations/postgres/03_db.up.sql +++ b/internal/db/migrations/postgres/03_db.up.sql @@ -2,7 +2,7 @@ begin; -- create test tables used in the unit tests for the internal/db package -- these tables (db_test_user, db_test_car, db_test_rental, db_test_scooter) are --- not part of the watchtower domain model... they are simply used for testing +-- not part of the boundary domain model... they are simply used for testing -- the internal/db package create table if not exists db_test_user ( id bigint generated always as identity primary key, diff --git a/internal/db/option.go b/internal/db/option.go index 5985b7581..fb8a547a2 100644 --- a/internal/db/option.go +++ b/internal/db/option.go @@ -1,8 +1,8 @@ package db import ( + "github.com/hashicorp/boundary/internal/oplog" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/oplog" ) // GetOpts - iterate the inbound Options and return a struct. diff --git a/internal/db/option_test.go b/internal/db/option_test.go index 4e32494ff..c10525020 100644 --- a/internal/db/option_test.go +++ b/internal/db/option_test.go @@ -3,7 +3,7 @@ package db import ( "testing" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/read_writer.go b/internal/db/read_writer.go index 330fe49e4..256f2bdb9 100644 --- a/internal/db/read_writer.go +++ b/internal/db/read_writer.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/hashicorp/boundary/internal/db/common" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/oplog/store" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db/common" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/oplog/store" "github.com/jinzhu/gorm" "google.golang.org/protobuf/proto" ) @@ -20,7 +20,7 @@ import ( const ( NoRowsAffected = 0 - // DefaultLimit is the default for results for watchtower + // DefaultLimit is the default for results for boundary DefaultLimit = 10000 ) @@ -387,7 +387,7 @@ func (rw *Db) Update(ctx context.Context, i interface{}, fieldMaskPaths []string return NoRowsAffected, fmt.Errorf("update: no fields matched using fieldMaskPaths %s", fieldMaskPaths) } - // This is not a watchtower scope, but rather a gorm Scope: + // This is not a boundary scope, but rather a gorm Scope: // https://godoc.org/github.com/jinzhu/gorm#DB.NewScope scope := rw.underlying.NewScope(i) if scope.PrimaryKeyZero() { @@ -501,7 +501,7 @@ func (rw *Db) Delete(ctx context.Context, i interface{}, opt ...Option) (int, er if withOplog && opts.newOplogMsg != nil { return NoRowsAffected, fmt.Errorf("delete: both WithOplog and NewOplogMsg options have been specified: %w", ErrInvalidParameter) } - // This is not a watchtower scope, but rather a gorm Scope: + // This is not a boundary scope, but rather a gorm Scope: // https://godoc.org/github.com/jinzhu/gorm#DB.NewScope scope := rw.underlying.NewScope(i) if scope.PrimaryKeyZero() { diff --git a/internal/db/read_writer_test.go b/internal/db/read_writer_test.go index 9097970e7..015ea2c46 100644 --- a/internal/db/read_writer_test.go +++ b/internal/db/read_writer_test.go @@ -10,13 +10,13 @@ import ( "time" "github.com/golang/protobuf/ptypes" + "github.com/hashicorp/boundary/internal/db/db_test" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/oplog/store" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/sdk/helper/base62" - "github.com/hashicorp/watchtower/internal/db/db_test" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/oplog/store" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/db/testing.go b/internal/db/testing.go index 7e148fe51..32020b253 100644 --- a/internal/db/testing.go +++ b/internal/db/testing.go @@ -9,10 +9,10 @@ import ( _ "github.com/golang-migrate/migrate/v4/database/postgres" _ "github.com/golang-migrate/migrate/v4/source/file" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/oplog/store" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-kms-wrapping/wrappers/aead" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/oplog/store" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/testing_test.go b/internal/db/testing_test.go index a99fa3a4a..6e7231cec 100644 --- a/internal/db/testing_test.go +++ b/internal/db/testing_test.go @@ -7,9 +7,9 @@ import ( _ "github.com/golang-migrate/migrate/v4/database/postgres" _ "github.com/golang-migrate/migrate/v4/source/file" + "github.com/hashicorp/boundary/internal/db/db_test" + "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/watchtower/internal/db/db_test" - "github.com/hashicorp/watchtower/internal/oplog" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/timestamp/timestamp.pb.go b/internal/db/timestamp/timestamp.pb.go index fa56e6252..0a2fd4551 100644 --- a/internal/db/timestamp/timestamp.pb.go +++ b/internal/db/timestamp/timestamp.pb.go @@ -92,12 +92,12 @@ var file_controller_storage_timestamp_v1_timestamp_proto_rawDesc = []byte{ 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, + 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, - 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x62, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x3b, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x62, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x3b, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/error.pb.go b/internal/gen/controller/api/error.pb.go index 78a934e71..140103d2a 100644 --- a/internal/gen/controller/api/error.pb.go +++ b/internal/gen/controller/api/error.pb.go @@ -249,11 +249,11 @@ var file_controller_api_v1_error_proto_rawDesc = []byte{ 0x69, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, - 0x69, 0x6c, 0x73, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, - 0x70, 0x69, 0x3b, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6c, 0x73, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, + 0x3b, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/authmethods/account.pb.go b/internal/gen/controller/api/resources/authmethods/account.pb.go index f442307c6..fdffc5e3f 100644 --- a/internal/gen/controller/api/resources/authmethods/account.pb.go +++ b/internal/gen/controller/api/resources/authmethods/account.pb.go @@ -11,8 +11,8 @@ import ( _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -287,13 +287,13 @@ var file_controller_api_resources_authmethods_v1_account_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x04, 0xa0, 0xda, 0x29, 0x01, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x5f, 0x5a, 0x5d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, - 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x73, 0x3b, 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x5d, 0x5a, 0x5b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, + 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, 0x74, 0x68, + 0x6f, 0x64, 0x73, 0x3b, 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( 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 080a2ab3a..864ad8bbe 100644 --- a/internal/gen/controller/api/resources/authmethods/auth_method.pb.go +++ b/internal/gen/controller/api/resources/authmethods/auth_method.pb.go @@ -11,8 +11,8 @@ import ( _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -263,13 +263,13 @@ var file_controller_api_resources_authmethods_v1_auth_method_proto_rawDesc = []b 0x12, 0x34, 0x0a, 0x13, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x04, 0xa0, 0xda, 0x29, 0x01, 0x52, 0x11, 0x6d, 0x69, 0x6e, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x42, 0x5f, 0x5a, 0x5d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, - 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, - 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x3b, 0x61, 0x75, 0x74, 0x68, - 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x42, 0x5d, 0x5a, 0x5b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, + 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x61, 0x75, + 0x74, 0x68, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x3b, 0x61, 0x75, 0x74, 0x68, 0x6d, 0x65, + 0x74, 0x68, 0x6f, 0x64, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go index 777fd7e2b..0f7e5d7bc 100644 --- a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go +++ b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go @@ -10,7 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" + 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" @@ -205,14 +205,14 @@ var file_controller_api_resources_authtokens_v1_authtoken_proto_rawDesc = []byte 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0f, 0x65, - 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x5d, - 0x5a, 0x5b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, - 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x73, 0x3b, 0x61, 0x75, 0x74, 0x68, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x5b, + 0x5a, 0x59, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, + 0x3b, 0x61, 0x75, 0x74, 0x68, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/groups/group.pb.go b/internal/gen/controller/api/resources/groups/group.pb.go index e04933339..c87a2ad90 100644 --- a/internal/gen/controller/api/resources/groups/group.pb.go +++ b/internal/gen/controller/api/resources/groups/group.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -295,13 +295,12 @@ var file_controller_api_resources_groups_v1_group_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x73, 0x42, 0x55, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x73, 0x3b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x65, 0x72, 0x73, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x73, 0x3b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/hosts/host.pb.go b/internal/gen/controller/api/resources/hosts/host.pb.go index 42734c0be..96946af7b 100644 --- a/internal/gen/controller/api/resources/hosts/host.pb.go +++ b/internal/gen/controller/api/resources/hosts/host.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -204,13 +204,13 @@ var file_controller_api_resources_hosts_v1_host_proto_rawDesc = []byte{ 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x04, 0xa0, 0xda, 0x29, 0x01, 0x52, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, + 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, - 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x73, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, + 0x68, 0x6f, 0x73, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/hosts/host_catalog.pb.go b/internal/gen/controller/api/resources/hosts/host_catalog.pb.go index ffbd3abf8..888e1daaa 100644 --- a/internal/gen/controller/api/resources/hosts/host_catalog.pb.go +++ b/internal/gen/controller/api/resources/hosts/host_catalog.pb.go @@ -11,8 +11,8 @@ import ( _struct "github.com/golang/protobuf/ptypes/struct" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -340,13 +340,13 @@ var file_controller_api_resources_hosts_v1_host_catalog_proto_rawDesc = []byte{ 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x42, 0x53, 0x5a, - 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, - 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x42, 0x51, 0x5a, + 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x73, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, 0x74, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/hosts/host_set.pb.go b/internal/gen/controller/api/resources/hosts/host_set.pb.go index 149174829..ca4f58e41 100644 --- a/internal/gen/controller/api/resources/hosts/host_set.pb.go +++ b/internal/gen/controller/api/resources/hosts/host_set.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -224,13 +224,12 @@ var file_controller_api_resources_hosts_v1_host_set_proto_rawDesc = []byte{ 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2e, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x05, - 0x68, 0x6f, 0x73, 0x74, 0x73, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, - 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x68, - 0x6f, 0x73, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x68, 0x6f, 0x73, 0x74, 0x73, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, + 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x68, 0x6f, 0x73, + 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/roles/role.pb.go b/internal/gen/controller/api/resources/roles/role.pb.go index 2910505bb..138b56314 100644 --- a/internal/gen/controller/api/resources/roles/role.pb.go +++ b/internal/gen/controller/api/resources/roles/role.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -492,13 +492,13 @@ var file_controller_api_resources_roles_v1_role_proto_rawDesc = []byte{ 0x72, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2e, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x47, 0x72, 0x61, 0x6e, 0x74, 0x52, 0x06, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x73, 0x42, 0x53, 0x5a, - 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x72, 0x6f, 0x6c, - 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x47, 0x72, 0x61, 0x6e, 0x74, 0x52, 0x06, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x73, 0x42, 0x51, 0x5a, + 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x73, 0x2f, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x72, 0x6f, 0x6c, 0x65, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/scopes/scope.pb.go b/internal/gen/controller/api/resources/scopes/scope.pb.go index e5f062499..8b41faf10 100644 --- a/internal/gen/controller/api/resources/scopes/scope.pb.go +++ b/internal/gen/controller/api/resources/scopes/scope.pb.go @@ -10,7 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -289,13 +289,13 @@ var file_controller_api_resources_scopes_v1_scope_proto_rawDesc = []byte{ 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x04, 0xa0, 0xda, 0x29, 0x01, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x55, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, - 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, - 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x3b, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, + 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x63, + 0x6f, 0x70, 0x65, 0x73, 0x3b, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/resources/users/user.pb.go b/internal/gen/controller/api/resources/users/user.pb.go index f7e6fe6e4..c2a92e4e2 100644 --- a/internal/gen/controller/api/resources/users/user.pb.go +++ b/internal/gen/controller/api/resources/users/user.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -195,12 +195,12 @@ var file_controller_api_resources_users_v1_user_proto_rawDesc = []byte{ 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x04, 0xa0, 0xda, 0x29, 0x01, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, - 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x3b, - 0x75, 0x73, 0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, + 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x3b, 0x75, 0x73, + 0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( 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 82b095511..e9c5ebd3c 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - authmethods "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" + authmethods "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" _ "google.golang.org/genproto/googleapis/api/annotations" field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" @@ -673,12 +673,12 @@ var file_controller_api_services_v1_auth_method_service_proto_rawDesc = []byte{ 0x63, 0x6f, 0x70, 0x65, 0x73, 0x2f, 0x2a, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2d, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x17, 0x12, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, - 0x68, 0x6f, 0x64, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x6f, 0x64, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -902,13 +902,13 @@ type AuthMethodServiceClient interface { // the auth methods being retrieved. If the org id is missing, malformed, or // reference a non existing organization, an error is returned. ListAuthMethods(ctx context.Context, in *ListAuthMethodsRequest, opts ...grpc.CallOption) (*ListAuthMethodsResponse, error) - // CreateAuthMethod creates and stores a user in watchtower. The provided + // CreateAuthMethod creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another user in the same org, an error is returned. CreateAuthMethod(ctx context.Context, in *CreateAuthMethodRequest, opts ...grpc.CallOption) (*CreateAuthMethodResponse, error) - // UpdateAuthMethod updates an existing user in watchtower. The provided + // UpdateAuthMethod updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -917,7 +917,7 @@ type AuthMethodServiceClient interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateAuthMethod(ctx context.Context, in *UpdateAuthMethodRequest, opts ...grpc.CallOption) (*UpdateAuthMethodResponse, error) - // DeleteAuthMethod removes a user from Watchtower. If the provided org or user ids + // DeleteAuthMethod removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthMethod request was @@ -990,13 +990,13 @@ type AuthMethodServiceServer interface { // the auth methods being retrieved. If the org id is missing, malformed, or // reference a non existing organization, an error is returned. ListAuthMethods(context.Context, *ListAuthMethodsRequest) (*ListAuthMethodsResponse, error) - // CreateAuthMethod creates and stores a user in watchtower. The provided + // CreateAuthMethod creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another user in the same org, an error is returned. CreateAuthMethod(context.Context, *CreateAuthMethodRequest) (*CreateAuthMethodResponse, error) - // UpdateAuthMethod updates an existing user in watchtower. The provided + // UpdateAuthMethod updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -1005,7 +1005,7 @@ type AuthMethodServiceServer interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateAuthMethod(context.Context, *UpdateAuthMethodRequest) (*UpdateAuthMethodResponse, error) - // DeleteAuthMethod removes a user from Watchtower. If the provided org or user ids + // DeleteAuthMethod removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthMethod request was diff --git a/internal/gen/controller/api/services/authaccount_service.pb.go b/internal/gen/controller/api/services/authaccount_service.pb.go index 24b14c55d..529dfbed8 100644 --- a/internal/gen/controller/api/services/authaccount_service.pb.go +++ b/internal/gen/controller/api/services/authaccount_service.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - authmethods "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" + authmethods "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" _ "google.golang.org/genproto/googleapis/api/annotations" field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" @@ -732,13 +732,13 @@ var file_controller_api_services_v1_authaccount_service_proto_rawDesc = []byte{ 0x74, 0x68, 0x6f, 0x64, 0x73, 0x2f, 0x7b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x15, 0x12, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, - 0x20, 0x61, 0x6e, 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x42, 0x4f, 0x5a, 0x4d, + 0x20, 0x61, 0x6e, 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, - 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -962,13 +962,13 @@ type AccountServiceClient interface { // auth method for the account being retrieved. If the auth method is missing, // malformed, or references a non-existing auth method, an error is returned. ListAccounts(ctx context.Context, in *ListAccountsRequest, opts ...grpc.CallOption) (*ListAccountsResponse, error) - // CreateAccount creates and stores an account in watchtower. The provided + // CreateAccount creates and stores an account in boundary. The provided // request must include the auth method id in which the account will be created. // If the auth method id is missing, malformed or references a non existing // auth method, an error is returned. If a name is provided that is in // use in another account in the same auth method, an error is returned. CreateAccount(ctx context.Context, in *CreateAccountRequest, opts ...grpc.CallOption) (*CreateAccountResponse, error) - // UpdateAccount updates an existing account in watchtower. The provided account + // UpdateAccount updates an existing account in boundary. The provided account // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -977,7 +977,7 @@ type AccountServiceClient interface { // request attempts to update the name to one that is already in use in this // auth method. UpdateAccount(ctx context.Context, in *UpdateAccountRequest, opts ...grpc.CallOption) (*UpdateAccountResponse, error) - // DeleteAccount removes an account from Watchtower. If the provided auth mehtod + // DeleteAccount removes an account from Boundary. If the provided auth mehtod // or account ids are malformed or not provided an error is returned. No error is // returned if either ids reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteAccount @@ -1050,13 +1050,13 @@ type AccountServiceServer interface { // auth method for the account being retrieved. If the auth method is missing, // malformed, or references a non-existing auth method, an error is returned. ListAccounts(context.Context, *ListAccountsRequest) (*ListAccountsResponse, error) - // CreateAccount creates and stores an account in watchtower. The provided + // CreateAccount creates and stores an account in boundary. The provided // request must include the auth method id in which the account will be created. // If the auth method id is missing, malformed or references a non existing // auth method, an error is returned. If a name is provided that is in // use in another account in the same auth method, an error is returned. CreateAccount(context.Context, *CreateAccountRequest) (*CreateAccountResponse, error) - // UpdateAccount updates an existing account in watchtower. The provided account + // UpdateAccount updates an existing account in boundary. The provided account // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -1065,7 +1065,7 @@ type AccountServiceServer interface { // request attempts to update the name to one that is already in use in this // auth method. UpdateAccount(context.Context, *UpdateAccountRequest) (*UpdateAccountResponse, error) - // DeleteAccount removes an account from Watchtower. If the provided auth mehtod + // DeleteAccount removes an account from Boundary. If the provided auth mehtod // or account ids are malformed or not provided an error is returned. No error is // returned if either ids reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteAccount diff --git a/internal/gen/controller/api/services/authenticate_service.pb.go b/internal/gen/controller/api/services/authenticate_service.pb.go index b7c555cf7..0360e3353 100644 --- a/internal/gen/controller/api/services/authenticate_service.pb.go +++ b/internal/gen/controller/api/services/authenticate_service.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - authtokens "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" + authtokens "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -340,13 +340,13 @@ var file_controller_api_services_v1_authenticate_service_proto_rawDesc = []byte{ 0x74, 0x65, 0x20, 0x61, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6e, 0x20, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x20, 0x61, 0x6e, 0x20, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x42, 0x4f, 0x5a, 0x4d, 0x67, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, - 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/services/authtokens_service.pb.go b/internal/gen/controller/api/services/authtokens_service.pb.go index f8abd2295..b8b9b58ce 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - authtokens "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" + authtokens "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -399,12 +399,12 @@ var file_controller_api_services_v1_authtokens_service_proto_rawDesc = []byte{ 0x31, 0x2f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x2f, 0x2a, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x17, 0x12, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x41, 0x75, 0x74, 0x68, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, - 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, + 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -566,7 +566,7 @@ type AuthTokenServiceClient interface { // the auth token being retrieved. If the org id is missing, malformed, or // reference a non existing organization, an error is returned. ListAuthTokens(ctx context.Context, in *ListAuthTokensRequest, opts ...grpc.CallOption) (*ListAuthTokensResponse, error) - // DeleteAuthToken removes a auth token from Watchtower. If the provided org or + // DeleteAuthToken removes a auth token from Boundary. If the provided org or // auth token ids are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthToken request was @@ -621,7 +621,7 @@ type AuthTokenServiceServer interface { // the auth token being retrieved. If the org id is missing, malformed, or // reference a non existing organization, an error is returned. ListAuthTokens(context.Context, *ListAuthTokensRequest) (*ListAuthTokensResponse, error) - // DeleteAuthToken removes a auth token from Watchtower. If the provided org or + // DeleteAuthToken removes a auth token from Boundary. If the provided org or // auth token ids are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthToken request was diff --git a/internal/gen/controller/api/services/group_service.pb.go b/internal/gen/controller/api/services/group_service.pb.go index 7a8f0e166..2119a2ce2 100644 --- a/internal/gen/controller/api/services/group_service.pb.go +++ b/internal/gen/controller/api/services/group_service.pb.go @@ -11,8 +11,8 @@ import ( proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - groups "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/groups" - _ "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" + groups "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups" + _ "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" grpc "google.golang.org/grpc" @@ -1151,12 +1151,12 @@ var file_controller_api_services_v1_group_service_proto_rawDesc = []byte{ 0x69, 0x74, 0x65, 0x6d, 0x92, 0x41, 0x2d, 0x12, 0x2b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, - 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x75, 0x70, 0x2e, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, + 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1483,13 +1483,13 @@ type GroupServiceClient interface { // the groups being retrieved. If the scope is missing, malformed, or // references a non-existing scope, an error is returned. ListGroups(ctx context.Context, in *ListGroupsRequest, opts ...grpc.CallOption) (*ListGroupsResponse, error) - // CreateGroup creates and stores a group in watchtower. The provided + // CreateGroup creates and stores a group in boundary. The provided // request must include the scope ID in which the group will be created. // If the scope ID is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another group in the same scope, an error is returned. CreateGroup(ctx context.Context, in *CreateGroupRequest, opts ...grpc.CallOption) (*CreateGroupResponse, error) - // UpdateGroup updates an existing group in watchtower. The provided group + // UpdateGroup updates an existing group in boundary. The provided group // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -1498,7 +1498,7 @@ type GroupServiceClient interface { // request attempts to update the name to one that is already in use in this // scope. UpdateGroup(ctx context.Context, in *UpdateGroupRequest, opts ...grpc.CallOption) (*UpdateGroupResponse, error) - // DeleteGroup removes a group from Watchtower. If the provided scope or group + // DeleteGroup removes a group from Boundary. If the provided scope or group // IDs are malformed or not provided an error is returned. No error is // returned if either IDs reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteGroup @@ -1614,13 +1614,13 @@ type GroupServiceServer interface { // the groups being retrieved. If the scope is missing, malformed, or // references a non-existing scope, an error is returned. ListGroups(context.Context, *ListGroupsRequest) (*ListGroupsResponse, error) - // CreateGroup creates and stores a group in watchtower. The provided + // CreateGroup creates and stores a group in boundary. The provided // request must include the scope ID in which the group will be created. // If the scope ID is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another group in the same scope, an error is returned. CreateGroup(context.Context, *CreateGroupRequest) (*CreateGroupResponse, error) - // UpdateGroup updates an existing group in watchtower. The provided group + // UpdateGroup updates an existing group in boundary. The provided group // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -1629,7 +1629,7 @@ type GroupServiceServer interface { // request attempts to update the name to one that is already in use in this // scope. UpdateGroup(context.Context, *UpdateGroupRequest) (*UpdateGroupResponse, error) - // DeleteGroup removes a group from Watchtower. If the provided scope or group + // DeleteGroup removes a group from Boundary. If the provided scope or group // IDs are malformed or not provided an error is returned. No error is // returned if either IDs reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteGroup 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 b97e5293c..69de8b60a 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - hosts "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" + 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" grpc "google.golang.org/grpc" @@ -685,13 +685,13 @@ var file_controller_api_services_v1_host_catalog_service_proto_rawDesc = []byte{ 0x72, 0x76, 0x69, 0x63, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x65, 0x74, 0x2f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x65, 0x20, 0x48, 0x6f, 0x73, 0x74, 0x20, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x73, 0x20, 0x6f, 0x66, 0x20, - 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x42, 0x4f, 0x5a, 0x4d, 0x67, + 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, - 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -916,20 +916,20 @@ type HostCatalogServiceClient interface { // malformed, or reference a non-existing parent resource an error is // returned. ListHostCatalogs(ctx context.Context, in *ListHostCatalogsRequest, opts ...grpc.CallOption) (*ListHostCatalogsResponse, error) - // CreateHostCatalog creates and stores a HostCatalog in watchtower. The + // CreateHostCatalog creates and stores a HostCatalog in boundary. The // provided request must include the scope ID in which the catalog will be // created and the catalog type to be created. If any of these required fields // are missing, malformed, or reference a non-existing parent resource an // error is returned. CreateHostCatalog(ctx context.Context, in *CreateHostCatalogRequest, opts ...grpc.CallOption) (*CreateHostCatalogResponse, error) - // UpdateHostCatalog updates an existing HostCatalog in Watchtower. The + // UpdateHostCatalog updates an existing HostCatalog in Boundary. The // provided HostCatalog must not have any read only fields set. The update // mask must be provided and include at least 1 mutable field. To unset a // field's value include that field name in the update mask and don't set the // field in the HostCatalog. UpdateHostCatalog(ctx context.Context, in *UpdateHostCatalogRequest, opts ...grpc.CallOption) (*UpdateHostCatalogResponse, error) // DeleteHostCatalog removes a HostCatalog and all associated hosts and host - // sets from Watchtower. If the provided scope or HostCatalog IDs are + // sets from Boundary. If the provided scope or HostCatalog IDs are // malformed or not provided DeleteHostCatalog returns an error. It is not an // error to call DeleteHostCatalog for an scope or HostCatalog that does not // exist as the response indicates if it existed or not. @@ -1002,20 +1002,20 @@ type HostCatalogServiceServer interface { // malformed, or reference a non-existing parent resource an error is // returned. ListHostCatalogs(context.Context, *ListHostCatalogsRequest) (*ListHostCatalogsResponse, error) - // CreateHostCatalog creates and stores a HostCatalog in watchtower. The + // CreateHostCatalog creates and stores a HostCatalog in boundary. The // provided request must include the scope ID in which the catalog will be // created and the catalog type to be created. If any of these required fields // are missing, malformed, or reference a non-existing parent resource an // error is returned. CreateHostCatalog(context.Context, *CreateHostCatalogRequest) (*CreateHostCatalogResponse, error) - // UpdateHostCatalog updates an existing HostCatalog in Watchtower. The + // UpdateHostCatalog updates an existing HostCatalog in Boundary. The // provided HostCatalog must not have any read only fields set. The update // mask must be provided and include at least 1 mutable field. To unset a // field's value include that field name in the update mask and don't set the // field in the HostCatalog. UpdateHostCatalog(context.Context, *UpdateHostCatalogRequest) (*UpdateHostCatalogResponse, error) // DeleteHostCatalog removes a HostCatalog and all associated hosts and host - // sets from Watchtower. If the provided scope or HostCatalog IDs are + // sets from Boundary. If the provided scope or HostCatalog IDs are // malformed or not provided DeleteHostCatalog returns an error. It is not an // error to call DeleteHostCatalog for an scope or HostCatalog that does not // exist as the response indicates if it existed or not. diff --git a/internal/gen/controller/api/services/host_service.pb.go b/internal/gen/controller/api/services/host_service.pb.go index 8b7405e39..3251f8439 100644 --- a/internal/gen/controller/api/services/host_service.pb.go +++ b/internal/gen/controller/api/services/host_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - hosts "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" + 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" grpc "google.golang.org/grpc" @@ -718,12 +718,12 @@ var file_controller_api_services_v1_host_service_proto_rawDesc = []byte{ 0x73, 0x2f, 0x7b, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x0f, 0x12, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x20, 0x61, 0x20, 0x48, 0x6f, 0x73, 0x74, - 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, - 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, + 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( 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 a0a46d606..d4f8af751 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.go +++ b/internal/gen/controller/api/services/host_set_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - hosts "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" + 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" grpc "google.golang.org/grpc" @@ -997,18 +997,18 @@ var file_controller_api_services_v1_host_set_service_proto_rawDesc = []byte{ 0x6e, 0x6f, 0x74, 0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6e, 0x6f, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x74, 0x61, 0x6b, 0x65, 0x6e, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6e, 0x6f, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x2e, 0x42, 0xa8, 0x01, - 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, - 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x92, - 0x41, 0x56, 0x12, 0x50, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x20, 0x41, 0x50, 0x49, 0x12, 0x37, 0x41, 0x50, 0x49, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6d, 0x61, - 0x6e, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, - 0x20, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, - 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x2e, 0x32, 0x05, 0x30, - 0x2e, 0x30, 0x2e, 0x31, 0x2a, 0x02, 0x02, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x2e, 0x42, 0xa6, 0x01, + 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x92, 0x41, 0x56, + 0x12, 0x50, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x20, 0x41, + 0x50, 0x49, 0x12, 0x37, 0x41, 0x50, 0x49, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6d, 0x61, 0x6e, 0x61, + 0x67, 0x69, 0x6e, 0x67, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x20, 0x61, + 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x2e, 0x32, 0x05, 0x30, 0x2e, 0x30, + 0x2e, 0x31, 0x2a, 0x02, 0x02, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/api/services/role_service.pb.go b/internal/gen/controller/api/services/role_service.pb.go index aea7d9145..eab3f713e 100644 --- a/internal/gen/controller/api/services/role_service.pb.go +++ b/internal/gen/controller/api/services/role_service.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - roles "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/roles" + roles "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles" _ "google.golang.org/genproto/googleapis/api/annotations" field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" @@ -1623,12 +1623,12 @@ var file_controller_api_services_v1_role_service_proto_rawDesc = []byte{ 0x65, 0x2d, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x73, 0x3a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x62, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x92, 0x41, 0x1d, 0x12, 0x1b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x73, 0x20, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 0x72, - 0x6f, 0x6c, 0x65, 0x2e, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, - 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6c, 0x65, 0x2e, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, + 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2063,7 +2063,7 @@ type RoleServiceClient interface { // name is provided that is in use in another role in the same scope, an error // is returned. CreateRole(ctx context.Context, in *CreateRoleRequest, opts ...grpc.CallOption) (*CreateRoleResponse, error) - // UpdateRole updates an existing role in watchtower. The provided + // UpdateRole updates an existing role in boundary. The provided // role must not have any read-only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -2072,7 +2072,7 @@ type RoleServiceClient interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateRole(ctx context.Context, in *UpdateRoleRequest, opts ...grpc.CallOption) (*UpdateRoleResponse, error) - // DeleteRole removes a role from Watchtower. If the provided scope or role IDs + // DeleteRole removes a role from Boundary. If the provided scope or role IDs // are malformed, or not provided an error is returned. No error is returned // if either IDs reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteRole request was @@ -2239,7 +2239,7 @@ type RoleServiceServer interface { // name is provided that is in use in another role in the same scope, an error // is returned. CreateRole(context.Context, *CreateRoleRequest) (*CreateRoleResponse, error) - // UpdateRole updates an existing role in watchtower. The provided + // UpdateRole updates an existing role in boundary. The provided // role must not have any read-only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -2248,7 +2248,7 @@ type RoleServiceServer interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateRole(context.Context, *UpdateRoleRequest) (*UpdateRoleResponse, error) - // DeleteRole removes a role from Watchtower. If the provided scope or role IDs + // DeleteRole removes a role from Boundary. If the provided scope or role IDs // are malformed, or not provided an error is returned. No error is returned // if either IDs reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteRole request was diff --git a/internal/gen/controller/api/services/scope_service.pb.go b/internal/gen/controller/api/services/scope_service.pb.go index a86b08ed7..92ec80865 100644 --- a/internal/gen/controller/api/services/scope_service.pb.go +++ b/internal/gen/controller/api/services/scope_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - scopes "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" + 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" grpc "google.golang.org/grpc" @@ -686,12 +686,12 @@ var file_controller_api_services_v1_scope_service_proto_rawDesc = []byte{ 0x73, 0x65, 0x22, 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x2a, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x11, 0x12, 0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x20, 0x61, 0x20, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x42, - 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, - 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, - 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, + 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -913,13 +913,13 @@ type ScopeServiceClient interface { // ListScopes returns a list of stored scopes which exist inside the scope of // the token making the request. ListScopes(ctx context.Context, in *ListScopesRequest, opts ...grpc.CallOption) (*ListScopesResponse, error) - // CreateScope creates and stores a scope in watchtower. The provided request + // CreateScope creates and stores a scope in boundary. The provided request // must include the scope ID in which the scope will be created. If the scope // ID is missing, malformed or references a non existing scope, an error is // returned. If a name is provided that is in use in another scope in the same // parent scope, an error is returned. CreateScope(ctx context.Context, in *CreateScopeRequest, opts ...grpc.CallOption) (*CreateScopeResponse, error) - // UpdateScope updates an existing scope in watchtower. The provided + // UpdateScope updates an existing scope in boundary. The provided // scope must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -928,7 +928,7 @@ type ScopeServiceClient interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateScope(ctx context.Context, in *UpdateScopeRequest, opts ...grpc.CallOption) (*UpdateScopeResponse, error) - // DeleteScope remotes a scope and all child resources from Watchtower. If the + // DeleteScope remotes a scope and all child resources from Boundary. If the // provided scope IDs are malformed or not provided an error is returned. No // error is returned if the ID references a resource that does not exist as // the response itself specifies if the resource existed before the @@ -999,13 +999,13 @@ type ScopeServiceServer interface { // ListScopes returns a list of stored scopes which exist inside the scope of // the token making the request. ListScopes(context.Context, *ListScopesRequest) (*ListScopesResponse, error) - // CreateScope creates and stores a scope in watchtower. The provided request + // CreateScope creates and stores a scope in boundary. The provided request // must include the scope ID in which the scope will be created. If the scope // ID is missing, malformed or references a non existing scope, an error is // returned. If a name is provided that is in use in another scope in the same // parent scope, an error is returned. CreateScope(context.Context, *CreateScopeRequest) (*CreateScopeResponse, error) - // UpdateScope updates an existing scope in watchtower. The provided + // UpdateScope updates an existing scope in boundary. The provided // scope must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -1014,7 +1014,7 @@ type ScopeServiceServer interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateScope(context.Context, *UpdateScopeRequest) (*UpdateScopeResponse, error) - // DeleteScope remotes a scope and all child resources from Watchtower. If the + // DeleteScope remotes a scope and all child resources from Boundary. If the // provided scope IDs are malformed or not provided an error is returned. No // error is returned if the ID references a resource that does not exist as // the response itself specifies if the resource existed before the diff --git a/internal/gen/controller/api/services/user_service.pb.go b/internal/gen/controller/api/services/user_service.pb.go index 31de4a7d1..c398eee14 100644 --- a/internal/gen/controller/api/services/user_service.pb.go +++ b/internal/gen/controller/api/services/user_service.pb.go @@ -10,7 +10,7 @@ import ( context "context" proto "github.com/golang/protobuf/proto" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - users "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/users" + 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" grpc "google.golang.org/grpc" @@ -663,12 +663,12 @@ var file_controller_api_services_v1_user_service_proto_rawDesc = []byte{ 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x2a, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x2f, 0x2a, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x92, 0x41, 0x10, 0x12, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x20, 0x61, 0x20, 0x55, 0x73, - 0x65, 0x72, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, - 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, - 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x42, 0x4d, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, + 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -892,13 +892,13 @@ type UserServiceClient interface { // the users being retrieved. If the scope ID is missing, malformed, or // reference a non existing scope, an error is returned. ListUsers(ctx context.Context, in *ListUsersRequest, opts ...grpc.CallOption) (*ListUsersResponse, error) - // CreateUser creates and stores a user in watchtower. The provided + // CreateUser creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another user in the same org, an error is returned. CreateUser(ctx context.Context, in *CreateUserRequest, opts ...grpc.CallOption) (*CreateUserResponse, error) - // UpdateUser updates an existing user in watchtower. The provided + // UpdateUser updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -907,7 +907,7 @@ type UserServiceClient interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateUser(ctx context.Context, in *UpdateUserRequest, opts ...grpc.CallOption) (*UpdateUserResponse, error) - // DeleteUser removes a user from Watchtower. If the provided org or user ids + // DeleteUser removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteUser request was @@ -980,13 +980,13 @@ type UserServiceServer interface { // the users being retrieved. If the scope ID is missing, malformed, or // reference a non existing scope, an error is returned. ListUsers(context.Context, *ListUsersRequest) (*ListUsersResponse, error) - // CreateUser creates and stores a user in watchtower. The provided + // CreateUser creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in // use in another user in the same org, an error is returned. CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) - // UpdateUser updates an existing user in watchtower. The provided + // UpdateUser updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -995,7 +995,7 @@ type UserServiceServer interface { // is also returned if the request attempts to update the name to one that is // already in use in this org. UpdateUser(context.Context, *UpdateUserRequest) (*UpdateUserResponse, error) - // DeleteUser removes a user from Watchtower. If the provided org or user ids + // DeleteUser removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteUser request was diff --git a/internal/gen/controller/protooptions/options.pb.go b/internal/gen/controller/protooptions/options.pb.go index d148b4fb2..3149212f4 100644 --- a/internal/gen/controller/protooptions/options.pb.go +++ b/internal/gen/controller/protooptions/options.pb.go @@ -141,12 +141,12 @@ var file_controller_custom_options_v1_options_proto_rawDesc = []byte{ 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xa4, 0x9b, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x53, 0x64, 0x6b, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6f, 0x6e, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/gen/controller/protooptions/testing.pb.go b/internal/gen/controller/protooptions/testing.pb.go index 2bb960776..9b83ab49a 100644 --- a/internal/gen/controller/protooptions/testing.pb.go +++ b/internal/gen/controller/protooptions/testing.pb.go @@ -469,13 +469,12 @@ var file_controller_custom_options_v1_testing_proto_rawDesc = []byte{ 0x69, 0x65, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1d, 0xc2, 0xdd, 0x29, 0x19, 0x0a, 0x0a, 0x45, 0x78, 0x74, 0x72, 0x61, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x0b, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, - 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, + 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/host/static/example_test.go b/internal/host/static/example_test.go index c52533686..63ec1ee21 100644 --- a/internal/host/static/example_test.go +++ b/internal/host/static/example_test.go @@ -3,7 +3,7 @@ package static_test import ( "fmt" - "github.com/hashicorp/watchtower/internal/host/static" + "github.com/hashicorp/boundary/internal/host/static" ) func ExampleNewHostCatalog() { diff --git a/internal/host/static/gorm_test.go b/internal/host/static/gorm_test.go index 6d07139ff..6be728f96 100644 --- a/internal/host/static/gorm_test.go +++ b/internal/host/static/gorm_test.go @@ -3,7 +3,7 @@ package static import ( "testing" - "github.com/hashicorp/watchtower/internal/host/static/store" + "github.com/hashicorp/boundary/internal/host/static/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/host/static/immutable_fields_test.go b/internal/host/static/immutable_fields_test.go index b11211d17..1dd05c239 100644 --- a/internal/host/static/immutable_fields_test.go +++ b/internal/host/static/immutable_fields_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/host/static/store" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/host/static/store" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/host/static/repository.go b/internal/host/static/repository.go index e8da63677..a418e1772 100644 --- a/internal/host/static/repository.go +++ b/internal/host/static/repository.go @@ -7,9 +7,9 @@ import ( wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/host/static/store" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/host/static/store" + "github.com/hashicorp/boundary/internal/oplog" ) // A Repository stores and retrieves the persistent types in the static diff --git a/internal/host/static/repository_test.go b/internal/host/static/repository_test.go index 6ca043094..533d75c47 100644 --- a/internal/host/static/repository_test.go +++ b/internal/host/static/repository_test.go @@ -9,11 +9,11 @@ import ( wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/stretchr/testify/assert" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" + dbassert "github.com/hashicorp/boundary/internal/db/assert" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/host/static/store" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/host/static/store" + "github.com/hashicorp/boundary/internal/iam" ) func TestRepository_New(t *testing.T) { diff --git a/internal/host/static/static.go b/internal/host/static/static.go index 4ce075029..d36c53f82 100644 --- a/internal/host/static/static.go +++ b/internal/host/static/static.go @@ -3,8 +3,8 @@ package static import ( "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/host/static/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/host/static/store" "google.golang.org/protobuf/proto" ) diff --git a/internal/host/static/static_test.go b/internal/host/static/static_test.go index 8c03313aa..2859c5445 100644 --- a/internal/host/static/static_test.go +++ b/internal/host/static/static_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/host/static/store" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/host/static/store" + "github.com/hashicorp/boundary/internal/iam" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" ) diff --git a/internal/host/static/store/static.pb.go b/internal/host/static/store/static.pb.go index 80488dee8..3b933b955 100644 --- a/internal/host/static/store/static.pb.go +++ b/internal/host/static/store/static.pb.go @@ -11,8 +11,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -479,12 +479,12 @@ var file_controller_storage_host_static_store_v1_static_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x64, 0x42, 0x42, 0x5a, - 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x2f, 0x73, - 0x74, 0x61, 0x74, 0x69, 0x63, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x48, 0x6f, 0x73, 0x74, 0x49, 0x64, 0x42, 0x40, 0x5a, + 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x68, 0x6f, 0x73, 0x74, 0x2f, 0x73, 0x74, 0x61, + 0x74, 0x69, 0x63, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/account.go b/internal/iam/account.go index 66f668205..4f70ac124 100644 --- a/internal/iam/account.go +++ b/internal/iam/account.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - authStore "github.com/hashicorp/watchtower/internal/auth/store" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/scope" + authStore "github.com/hashicorp/boundary/internal/auth/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/account_test.go b/internal/iam/account_test.go index 24be1f699..716691511 100644 --- a/internal/iam/account_test.go +++ b/internal/iam/account_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - authStore "github.com/hashicorp/watchtower/internal/auth/store" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" + authStore "github.com/hashicorp/boundary/internal/auth/store" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/action.go b/internal/iam/action.go index a45635b7d..f04b5462d 100644 --- a/internal/iam/action.go +++ b/internal/iam/action.go @@ -1,6 +1,6 @@ package iam -import "github.com/hashicorp/watchtower/internal/types/action" +import "github.com/hashicorp/boundary/internal/types/action" // CrudActions returns a standard set of actions for resources that support a CRUD API func CrudActions() map[string]action.Type { diff --git a/internal/iam/action_test.go b/internal/iam/action_test.go index 14876d031..4fb73317b 100644 --- a/internal/iam/action_test.go +++ b/internal/iam/action_test.go @@ -3,7 +3,7 @@ package iam import ( "testing" - "github.com/hashicorp/watchtower/internal/types/action" + "github.com/hashicorp/boundary/internal/types/action" "github.com/stretchr/testify/assert" ) diff --git a/internal/iam/docs.go b/internal/iam/docs.go index 159745b0a..50c72e578 100644 --- a/internal/iam/docs.go +++ b/internal/iam/docs.go @@ -1,3 +1,3 @@ -// iam package is for identity access management of watchtower. It includes typical +// iam package is for identity access management of boundary. It includes typical // iam resources like Orgs, Projects, Users, Groups, etc. package iam diff --git a/internal/iam/group.go b/internal/iam/group.go index b274bbccd..9983ffd4e 100644 --- a/internal/iam/group.go +++ b/internal/iam/group.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/group_member.go b/internal/iam/group_member.go index b941ff426..1242f5384 100644 --- a/internal/iam/group_member.go +++ b/internal/iam/group_member.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/group_member_test.go b/internal/iam/group_member_test.go index 8cbfd7654..b9f36dd63 100644 --- a/internal/iam/group_member_test.go +++ b/internal/iam/group_member_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/group_test.go b/internal/iam/group_test.go index 0b9152058..9d87770ed 100644 --- a/internal/iam/group_test.go +++ b/internal/iam/group_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/ids.go b/internal/iam/ids.go index e37db7aa7..240c4780b 100644 --- a/internal/iam/ids.go +++ b/internal/iam/ids.go @@ -3,8 +3,8 @@ package iam import ( "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/types/scope" ) const ( diff --git a/internal/iam/ids_test.go b/internal/iam/ids_test.go index eb66cadad..41ead6c5c 100644 --- a/internal/iam/ids_test.go +++ b/internal/iam/ids_test.go @@ -6,8 +6,8 @@ import ( "errors" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/iam/immutable_fields_test.go b/internal/iam/immutable_fields_test.go index b113689fe..400f61550 100644 --- a/internal/iam/immutable_fields_test.go +++ b/internal/iam/immutable_fields_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/principal_role.go b/internal/iam/principal_role.go index fbbf69d7d..19064d262 100644 --- a/internal/iam/principal_role.go +++ b/internal/iam/principal_role.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/principal_role_test.go b/internal/iam/principal_role_test.go index 3531591c5..fa4c1ecd1 100644 --- a/internal/iam/principal_role_test.go +++ b/internal/iam/principal_role_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/repository.go b/internal/iam/repository.go index 94a35ba5f..13b3e8889 100644 --- a/internal/iam/repository.go +++ b/internal/iam/repository.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/scope" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/scope" ) var ( @@ -40,7 +40,7 @@ func NewRepository(r db.Reader, w db.Writer, wrapper wrapping.Wrapper, opt ...Op } opts := getOpts(opt...) if opts.withLimit == 0 { - // zero signals the watchtower defaults should be used. + // zero signals the boundary defaults should be used. opts.withLimit = db.DefaultLimit } return &Repository{ diff --git a/internal/iam/repository_group.go b/internal/iam/repository_group.go index 83403942c..a2072c817 100644 --- a/internal/iam/repository_group.go +++ b/internal/iam/repository_group.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - dbcommon "github.com/hashicorp/watchtower/internal/db/common" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + dbcommon "github.com/hashicorp/boundary/internal/db/common" + "github.com/hashicorp/boundary/internal/oplog" ) // CreateGroup will create a group in the repository and return the written diff --git a/internal/iam/repository_group_test.go b/internal/iam/repository_group_test.go index ee21e4711..3459d4045 100644 --- a/internal/iam/repository_group_test.go +++ b/internal/iam/repository_group_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/repository_principal_role.go b/internal/iam/repository_principal_role.go index e1221bb99..1fcbbfee0 100644 --- a/internal/iam/repository_principal_role.go +++ b/internal/iam/repository_principal_role.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" ) // AddPrincipalRoles provides the ability to add principals (userIds and diff --git a/internal/iam/repository_principal_role_test.go b/internal/iam/repository_principal_role_test.go index 4fc993e9b..dba18fe1d 100644 --- a/internal/iam/repository_principal_role_test.go +++ b/internal/iam/repository_principal_role_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/iam/repository_role.go b/internal/iam/repository_role.go index 806e725f4..5fe499a5d 100644 --- a/internal/iam/repository_role.go +++ b/internal/iam/repository_role.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - dbcommon "github.com/hashicorp/watchtower/internal/db/common" + "github.com/hashicorp/boundary/internal/db" + dbcommon "github.com/hashicorp/boundary/internal/db/common" ) // CreateRole will create a role in the repository and return the written diff --git a/internal/iam/repository_role_grant.go b/internal/iam/repository_role_grant.go index 33bbf1dc1..12bc5c455 100644 --- a/internal/iam/repository_role_grant.go +++ b/internal/iam/repository_role_grant.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/perms" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/perms" ) // AddRoleGrant will add role grants associated with the role ID in the diff --git a/internal/iam/repository_role_grant_test.go b/internal/iam/repository_role_grant_test.go index ef5659e77..9cee76f01 100644 --- a/internal/iam/repository_role_grant_test.go +++ b/internal/iam/repository_role_grant_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/iam/repository_role_test.go b/internal/iam/repository_role_test.go index a2bd6e0ed..3336ce911 100644 --- a/internal/iam/repository_role_test.go +++ b/internal/iam/repository_role_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/repository_scope.go b/internal/iam/repository_scope.go index 1b9959f46..a88ec81cf 100644 --- a/internal/iam/repository_scope.go +++ b/internal/iam/repository_scope.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - dbcommon "github.com/hashicorp/watchtower/internal/db/common" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + dbcommon "github.com/hashicorp/boundary/internal/db/common" + "github.com/hashicorp/boundary/internal/types/scope" ) // CreateScope will create a scope in the repository and return the written diff --git a/internal/iam/repository_scope_test.go b/internal/iam/repository_scope_test.go index b28bbe1e1..4f85be860 100644 --- a/internal/iam/repository_scope_test.go +++ b/internal/iam/repository_scope_test.go @@ -7,11 +7,11 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - iam_store "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + iam_store "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/repository_test.go b/internal/iam/repository_test.go index be1486924..caea6c8af 100644 --- a/internal/iam/repository_test.go +++ b/internal/iam/repository_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/golang/protobuf/ptypes" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/db/timestamp" + iam_store "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/oplog/store" + "github.com/hashicorp/boundary/internal/types/scope" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/db/timestamp" - iam_store "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/oplog/store" - "github.com/hashicorp/watchtower/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/repository_user.go b/internal/iam/repository_user.go index 7ee2f112f..c44674c7b 100644 --- a/internal/iam/repository_user.go +++ b/internal/iam/repository_user.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - dbcommon "github.com/hashicorp/watchtower/internal/db/common" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + dbcommon "github.com/hashicorp/boundary/internal/db/common" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/scope" ) // CreateUser will create a user in the repository and return the written user diff --git a/internal/iam/repository_user_test.go b/internal/iam/repository_user_test.go index de2ccbd20..c93b50bae 100644 --- a/internal/iam/repository_user_test.go +++ b/internal/iam/repository_user_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/oplog" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/oplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/resource.go b/internal/iam/resource.go index 8e80aa322..cf081fda7 100644 --- a/internal/iam/resource.go +++ b/internal/iam/resource.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" ) // Resource declares the shared behavior of IAM Resources diff --git a/internal/iam/resource_test.go b/internal/iam/resource_test.go index 1d7870f8e..61a9bba04 100644 --- a/internal/iam/resource_test.go +++ b/internal/iam/resource_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/role.go b/internal/iam/role.go index f7e02ffca..122a545c8 100644 --- a/internal/iam/role.go +++ b/internal/iam/role.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/role_grant.go b/internal/iam/role_grant.go index c5431d643..63ac178fa 100644 --- a/internal/iam/role_grant.go +++ b/internal/iam/role_grant.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/perms" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/perms" + "github.com/hashicorp/boundary/internal/types/resource" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/role_grant_test.go b/internal/iam/role_grant_test.go index 3a8d49506..a5fbd812f 100644 --- a/internal/iam/role_grant_test.go +++ b/internal/iam/role_grant_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/role_test.go b/internal/iam/role_test.go index 70bdfde1d..f066542df 100644 --- a/internal/iam/role_test.go +++ b/internal/iam/role_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/oplog" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/scope.go b/internal/iam/scope.go index 0623e06d5..5b93f889e 100644 --- a/internal/iam/scope.go +++ b/internal/iam/scope.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/protobuf/proto" ) diff --git a/internal/iam/scope_test.go b/internal/iam/scope_test.go index bab146575..12bee7293 100644 --- a/internal/iam/scope_test.go +++ b/internal/iam/scope_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/iam/store/group.pb.go b/internal/iam/store/group.pb.go index 5557b0547..e3aed98f6 100644 --- a/internal/iam/store/group.pb.go +++ b/internal/iam/store/group.pb.go @@ -8,8 +8,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -188,11 +188,11 @@ var file_controller_storage_iam_store_v1_group_proto_rawDesc = []byte{ 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, - 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, - 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, + 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, + 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/store/group_member.pb.go b/internal/iam/store/group_member.pb.go index fde8fe8d5..e64a65b1c 100644 --- a/internal/iam/store/group_member.pb.go +++ b/internal/iam/store/group_member.pb.go @@ -8,7 +8,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -245,11 +245,11 @@ var file_controller_storage_iam_store_v1_group_member_proto_rawDesc = []byte{ 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, - 0x64, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, - 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, - 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, + 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, + 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/store/principal_role.pb.go b/internal/iam/store/principal_role.pb.go index bfbaad2f5..374413378 100644 --- a/internal/iam/store/principal_role.pb.go +++ b/internal/iam/store/principal_role.pb.go @@ -8,7 +8,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -323,11 +323,11 @@ var file_controller_storage_iam_store_v1_principal_role_proto_rawDesc = []byte{ 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6e, - 0x63, 0x69, 0x70, 0x61, 0x6c, 0x49, 0x64, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x63, 0x69, 0x70, 0x61, 0x6c, 0x49, 0x64, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, - 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, - 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, + 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/store/role.pb.go b/internal/iam/store/role.pb.go index 61b7932a7..a1a780fae 100644 --- a/internal/iam/store/role.pb.go +++ b/internal/iam/store/role.pb.go @@ -8,8 +8,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -203,11 +203,11 @@ var file_controller_storage_iam_store_v1_role_proto_rawDesc = []byte{ 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x22, 0xc2, 0xdd, 0x29, 0x1e, 0x0a, 0x0c, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x12, 0x0e, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x5f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x69, 0x64, 0x52, 0x0c, 0x67, 0x72, - 0x61, 0x6e, 0x74, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, + 0x61, 0x6e, 0x74, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x64, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, - 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, - 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, + 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/store/role_grant.pb.go b/internal/iam/store/role_grant.pb.go index d3f492f60..e9f84fa47 100644 --- a/internal/iam/store/role_grant.pb.go +++ b/internal/iam/store/role_grant.pb.go @@ -8,7 +8,7 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -131,11 +131,11 @@ var file_controller_storage_iam_store_v1_role_grant_proto_rawDesc = []byte{ 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x61, 0x77, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x61, 0x6e, - 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x42, 0x3a, 0x5a, 0x38, 0x67, + 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, - 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, + 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/store/scope.pb.go b/internal/iam/store/scope.pb.go index b4bc371e9..d6f345c22 100644 --- a/internal/iam/store/scope.pb.go +++ b/internal/iam/store/scope.pb.go @@ -8,8 +8,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -183,11 +183,11 @@ var file_controller_storage_iam_store_v1_scope_proto_rawDesc = []byte{ 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, - 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, - 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, - 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, - 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, + 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, + 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/internal/iam/store/user.pb.go b/internal/iam/store/user.pb.go index 464d6c37b..9fb9890a8 100644 --- a/internal/iam/store/user.pb.go +++ b/internal/iam/store/user.pb.go @@ -8,8 +8,8 @@ package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" - _ "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + 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" @@ -184,11 +184,11 @@ var file_controller_storage_iam_store_v1_user_proto_rawDesc = []byte{ 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x69, 0x61, 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6f, 0x6e, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, 0x61, + 0x6d, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/iam/testing.go b/internal/iam/testing.go index 7e635a288..dd92f5dd5 100644 --- a/internal/iam/testing.go +++ b/internal/iam/testing.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/hashicorp/boundary/internal/auth/store" + "github.com/hashicorp/boundary/internal/db" + dbassert "github.com/hashicorp/boundary/internal/db/assert" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/watchtower/internal/auth/store" - "github.com/hashicorp/watchtower/internal/db" - dbassert "github.com/hashicorp/watchtower/internal/db/assert" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/iam/testing_test.go b/internal/iam/testing_test.go index 3cec2e879..3860e60a9 100644 --- a/internal/iam/testing_test.go +++ b/internal/iam/testing_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/db" + "github.com/hashicorp/boundary/internal/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/iam/user.go b/internal/iam/user.go index 041f7d53e..40b9797e7 100644 --- a/internal/iam/user.go +++ b/internal/iam/user.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/protobuf/proto" ) @@ -16,7 +16,7 @@ const ( defaultUserTableName = "iam_user" ) -// User defines watchtower users which are scoped to an Org +// User defines boundary users which are scoped to an Org type User struct { *store.User tableName string `gorm:"-"` diff --git a/internal/iam/user_test.go b/internal/iam/user_test.go index 70b42e60f..0d72cc1e9 100644 --- a/internal/iam/user_test.go +++ b/internal/iam/user_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/oplog/README.md b/internal/oplog/README.md index eac3e4d7d..3df75bde5 100644 --- a/internal/oplog/README.md +++ b/internal/oplog/README.md @@ -1,6 +1,6 @@ # oplog -oplog is a package for writing operation log (oplog) entries for the purpose of replication and verification of the data stored in the Watchtower RDBMS. +oplog is a package for writing operation log (oplog) entries for the purpose of replication and verification of the data stored in the Boundary RDBMS. - [oplog](#oplog) - [Usage](#usage) @@ -66,9 +66,9 @@ if err != nil { tx.Commit() ``` ## TBD/TODO -We need to discuss and decide how Watchtower is going to handle the following oplog things: +We need to discuss and decide how Boundary is going to handle the following oplog things: -* SQL migrations: you'll find the package's [SQL migrations](https://github.com/golang-migrate/migrate) under: ./migrations/postgres We need to decide how Watchtower will manage migrations across the system and we will likely need to reference this package's migrations somehow. +* SQL migrations: you'll find the package's [SQL migrations](https://github.com/golang-migrate/migrate) under: ./migrations/postgres We need to decide how Boundary will manage migrations across the system and we will likely need to reference this package's migrations somehow. ## oplog entry ``` diff --git a/internal/oplog/any_operation.pb.go b/internal/oplog/any_operation.pb.go index 526665f44..e7991c755 100644 --- a/internal/oplog/any_operation.pb.go +++ b/internal/oplog/any_operation.pb.go @@ -202,11 +202,11 @@ var file_controller_storage_oplog_v1_any_operation_proto_rawDesc = []byte{ 0x50, 0x45, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x4f, 0x50, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4f, 0x50, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, - 0x45, 0x10, 0x03, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, - 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, - 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x45, 0x10, 0x03, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, + 0x6c, 0x6f, 0x67, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/internal/oplog/docs.go b/internal/oplog/docs.go index fab0a3b9b..b707f273f 100644 --- a/internal/oplog/docs.go +++ b/internal/oplog/docs.go @@ -1,3 +1,3 @@ -// oplog is a package for writing operational log (oplog) entries for the purpose of replication and verification of the data stored in the Watchtower RDBMS. +// oplog is a package for writing operational log (oplog) entries for the purpose of replication and verification of the data stored in the Boundary RDBMS. // please see README.md in this directory for more information. package oplog diff --git a/internal/oplog/immutable_fields_test.go b/internal/oplog/immutable_fields_test.go index 883b415d5..ecdd941e3 100644 --- a/internal/oplog/immutable_fields_test.go +++ b/internal/oplog/immutable_fields_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/watchtower/internal/db/timestamp" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" - "github.com/hashicorp/watchtower/internal/oplog/store" + "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" + "github.com/hashicorp/boundary/internal/oplog/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/oplog/oplog.go b/internal/oplog/oplog.go index fa1f8afd0..6a966818a 100644 --- a/internal/oplog/oplog.go +++ b/internal/oplog/oplog.go @@ -10,7 +10,7 @@ import ( wrapping "github.com/hashicorp/go-kms-wrapping" structwrapping "github.com/hashicorp/go-kms-wrapping/structwrapping" - "github.com/hashicorp/watchtower/internal/oplog/store" + "github.com/hashicorp/boundary/internal/oplog/store" _ "github.com/lib/pq" "google.golang.org/protobuf/proto" ) @@ -210,7 +210,7 @@ func (e *Entry) Replay(ctx context.Context, tx Writer, types *TypeCatalog, table * the fk references would be to the original tables, not the new replay tables. It may be a better choice to just create separate schemas for replay named blue and green since we need at min of two replay tables definitions. if we went with separate schemas they - could be create with a watchtower cli cmd that had appropriate privs (reducing security issues) + could be create with a boundary cli cmd that had appropriate privs (reducing security issues) and the separate schemas wouldn't have the fk reference issues mentioned above. */ replayTable := origTableName + tableSuffix diff --git a/internal/oplog/oplog_test.go b/internal/oplog/oplog_test.go index 428453c81..d68d58d39 100644 --- a/internal/oplog/oplog_test.go +++ b/internal/oplog/oplog_test.go @@ -7,7 +7,7 @@ import ( dbassert "github.com/hashicorp/dbassert/gorm" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/oplog/oplog_test/oplog_test.pb.go b/internal/oplog/oplog_test/oplog_test.pb.go index e2bc75ca4..506f99617 100644 --- a/internal/oplog/oplog_test/oplog_test.pb.go +++ b/internal/oplog/oplog_test/oplog_test.pb.go @@ -355,12 +355,12 @@ var file_controller_storage_oplog_test_v1_oplog_test_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, - 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, - 0x74, 0x65, 0x73, 0x74, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, + 0x73, 0x74, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/internal/oplog/queue.go b/internal/oplog/queue.go index ea5e667c0..597e28c1f 100644 --- a/internal/oplog/queue.go +++ b/internal/oplog/queue.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - common "github.com/hashicorp/watchtower/internal/db/common" + common "github.com/hashicorp/boundary/internal/db/common" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/protobuf/proto" ) diff --git a/internal/oplog/queue_test.go b/internal/oplog/queue_test.go index f428fc8a8..09696a3bc 100644 --- a/internal/oplog/queue_test.go +++ b/internal/oplog/queue_test.go @@ -3,7 +3,7 @@ package oplog import ( "testing" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/oplog/store/oplog.pb.go b/internal/oplog/store/oplog.pb.go index 399863400..872e0692c 100644 --- a/internal/oplog/store/oplog.pb.go +++ b/internal/oplog/store/oplog.pb.go @@ -4,13 +4,13 @@ // protoc v3.12.4 // source: controller/storage/oplog/store/v1/oplog.proto -// define an oplog package within the watchtower controller +// define an oplog package within the boundary controller package store import ( proto "github.com/golang/protobuf/proto" - timestamp "github.com/hashicorp/watchtower/internal/db/timestamp" + timestamp "github.com/hashicorp/boundary/internal/db/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -384,12 +384,12 @@ var file_controller_storage_oplog_store_v1_oplog_proto_rawDesc = []byte{ 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x3c, - 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, - 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, - 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, - 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x3a, + 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, 0x73, + 0x74, 0x6f, 0x72, 0x65, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/internal/oplog/testing.go b/internal/oplog/testing.go index d59a1e8c4..9f962a29b 100644 --- a/internal/oplog/testing.go +++ b/internal/oplog/testing.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/golang-migrate/migrate/v4" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-kms-wrapping/wrappers/aead" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" "github.com/jinzhu/gorm" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/assert" @@ -65,7 +65,7 @@ func testInitDbInDocker(t *testing.T) (cleanup func(), retURL string, err error) pool, err := dockertest.NewPool("") require.NoErrorf(t, err, "could not connect to docker: %w", err) - resource, err := pool.Run("postgres", "latest", []string{"POSTGRES_PASSWORD=secret", "POSTGRES_DB=watchtower"}) + resource, err := pool.Run("postgres", "latest", []string{"POSTGRES_PASSWORD=secret", "POSTGRES_DB=boundary"}) require.NoErrorf(t, err, "could not start resource: %w", err) c := func() { diff --git a/internal/oplog/ticketer.go b/internal/oplog/ticketer.go index 53042964c..cbf4d38e4 100644 --- a/internal/oplog/ticketer.go +++ b/internal/oplog/ticketer.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/watchtower/internal/oplog/store" + "github.com/hashicorp/boundary/internal/oplog/store" "github.com/jinzhu/gorm" ) diff --git a/internal/oplog/type_catalog_test.go b/internal/oplog/type_catalog_test.go index 16e011c97..9a14fa236 100644 --- a/internal/oplog/type_catalog_test.go +++ b/internal/oplog/type_catalog_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/oplog/writer.go b/internal/oplog/writer.go index 94462d9a1..ebd89ab96 100644 --- a/internal/oplog/writer.go +++ b/internal/oplog/writer.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/watchtower/internal/db/common" + "github.com/hashicorp/boundary/internal/db/common" "github.com/jinzhu/gorm" ) diff --git a/internal/oplog/writer_test.go b/internal/oplog/writer_test.go index 9c3d8e4fe..1b3832e43 100644 --- a/internal/oplog/writer_test.go +++ b/internal/oplog/writer_test.go @@ -3,8 +3,8 @@ package oplog import ( "testing" + "github.com/hashicorp/boundary/internal/oplog/oplog_test" dbassert "github.com/hashicorp/dbassert/gorm" - "github.com/hashicorp/watchtower/internal/oplog/oplog_test" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/perms/acl.go b/internal/perms/acl.go index cc8732dc3..e323f152a 100644 --- a/internal/perms/acl.go +++ b/internal/perms/acl.go @@ -19,8 +19,8 @@ construction is thus synthesizing something reasonable from a set of Grants. */ import ( - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" ) // ACL provides an entry point into the permissions engine for determining if an @@ -39,7 +39,7 @@ type ACLResults struct { scopeMap map[string][]Grant } -// Resource defines something within watchtower that requires authorization +// Resource defines something within boundary that requires authorization // capabilities. Resources must have a ScopeId. type Resource struct { // ScopeId is the scope that contains the Resource. diff --git a/internal/perms/acl_test.go b/internal/perms/acl_test.go index a1272e896..e1151a91a 100644 --- a/internal/perms/acl_test.go +++ b/internal/perms/acl_test.go @@ -3,8 +3,8 @@ package perms import ( "testing" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/perms/doc.go b/internal/perms/doc.go index 6042be4ef..5f4c59499 100644 --- a/internal/perms/doc.go +++ b/internal/perms/doc.go @@ -1,5 +1,5 @@ /* -Package perms provides the watchtower permissions engine using grants which are +Package perms provides the boundary permissions engine using grants which are tied to IAM Roles within a Scope. A really useful page to be aware of when looking at ACLs is diff --git a/internal/perms/grants.go b/internal/perms/grants.go index 9d1d55eec..c05163cfb 100644 --- a/internal/perms/grants.go +++ b/internal/perms/grants.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" ) // GrantPair is simply a struct that can be reference from other code to return diff --git a/internal/perms/grants_test.go b/internal/perms/grants_test.go index 39188babe..098d0d0e3 100644 --- a/internal/perms/grants_test.go +++ b/internal/perms/grants_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "github.com/hashicorp/watchtower/internal/types/action" - "github.com/hashicorp/watchtower/internal/types/resource" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/types/action" + "github.com/hashicorp/boundary/internal/types/resource" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/proto/local/controller/api/resources/authmethods/v1/account.proto b/internal/proto/local/controller/api/resources/authmethods/v1/account.proto index 0afbcbed5..08a4cb590 100644 --- a/internal/proto/local/controller/api/resources/authmethods/v1/account.proto +++ b/internal/proto/local/controller/api/resources/authmethods/v1/account.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.authmethods.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods;authmethods"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods;authmethods"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/authmethods/v1/auth_method.proto b/internal/proto/local/controller/api/resources/authmethods/v1/auth_method.proto index 74c6ee910..117c6174a 100644 --- a/internal/proto/local/controller/api/resources/authmethods/v1/auth_method.proto +++ b/internal/proto/local/controller/api/resources/authmethods/v1/auth_method.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.authmethods.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods;authmethods"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods;authmethods"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/authtokens/v1/authtoken.proto b/internal/proto/local/controller/api/resources/authtokens/v1/authtoken.proto index 1869e2c2c..ba947bd25 100644 --- a/internal/proto/local/controller/api/resources/authtokens/v1/authtoken.proto +++ b/internal/proto/local/controller/api/resources/authtokens/v1/authtoken.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.authtokens.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens;authtokens"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens;authtokens"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/groups/v1/group.proto b/internal/proto/local/controller/api/resources/groups/v1/group.proto index 8b7fcdee7..b3610bebc 100644 --- a/internal/proto/local/controller/api/resources/groups/v1/group.proto +++ b/internal/proto/local/controller/api/resources/groups/v1/group.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.groups.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/groups;groups"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups;groups"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/hosts/v1/host.proto b/internal/proto/local/controller/api/resources/hosts/v1/host.proto index 1a8ccfacf..8e5b0cd42 100644 --- a/internal/proto/local/controller/api/resources/hosts/v1/host.proto +++ b/internal/proto/local/controller/api/resources/hosts/v1/host.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.hosts.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts;hosts"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts;hosts"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/hosts/v1/host_catalog.proto b/internal/proto/local/controller/api/resources/hosts/v1/host_catalog.proto index 397c86699..bc8bb3e57 100644 --- a/internal/proto/local/controller/api/resources/hosts/v1/host_catalog.proto +++ b/internal/proto/local/controller/api/resources/hosts/v1/host_catalog.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.hosts.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts;hosts"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts;hosts"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/hosts/v1/host_set.proto b/internal/proto/local/controller/api/resources/hosts/v1/host_set.proto index 6dc072efc..dd4a908eb 100644 --- a/internal/proto/local/controller/api/resources/hosts/v1/host_set.proto +++ b/internal/proto/local/controller/api/resources/hosts/v1/host_set.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.hosts.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts;hosts"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts;hosts"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/roles/v1/role.proto b/internal/proto/local/controller/api/resources/roles/v1/role.proto index d2a88f13b..d85da5b18 100644 --- a/internal/proto/local/controller/api/resources/roles/v1/role.proto +++ b/internal/proto/local/controller/api/resources/roles/v1/role.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.roles.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/roles;roles"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles;roles"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/scopes/v1/scope.proto b/internal/proto/local/controller/api/resources/scopes/v1/scope.proto index 2525de9df..b8e21ee0e 100644 --- a/internal/proto/local/controller/api/resources/scopes/v1/scope.proto +++ b/internal/proto/local/controller/api/resources/scopes/v1/scope.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.scopes.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes;scopes"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes;scopes"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/resources/users/v1/user.proto b/internal/proto/local/controller/api/resources/users/v1/user.proto index c1026c2be..46781644e 100644 --- a/internal/proto/local/controller/api/resources/users/v1/user.proto +++ b/internal/proto/local/controller/api/resources/users/v1/user.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.resources.users.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/users;users"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users;users"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/internal/proto/local/controller/api/services/v1/auth_method_service.proto b/internal/proto/local/controller/api/services/v1/auth_method_service.proto index 5845b267b..ddb78ae25 100644 --- a/internal/proto/local/controller/api/services/v1/auth_method_service.proto +++ b/internal/proto/local/controller/api/services/v1/auth_method_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -37,7 +37,7 @@ service AuthMethodService { }; } - // CreateAuthMethod creates and stores a user in watchtower. The provided + // CreateAuthMethod creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in @@ -53,7 +53,7 @@ service AuthMethodService { }; } - // UpdateAuthMethod updates an existing user in watchtower. The provided + // UpdateAuthMethod updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -72,7 +72,7 @@ service AuthMethodService { }; } - // DeleteAuthMethod removes a user from Watchtower. If the provided org or user ids + // DeleteAuthMethod removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthMethod request was diff --git a/internal/proto/local/controller/api/services/v1/authaccount_service.proto b/internal/proto/local/controller/api/services/v1/authaccount_service.proto index 49fc7573e..84c4a65cf 100644 --- a/internal/proto/local/controller/api/services/v1/authaccount_service.proto +++ b/internal/proto/local/controller/api/services/v1/authaccount_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -39,7 +39,7 @@ service AccountService { }; } - // CreateAccount creates and stores an account in watchtower. The provided + // CreateAccount creates and stores an account in boundary. The provided // request must include the auth method id in which the account will be created. // If the auth method id is missing, malformed or references a non existing // auth method, an error is returned. If a name is provided that is in @@ -55,7 +55,7 @@ service AccountService { }; } - // UpdateAccount updates an existing account in watchtower. The provided account + // UpdateAccount updates an existing account in boundary. The provided account // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -74,7 +74,7 @@ service AccountService { }; } - // DeleteAccount removes an account from Watchtower. If the provided auth mehtod + // DeleteAccount removes an account from Boundary. If the provided auth mehtod // or account ids are malformed or not provided an error is returned. No error is // returned if either ids reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteAccount diff --git a/internal/proto/local/controller/api/services/v1/authenticate_service.proto b/internal/proto/local/controller/api/services/v1/authenticate_service.proto index 6c51f12c3..434a8da83 100644 --- a/internal/proto/local/controller/api/services/v1/authenticate_service.proto +++ b/internal/proto/local/controller/api/services/v1/authenticate_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; diff --git a/internal/proto/local/controller/api/services/v1/authtokens_service.proto b/internal/proto/local/controller/api/services/v1/authtokens_service.proto index 822bed588..d4c81c46a 100644 --- a/internal/proto/local/controller/api/services/v1/authtokens_service.proto +++ b/internal/proto/local/controller/api/services/v1/authtokens_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -37,7 +37,7 @@ service AuthTokenService { }; } - // DeleteAuthToken removes a auth token from Watchtower. If the provided org or + // DeleteAuthToken removes a auth token from Boundary. If the provided org or // auth token ids are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteAuthToken request was diff --git a/internal/proto/local/controller/api/services/v1/group_service.proto b/internal/proto/local/controller/api/services/v1/group_service.proto index c9641c89f..8cf774de5 100644 --- a/internal/proto/local/controller/api/services/v1/group_service.proto +++ b/internal/proto/local/controller/api/services/v1/group_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -40,7 +40,7 @@ service GroupService { }; } - // CreateGroup creates and stores a group in watchtower. The provided + // CreateGroup creates and stores a group in boundary. The provided // request must include the scope ID in which the group will be created. // If the scope ID is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in @@ -56,7 +56,7 @@ service GroupService { }; } - // UpdateGroup updates an existing group in watchtower. The provided group + // UpdateGroup updates an existing group in boundary. The provided group // must not have any read only fields set. The update mask must be included in // the request and contain at least 1 mutable field. To unset a field's value, // include the field in the update mask and don't set it in the provided @@ -75,7 +75,7 @@ service GroupService { }; } - // DeleteGroup removes a group from Watchtower. If the provided scope or group + // DeleteGroup removes a group from Boundary. If the provided scope or group // IDs are malformed or not provided an error is returned. No error is // returned if either IDs reference resources that do not exist as the // response itself specifies if the resource existed before the DeleteGroup diff --git a/internal/proto/local/controller/api/services/v1/host_catalog_service.proto b/internal/proto/local/controller/api/services/v1/host_catalog_service.proto index 0d034f81a..c5b4e7870 100644 --- a/internal/proto/local/controller/api/services/v1/host_catalog_service.proto +++ b/internal/proto/local/controller/api/services/v1/host_catalog_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -44,7 +44,7 @@ service HostCatalogService { }; } - // CreateHostCatalog creates and stores a HostCatalog in watchtower. The + // CreateHostCatalog creates and stores a HostCatalog in boundary. The // provided request must include the scope ID in which the catalog will be // created and the catalog type to be created. If any of these required fields // are missing, malformed, or reference a non-existing parent resource an @@ -61,7 +61,7 @@ service HostCatalogService { }; } - // UpdateHostCatalog updates an existing HostCatalog in Watchtower. The + // UpdateHostCatalog updates an existing HostCatalog in Boundary. The // provided HostCatalog must not have any read only fields set. The update // mask must be provided and include at least 1 mutable field. To unset a // field's value include that field name in the update mask and don't set the @@ -78,7 +78,7 @@ service HostCatalogService { } // DeleteHostCatalog removes a HostCatalog and all associated hosts and host - // sets from Watchtower. If the provided scope or HostCatalog IDs are + // sets from Boundary. If the provided scope or HostCatalog IDs are // malformed or not provided DeleteHostCatalog returns an error. It is not an // error to call DeleteHostCatalog for an scope or HostCatalog that does not // exist as the response indicates if it existed or not. diff --git a/internal/proto/local/controller/api/services/v1/host_service.proto b/internal/proto/local/controller/api/services/v1/host_service.proto index 3444408b3..3eb9caa7f 100644 --- a/internal/proto/local/controller/api/services/v1/host_service.proto +++ b/internal/proto/local/controller/api/services/v1/host_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; diff --git a/internal/proto/local/controller/api/services/v1/host_set_service.proto b/internal/proto/local/controller/api/services/v1/host_set_service.proto index 7fe95379f..b6760caee 100644 --- a/internal/proto/local/controller/api/services/v1/host_set_service.proto +++ b/internal/proto/local/controller/api/services/v1/host_set_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; diff --git a/internal/proto/local/controller/api/services/v1/role_service.proto b/internal/proto/local/controller/api/services/v1/role_service.proto index c60400778..6d906e15f 100644 --- a/internal/proto/local/controller/api/services/v1/role_service.proto +++ b/internal/proto/local/controller/api/services/v1/role_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -54,7 +54,7 @@ service RoleService { }; } - // UpdateRole updates an existing role in watchtower. The provided + // UpdateRole updates an existing role in boundary. The provided // role must not have any read-only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -73,7 +73,7 @@ service RoleService { }; } - // DeleteRole removes a role from Watchtower. If the provided scope or role IDs + // DeleteRole removes a role from Boundary. If the provided scope or role IDs // are malformed, or not provided an error is returned. No error is returned // if either IDs reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteRole request was diff --git a/internal/proto/local/controller/api/services/v1/scope_service.proto b/internal/proto/local/controller/api/services/v1/scope_service.proto index 75d5eea19..cd098c395 100644 --- a/internal/proto/local/controller/api/services/v1/scope_service.proto +++ b/internal/proto/local/controller/api/services/v1/scope_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -36,7 +36,7 @@ service ScopeService { }; } - // CreateScope creates and stores a scope in watchtower. The provided request + // CreateScope creates and stores a scope in boundary. The provided request // must include the scope ID in which the scope will be created. If the scope // ID is missing, malformed or references a non existing scope, an error is // returned. If a name is provided that is in use in another scope in the same @@ -52,7 +52,7 @@ service ScopeService { }; } - // UpdateScope updates an existing scope in watchtower. The provided + // UpdateScope updates an existing scope in boundary. The provided // scope must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -71,7 +71,7 @@ service ScopeService { }; } - // DeleteScope remotes a scope and all child resources from Watchtower. If the + // DeleteScope remotes a scope and all child resources from Boundary. If the // provided scope IDs are malformed or not provided an error is returned. No // error is returned if the ID references a resource that does not exist as // the response itself specifies if the resource existed before the diff --git a/internal/proto/local/controller/api/services/v1/user_service.proto b/internal/proto/local/controller/api/services/v1/user_service.proto index d179439e2..b46e2ea07 100644 --- a/internal/proto/local/controller/api/services/v1/user_service.proto +++ b/internal/proto/local/controller/api/services/v1/user_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.services.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/services;services"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api/services;services"; import "protoc-gen-openapiv2/options/annotations.proto"; import "google/api/annotations.proto"; @@ -38,7 +38,7 @@ service UserService { }; } - // CreateUser creates and stores a user in watchtower. The provided + // CreateUser creates and stores a user in boundary. The provided // request must include the org id in which the user will be created. // If the org id is missing, malformed or references a non existing // org, an error is returned. If a name is provided that is in @@ -54,7 +54,7 @@ service UserService { }; } - // UpdateUser updates an existing user in watchtower. The provided + // UpdateUser updates an existing user in boundary. The provided // user must not have any read only fields set. The update mask must be // included in the request and contain at least 1 mutable field. To unset // a field's value, include the field in the update mask and don't set it @@ -73,7 +73,7 @@ service UserService { }; } - // DeleteUser removes a user from Watchtower. If the provided org or user ids + // DeleteUser removes a user from Boundary. If the provided org or user ids // are malformed or not provided an error is returned. No error is returned // if either ids reference resources that do not exist as the response itself // specifies if the resource existed before the DeleteUser request was diff --git a/internal/proto/local/controller/api/v1/error.proto b/internal/proto/local/controller/api/v1/error.proto index b0b69d7bc..e42f520c4 100644 --- a/internal/proto/local/controller/api/v1/error.proto +++ b/internal/proto/local/controller/api/v1/error.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.api.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api;api"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/api;api"; message ErrorDetails { string TraceId = 1 [json_name="TraceId"]; diff --git a/internal/proto/local/controller/custom_options/v1/options.proto b/internal/proto/local/controller/custom_options/v1/options.proto index aee9d662c..e8578d946 100644 --- a/internal/proto/local/controller/custom_options/v1/options.proto +++ b/internal/proto/local/controller/custom_options/v1/options.proto @@ -3,7 +3,7 @@ package controller.custom_options.v1; import "google/protobuf/descriptor.proto"; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/protooptions;protooptions"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/protooptions;protooptions"; extend google.protobuf.FieldOptions { // mask_mapping is an option which tags a field with the expected field mask diff --git a/internal/proto/local/controller/custom_options/v1/testing.proto b/internal/proto/local/controller/custom_options/v1/testing.proto index 3e955cc75..2149474b0 100644 --- a/internal/proto/local/controller/custom_options/v1/testing.proto +++ b/internal/proto/local/controller/custom_options/v1/testing.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.custom_options.v1; -option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/protooptions;protooptions"; +option go_package = "github.com/hashicorp/boundary/internal/gen/controller/protooptions;protooptions"; import "controller/custom_options/v1/options.proto"; diff --git a/internal/proto/local/controller/storage/auth/password/store/v1/argon2.proto b/internal/proto/local/controller/storage/auth/password/store/v1/argon2.proto index 67b264051..df396eaa1 100644 --- a/internal/proto/local/controller/storage/auth/password/store/v1/argon2.proto +++ b/internal/proto/local/controller/storage/auth/password/store/v1/argon2.proto @@ -2,7 +2,7 @@ syntax = "proto3"; // Package store provides protobufs for storing types in the password package. package controller.storage.auth.password.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/auth/password/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/auth/password/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/auth/password/store/v1/password.proto b/internal/proto/local/controller/storage/auth/password/store/v1/password.proto index f6b65c319..3fe16eee7 100644 --- a/internal/proto/local/controller/storage/auth/password/store/v1/password.proto +++ b/internal/proto/local/controller/storage/auth/password/store/v1/password.proto @@ -2,7 +2,7 @@ syntax = "proto3"; // Package store provides protobufs for storing types in the password package. package controller.storage.auth.password.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/auth/password/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/auth/password/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/custom_options/v1/options.proto"; diff --git a/internal/proto/local/controller/storage/auth/store/v1/account.proto b/internal/proto/local/controller/storage/auth/store/v1/account.proto index 84b7a6444..4ecfb9908 100644 --- a/internal/proto/local/controller/storage/auth/store/v1/account.proto +++ b/internal/proto/local/controller/storage/auth/store/v1/account.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.auth.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/auth/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/auth/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/auth/store/v1/auth_method.proto b/internal/proto/local/controller/storage/auth/store/v1/auth_method.proto index b5cf3c303..dc74ffad9 100644 --- a/internal/proto/local/controller/storage/auth/store/v1/auth_method.proto +++ b/internal/proto/local/controller/storage/auth/store/v1/auth_method.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.auth.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/auth/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/auth/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/authtoken/store/v1/authtoken.proto b/internal/proto/local/controller/storage/authtoken/store/v1/authtoken.proto index 3efa5b6f5..7eff8b056 100644 --- a/internal/proto/local/controller/storage/authtoken/store/v1/authtoken.proto +++ b/internal/proto/local/controller/storage/authtoken/store/v1/authtoken.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.authtoken.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/authtoken/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/authtoken/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; @@ -18,7 +18,7 @@ message AuthToken { // @inject_tag: `gorm:"default:current_timestamp"` timestamp.v1.Timestamp update_time = 3; - // last_access_time indicates the last time the auth token was used on the watchtower API. + // last_access_time indicates the last time the auth token was used on the boundary API. // @inject_tag: `gorm:"default:current_timestamp"` timestamp.v1.Timestamp approximate_last_access_time = 4; diff --git a/internal/proto/local/controller/storage/db/db_test/v1/db_test.proto b/internal/proto/local/controller/storage/db/db_test/v1/db_test.proto index 0d0b763a9..22917ef95 100644 --- a/internal/proto/local/controller/storage/db/db_test/v1/db_test.proto +++ b/internal/proto/local/controller/storage/db/db_test/v1/db_test.proto @@ -1,10 +1,10 @@ syntax = "proto3"; // define a test proto package for the internal/db package. These protos -// are only used for unit tests and are not part of the rest of the watchtower +// are only used for unit tests and are not part of the rest of the boundary // domain model package controller.storage.db.db_test.v1; -option go_package = "github.com/hashicorp/watchtower/internal/db/db_test;db_test"; +option go_package = "github.com/hashicorp/boundary/internal/db/db_test;db_test"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/host/static/store/v1/static.proto b/internal/proto/local/controller/storage/host/static/store/v1/static.proto index 11bc2aa6f..b3dbe8463 100644 --- a/internal/proto/local/controller/storage/host/static/store/v1/static.proto +++ b/internal/proto/local/controller/storage/host/static/store/v1/static.proto @@ -3,7 +3,7 @@ syntax = "proto3"; // Package store provides protobufs for storing types in the static host // package. package controller.storage.host.static.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/host/static/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/host/static/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/custom_options/v1/options.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/group.proto b/internal/proto/local/controller/storage/iam/store/v1/group.proto index 832c93887..6f9475dcf 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/group.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/group.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/storage/iam/store/v1/scope.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/group_member.proto b/internal/proto/local/controller/storage/iam/store/v1/group_member.proto index 186588e6d..c190bd586 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/group_member.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/group_member.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/storage/iam/store/v1/scope.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/principal_role.proto b/internal/proto/local/controller/storage/iam/store/v1/principal_role.proto index a9e2b554a..aef7cc349 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/principal_role.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/principal_role.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/storage/iam/store/v1/scope.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/role.proto b/internal/proto/local/controller/storage/iam/store/v1/role.proto index 1c585b605..8f97cbab6 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/role.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/role.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/storage/iam/store/v1/scope.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/role_grant.proto b/internal/proto/local/controller/storage/iam/store/v1/role_grant.proto index 70051d709..c16ba5249 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/role_grant.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/role_grant.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/storage/iam/store/v1/scope.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/scope.proto b/internal/proto/local/controller/storage/iam/store/v1/scope.proto index 2f92a270c..7c8532ee1 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/scope.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/scope.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/custom_options/v1/options.proto"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/iam/store/v1/user.proto b/internal/proto/local/controller/storage/iam/store/v1/user.proto index 8c5f0b0ca..bab2f0f14 100644 --- a/internal/proto/local/controller/storage/iam/store/v1/user.proto +++ b/internal/proto/local/controller/storage/iam/store/v1/user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.iam.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/iam/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/iam/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; import "controller/custom_options/v1/options.proto"; diff --git a/internal/proto/local/controller/storage/oplog/store/v1/oplog.proto b/internal/proto/local/controller/storage/oplog/store/v1/oplog.proto index 9cd609e16..d60c67e2a 100644 --- a/internal/proto/local/controller/storage/oplog/store/v1/oplog.proto +++ b/internal/proto/local/controller/storage/oplog/store/v1/oplog.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -// define an oplog package within the watchtower controller +// define an oplog package within the boundary controller package controller.storage.oplog.store.v1; -option go_package = "github.com/hashicorp/watchtower/internal/oplog/store;store"; +option go_package = "github.com/hashicorp/boundary/internal/oplog/store;store"; import "controller/storage/timestamp/v1/timestamp.proto"; diff --git a/internal/proto/local/controller/storage/oplog/test/v1/oplog_test.proto b/internal/proto/local/controller/storage/oplog/test/v1/oplog_test.proto index 7272c9d3b..aa5813e2c 100644 --- a/internal/proto/local/controller/storage/oplog/test/v1/oplog_test.proto +++ b/internal/proto/local/controller/storage/oplog/test/v1/oplog_test.proto @@ -2,7 +2,7 @@ syntax = "proto3"; // define a test proto package package controller.storage.oplog.test.v1; -option go_package = "github.com/hashicorp/watchtower/internal/oplog/oplog_test;oplog_test"; +option go_package = "github.com/hashicorp/boundary/internal/oplog/oplog_test;oplog_test"; // TestUser for gorm test user model message TestUser { diff --git a/internal/proto/local/controller/storage/oplog/v1/any_operation.proto b/internal/proto/local/controller/storage/oplog/v1/any_operation.proto index d655ccfd9..9020eb4a6 100644 --- a/internal/proto/local/controller/storage/oplog/v1/any_operation.proto +++ b/internal/proto/local/controller/storage/oplog/v1/any_operation.proto @@ -3,7 +3,7 @@ syntax = "proto3"; import "google/protobuf/field_mask.proto"; package controller.storage.oplog.v1; -option go_package = "github.com/hashicorp/watchtower/internal/oplog;oplog"; +option go_package = "github.com/hashicorp/boundary/internal/oplog;oplog"; // OpType provides the type of database operation the Any message represents // (create, update, delete) diff --git a/internal/proto/local/controller/storage/timestamp/v1/timestamp.proto b/internal/proto/local/controller/storage/timestamp/v1/timestamp.proto index ad72a7763..142c28707 100644 --- a/internal/proto/local/controller/storage/timestamp/v1/timestamp.proto +++ b/internal/proto/local/controller/storage/timestamp/v1/timestamp.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package controller.storage.timestamp.v1; -option go_package = "github.com/hashicorp/watchtower/internal/db/timestamp;timestamp"; +option go_package = "github.com/hashicorp/boundary/internal/db/timestamp;timestamp"; import "google/protobuf/timestamp.proto"; diff --git a/internal/servers/controller/common/common.go b/internal/servers/controller/common/common.go index 59f893646..6a846fe23 100644 --- a/internal/servers/controller/common/common.go +++ b/internal/servers/controller/common/common.go @@ -1,10 +1,10 @@ package common import ( - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/host/static" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/host/static" + "github.com/hashicorp/boundary/internal/iam" ) type ( diff --git a/internal/servers/controller/config.go b/internal/servers/controller/config.go index fb59d757b..9af7a5c04 100644 --- a/internal/servers/controller/config.go +++ b/internal/servers/controller/config.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/config" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/config" ) type Config struct { diff --git a/internal/servers/controller/controller.go b/internal/servers/controller/controller.go index efc99ead6..dede2e032 100644 --- a/internal/servers/controller/controller.go +++ b/internal/servers/controller/controller.go @@ -5,14 +5,14 @@ import ( "crypto/rand" "fmt" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/host/static" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/common" "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/sdk/helper/mlock" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/host/static" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/common" ) type Controller struct { @@ -46,10 +46,10 @@ func New(conf *Config) (*Controller, error) { return nil, fmt.Errorf( "Failed to lock memory: %v\n\n"+ "This usually means that the mlock syscall is not available.\n"+ - "Watchtower uses mlock to prevent memory from being swapped to\n"+ + "Boundary uses mlock to prevent memory from being swapped to\n"+ "disk. This requires root privileges as well as a machine\n"+ "that supports mlock. Please enable mlock on your system or\n"+ - "disable Watchtower from using it. To disable Watchtower from using it,\n"+ + "disable Boundary from using it. To disable Boundary from using it,\n"+ "set the `disable_mlock` configuration option in your configuration\n"+ "file.", err) diff --git a/internal/servers/controller/cors_test.go b/internal/servers/controller/cors_test.go index 695ab20ce..31c15d7a5 100644 --- a/internal/servers/controller/cors_test.go +++ b/internal/servers/controller/cors_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/go-retryablehttp" - "github.com/hashicorp/watchtower/internal/cmd/config" ) const corsTestConfig = ` diff --git a/internal/servers/controller/handler.go b/internal/servers/controller/handler.go index b9f744207..427feb618 100644 --- a/internal/servers/controller/handler.go +++ b/internal/servers/controller/handler.go @@ -10,23 +10,23 @@ import ( "time" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/accounts" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/globals" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/accounts" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/authmethods" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/authenticate" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/authtokens" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/groups" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/host_catalogs" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/roles" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/scopes" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/users" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/authenticate" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_catalogs" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/roles" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/scopes" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/users" "google.golang.org/protobuf/encoding/protojson" ) @@ -156,10 +156,10 @@ func wrapHandlerWithCommonFuncs(h http.Handler, c *Controller, props HandlerProp maxRequestSize = globals.DefaultMaxRequestSize } - logUrls := os.Getenv("WATCHTOWER_LOG_URLS") != "" + logUrls := os.Getenv("BOUNDARY_LOG_URLS") != "" disableAuthzFailures := c.conf.DisableAuthorizationFailures || - (c.conf.RawConfig.DevController && os.Getenv("WATCHTOWER_DEV_SKIP_AUTHZ") != "") + (c.conf.RawConfig.DevController && os.Getenv("BOUNDARY_DEV_SKIP_AUTHZ") != "") if disableAuthzFailures { c.logger.Warn("AUTHORIZATION CHECKING DISABLED") } diff --git a/internal/servers/controller/handler_ui.go b/internal/servers/controller/handler_ui.go index 78340be71..cf66c924a 100644 --- a/internal/servers/controller/handler_ui.go +++ b/internal/servers/controller/handler_ui.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/watchtower/internal/ui" + "github.com/hashicorp/boundary/internal/ui" ) func init() { diff --git a/internal/servers/controller/handler_ui_test.go b/internal/servers/controller/handler_ui_test.go index 5bec9443f..ba01807d2 100644 --- a/internal/servers/controller/handler_ui_test.go +++ b/internal/servers/controller/handler_ui_test.go @@ -17,7 +17,7 @@ import ( func TestUiRouting(t *testing.T) { // Create a temporary directory - tempDir, err := ioutil.TempDir("", "watchtower-test-") + tempDir, err := ioutil.TempDir("", "boundary-test-") require.NoError(t, err) defer func() { assert.NoError(t, os.RemoveAll(tempDir)) diff --git a/internal/servers/controller/handlers/accounts/account_service.go b/internal/servers/controller/handlers/accounts/account_service.go index 06d2d0791..c807557e4 100644 --- a/internal/servers/controller/handlers/accounts/account_service.go +++ b/internal/servers/controller/handlers/accounts/account_service.go @@ -7,13 +7,13 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -36,7 +36,7 @@ type Service struct { repoFn func() (*password.Repository, error) } -// NewService returns a user service which handles user related requests to watchtower. +// NewService returns a user service which handles user related requests to boundary. func NewService(repo func() (*password.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil password repository provided") diff --git a/internal/servers/controller/handlers/accounts/account_service_test.go b/internal/servers/controller/handlers/accounts/account_service_test.go index d8d3a7dc9..1e59fe76a 100644 --- a/internal/servers/controller/handlers/accounts/account_service_test.go +++ b/internal/servers/controller/handlers/accounts/account_service_test.go @@ -7,17 +7,17 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/accounts" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/accounts" + "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/handlers/authenticate/authenticate_service.go b/internal/servers/controller/handlers/authenticate/authenticate_service.go index 65fc03bc2..f7d692550 100644 --- a/internal/servers/controller/handlers/authenticate/authenticate_service.go +++ b/internal/servers/controller/handlers/authenticate/authenticate_service.go @@ -6,14 +6,14 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/authtoken" - pba "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/common" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/authtoken" + pba "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/common" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -34,7 +34,7 @@ type Service struct { authTokenRepo common.AuthTokenRepoFactory } -// NewService returns an org service which handles org related requests to watchtower. +// NewService returns an org service which handles org related requests to boundary. func NewService(pwRepo common.PasswordAuthRepoFactory, iamRepo common.IamRepoFactory, atRepo common.AuthTokenRepoFactory) (Service, error) { if iamRepo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/authenticate/authenticate_service_test.go b/internal/servers/controller/handlers/authenticate/authenticate_service_test.go index d12e51159..8d809eccc 100644 --- a/internal/servers/controller/handlers/authenticate/authenticate_service_test.go +++ b/internal/servers/controller/handlers/authenticate/authenticate_service_test.go @@ -6,13 +6,13 @@ import ( "testing" structpb "github.com/golang/protobuf/ptypes/struct" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - pba "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + pba "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service.go b/internal/servers/controller/handlers/authmethods/authmethod_service.go index 4030037fb..93bad6440 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service.go +++ b/internal/servers/controller/handlers/authmethods/authmethod_service.go @@ -7,13 +7,13 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/auth/password/store" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -36,7 +36,7 @@ type Service struct { repoFn func() (*password.Repository, error) } -// NewService returns a auth method service which handles auth method related requests to watchtower. +// NewService returns a auth method service which handles auth method related requests to boundary. func NewService(repo func() (*password.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go b/internal/servers/controller/handlers/authmethods/authmethod_service_test.go index 16cc92ddc..3a8fbd07e 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go +++ b/internal/servers/controller/handlers/authmethods/authmethod_service_test.go @@ -7,15 +7,15 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/auth/password" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/authmethods" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/handlers/authtokens/authtoken_service.go b/internal/servers/controller/handlers/authtokens/authtoken_service.go index 7fa4d0f9f..03242ed91 100644 --- a/internal/servers/controller/handlers/authtokens/authtoken_service.go +++ b/internal/servers/controller/handlers/authtokens/authtoken_service.go @@ -7,12 +7,12 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -28,7 +28,7 @@ type Service struct { repoFn func() (*authtoken.Repository, error) } -// NewService returns a user service which handles user related requests to watchtower. +// NewService returns a user service which handles user related requests to boundary. func NewService(repo func() (*authtoken.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/authtokens/authtoken_service_test.go b/internal/servers/controller/handlers/authtokens/authtoken_service_test.go index 810e8437d..6fc37b799 100644 --- a/internal/servers/controller/handlers/authtokens/authtoken_service_test.go +++ b/internal/servers/controller/handlers/authtokens/authtoken_service_test.go @@ -4,15 +4,15 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/authtoken" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authtokens" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/authtokens" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/testing/protocmp" diff --git a/internal/servers/controller/handlers/errors.go b/internal/servers/controller/handlers/errors.go index caa0b7827..a258ddccb 100644 --- a/internal/servers/controller/handlers/errors.go +++ b/internal/servers/controller/handlers/errors.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + pb "github.com/hashicorp/boundary/internal/gen/controller/api" "github.com/hashicorp/go-hclog" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api" "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/handlers/errors_test.go b/internal/servers/controller/handlers/errors_test.go index 0383537d1..97fea9d57 100644 --- a/internal/servers/controller/handlers/errors_test.go +++ b/internal/servers/controller/handlers/errors_test.go @@ -10,8 +10,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + pb "github.com/hashicorp/boundary/internal/gen/controller/api" "github.com/hashicorp/go-hclog" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/handlers/groups/group_service.go b/internal/servers/controller/handlers/groups/group_service.go index fa9a9c459..1cddca155 100644 --- a/internal/servers/controller/handlers/groups/group_service.go +++ b/internal/servers/controller/handlers/groups/group_service.go @@ -7,13 +7,13 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/groups" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -36,7 +36,7 @@ type Service struct { repoFn func() (*iam.Repository, error) } -// NewService returns a group service which handles group related requests to watchtower. +// NewService returns a group service which handles group related requests to boundary. func NewService(repo func() (*iam.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/groups/group_service_test.go b/internal/servers/controller/handlers/groups/group_service_test.go index 6f68e08a7..8094e02a5 100644 --- a/internal/servers/controller/handlers/groups/group_service_test.go +++ b/internal/servers/controller/handlers/groups/group_service_test.go @@ -8,14 +8,14 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/groups" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/groups" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" 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 bb204486c..ddc4ad14d 100644 --- a/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go +++ b/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go @@ -6,13 +6,13 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/host/static" - "github.com/hashicorp/watchtower/internal/host/static/store" - "github.com/hashicorp/watchtower/internal/servers/controller/common" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/host/static" + "github.com/hashicorp/boundary/internal/host/static/store" + "github.com/hashicorp/boundary/internal/servers/controller/common" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -75,7 +75,7 @@ type Service struct { var _ pbs.HostCatalogServiceServer = Service{} -// NewService returns a host catalog Service which handles host catalog related requests to watchtower and uses the provided +// NewService returns a host catalog Service which handles host catalog related requests to boundary and uses the provided // repositories for storage and retrieval. func NewService(repoFn common.StaticRepoFactory) (Service, error) { if repoFn == nil { 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 2cae4a2d2..765dce633 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 @@ -9,15 +9,15 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/host/static" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/host_catalogs" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/host/static" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_catalogs" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/handlers/mask_manager.go b/internal/servers/controller/handlers/mask_manager.go index 271053dab..c8d53305a 100644 --- a/internal/servers/controller/handlers/mask_manager.go +++ b/internal/servers/controller/handlers/mask_manager.go @@ -8,7 +8,7 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/descriptorpb" - pb "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + pb "github.com/hashicorp/boundary/internal/gen/controller/protooptions" ) type MaskManager map[string]string diff --git a/internal/servers/controller/handlers/mask_manager_test.go b/internal/servers/controller/handlers/mask_manager_test.go index ddebd70b9..0a0aaddb3 100644 --- a/internal/servers/controller/handlers/mask_manager_test.go +++ b/internal/servers/controller/handlers/mask_manager_test.go @@ -3,7 +3,7 @@ package handlers import ( "testing" - pb "github.com/hashicorp/watchtower/internal/gen/controller/protooptions" + pb "github.com/hashicorp/boundary/internal/gen/controller/protooptions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/servers/controller/handlers/roles/role_service.go b/internal/servers/controller/handlers/roles/role_service.go index 8e11fe581..9e1c8fd9a 100644 --- a/internal/servers/controller/handlers/roles/role_service.go +++ b/internal/servers/controller/handlers/roles/role_service.go @@ -7,15 +7,15 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/roles" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/perms" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/perms" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -38,7 +38,7 @@ type Service struct { repoFn func() (*iam.Repository, error) } -// NewService returns a role service which handles role related requests to watchtower. +// NewService returns a role service which handles role related requests to boundary. func NewService(repo func() (*iam.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/roles/role_service_test.go b/internal/servers/controller/handlers/roles/role_service_test.go index 819cb43d9..edfdb2f68 100644 --- a/internal/servers/controller/handlers/roles/role_service_test.go +++ b/internal/servers/controller/handlers/roles/role_service_test.go @@ -8,15 +8,15 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/roles" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/perms" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/roles" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/perms" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/roles" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/handlers/scopes/scope_service.go b/internal/servers/controller/handlers/scopes/scope_service.go index 3848ce08a..cc2bd383a 100644 --- a/internal/servers/controller/handlers/scopes/scope_service.go +++ b/internal/servers/controller/handlers/scopes/scope_service.go @@ -7,15 +7,15 @@ import ( "sort" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/servers/controller/common" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/servers/controller/common" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -38,7 +38,7 @@ type Service struct { repo common.IamRepoFactory } -// NewService returns a project service which handles project related requests to watchtower. +// NewService returns a project service which handles project related requests to boundary. func NewService(repo common.IamRepoFactory) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/scopes/scope_service_test.go b/internal/servers/controller/handlers/scopes/scope_service_test.go index 67ef550b5..ac741359b 100644 --- a/internal/servers/controller/handlers/scopes/scope_service_test.go +++ b/internal/servers/controller/handlers/scopes/scope_service_test.go @@ -8,13 +8,13 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/scopes" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/scopes" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/handlers/subtypes_test.go b/internal/servers/controller/handlers/subtypes_test.go index 80eb3a21d..1aae6bea9 100644 --- a/internal/servers/controller/handlers/subtypes_test.go +++ b/internal/servers/controller/handlers/subtypes_test.go @@ -5,8 +5,8 @@ import ( structpb "github.com/golang/protobuf/ptypes/struct" "github.com/google/go-cmp/cmp" - authpb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/authmethods" - hostpb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/hosts" + authpb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" + hostpb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" diff --git a/internal/servers/controller/handlers/users/user_service.go b/internal/servers/controller/handlers/users/user_service.go index 98768ff17..0034ba5ef 100644 --- a/internal/servers/controller/handlers/users/user_service.go +++ b/internal/servers/controller/handlers/users/user_service.go @@ -7,13 +7,13 @@ import ( "regexp" "strings" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/users" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/iam/store" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/iam/store" + "github.com/hashicorp/boundary/internal/servers/controller/handlers" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" @@ -36,7 +36,7 @@ type Service struct { repoFn func() (*iam.Repository, error) } -// NewService returns a user service which handles user related requests to watchtower. +// NewService returns a user service which handles user related requests to boundary. func NewService(repo func() (*iam.Repository, error)) (Service, error) { if repo == nil { return Service{}, fmt.Errorf("nil iam repository provided") diff --git a/internal/servers/controller/handlers/users/user_service_test.go b/internal/servers/controller/handlers/users/user_service_test.go index c11a5c563..bd0aacc94 100644 --- a/internal/servers/controller/handlers/users/user_service_test.go +++ b/internal/servers/controller/handlers/users/user_service_test.go @@ -8,14 +8,14 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/watchtower/internal/auth" - "github.com/hashicorp/watchtower/internal/db" - "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/scopes" - pb "github.com/hashicorp/watchtower/internal/gen/controller/api/resources/users" - pbs "github.com/hashicorp/watchtower/internal/gen/controller/api/services" - "github.com/hashicorp/watchtower/internal/iam" - "github.com/hashicorp/watchtower/internal/servers/controller/handlers/users" - "github.com/hashicorp/watchtower/internal/types/scope" + "github.com/hashicorp/boundary/internal/auth" + "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" + pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users" + pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" + "github.com/hashicorp/boundary/internal/iam" + "github.com/hashicorp/boundary/internal/servers/controller/handlers/users" + "github.com/hashicorp/boundary/internal/types/scope" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/servers/controller/listeners.go b/internal/servers/controller/listeners.go index 30f4106f9..2179e987e 100644 --- a/internal/servers/controller/listeners.go +++ b/internal/servers/controller/listeners.go @@ -11,9 +11,9 @@ import ( "sync" "time" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/go-alpnmux" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/watchtower/internal/cmd/base" ) func (c *Controller) startListeners() error { diff --git a/internal/servers/controller/testing.go b/internal/servers/controller/testing.go index 02d4caab1..9c3962ca6 100644 --- a/internal/servers/controller/testing.go +++ b/internal/servers/controller/testing.go @@ -6,10 +6,10 @@ import ( "net" "testing" + "github.com/hashicorp/boundary/api" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/watchtower/api" - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/config" ) // TestController wraps a base.Server and Controller to provide a diff --git a/internal/servers/controller/worker_tls_config.go b/internal/servers/controller/worker_tls_config.go index 711e69a50..a32a6f227 100644 --- a/internal/servers/controller/worker_tls_config.go +++ b/internal/servers/controller/worker_tls_config.go @@ -9,8 +9,8 @@ import ( "errors" "strings" + "github.com/hashicorp/boundary/internal/cmd/base" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/watchtower/internal/cmd/base" "google.golang.org/protobuf/proto" ) diff --git a/internal/servers/worker/cluster_tls.go b/internal/servers/worker/cluster_tls.go index 7ef02670c..927344a1a 100644 --- a/internal/servers/worker/cluster_tls.go +++ b/internal/servers/worker/cluster_tls.go @@ -14,8 +14,8 @@ import ( mathrand "math/rand" "time" + "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/vault/sdk/helper/base62" - "github.com/hashicorp/watchtower/internal/cmd/base" "google.golang.org/protobuf/proto" ) diff --git a/internal/servers/worker/config.go b/internal/servers/worker/config.go index e318a18cd..e5d150489 100644 --- a/internal/servers/worker/config.go +++ b/internal/servers/worker/config.go @@ -1,8 +1,8 @@ package worker import ( - "github.com/hashicorp/watchtower/internal/cmd/base" - "github.com/hashicorp/watchtower/internal/cmd/config" + "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/cmd/config" ) type Config struct { diff --git a/internal/servers/worker/handler.go b/internal/servers/worker/handler.go index e444a3066..317ebf7c8 100644 --- a/internal/servers/worker/handler.go +++ b/internal/servers/worker/handler.go @@ -5,8 +5,8 @@ import ( "net/http" "time" + "github.com/hashicorp/boundary/globals" "github.com/hashicorp/vault/internalshared/configutil" - "github.com/hashicorp/watchtower/globals" ) type HandlerProperties struct { diff --git a/internal/servers/worker/worker.go b/internal/servers/worker/worker.go index 5f5e562f2..96aec7663 100644 --- a/internal/servers/worker/worker.go +++ b/internal/servers/worker/worker.go @@ -33,10 +33,10 @@ func New(conf *Config) (*Worker, error) { return nil, fmt.Errorf( "Failed to lock memory: %v\n\n"+ "This usually means that the mlock syscall is not available.\n"+ - "Watchtower uses mlock to prevent memory from being swapped to\n"+ + "Boundary uses mlock to prevent memory from being swapped to\n"+ "disk. This requires root privileges as well as a machine\n"+ "that supports mlock. Please enable mlock on your system or\n"+ - "disable Watchtower from using it. To disable Watchtower from using it,\n"+ + "disable Boundary from using it. To disable Boundary from using it,\n"+ "set the `disable_mlock` configuration option in your configuration\n"+ "file.", err) diff --git a/scripts/build.sh b/scripts/build.sh index 6d391dba3..851df8841 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -12,14 +12,14 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" cd "$DIR" # Set build tags -BUILD_TAGS="${BUILD_TAGS:-"watchtower"}" +BUILD_TAGS="${BUILD_TAGS:-"boundary"}" # Get the git commit GIT_COMMIT="$(git rev-parse HEAD)" GIT_DIRTY="$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)" # If its dev mode, only build for ourself -if [ "${WATCHTOWER_DEV_BUILD}x" != "x" ] && [ "${XC_OSARCH}x" == "x" ]; then +if [ "${BOUNDARY_DEV_BUILD}x" != "x" ] && [ "${XC_OSARCH}x" == "x" ]; then XC_OS=$(go env GOOS) XC_ARCH=$(go env GOARCH) XC_OSARCH=$(go env GOOS)/$(go env GOARCH) @@ -52,11 +52,11 @@ echo "==> Building..." gox \ -osarch="${XC_OSARCH}" \ -gcflags "${GCFLAGS}" \ - -ldflags "${LD_FLAGS}-X github.com/hashicorp/watchtower/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}'" \ - -output "pkg/{{.OS}}_{{.Arch}}/watchtower" \ + -ldflags "${LD_FLAGS}-X github.com/hashicorp/boundary/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}'" \ + -output "pkg/{{.OS}}_{{.Arch}}/boundary" \ ${GOX_PARALLEL_BUILDS+-parallel="${GOX_PARALLEL_BUILDS}"} \ -tags="${BUILD_TAGS}" \ - ./cmd/watchtower + ./cmd/boundary # Move all the compiled things to the $GOPATH/bin OLDIFS=$IFS @@ -70,7 +70,7 @@ for F in $(find ${DEV_PLATFORM} -mindepth 1 -maxdepth 1 -type f); do cp ${F} ${MAIN_GOPATH}/bin/ done -if [ "${WATCHTOWER_DEV_BUILD}x" = "x" ]; then +if [ "${BOUNDARY_DEV_BUILD}x" = "x" ]; then # Zip and copy to the dist dir echo "==> Packaging..." for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do diff --git a/scripts/uigen.sh b/scripts/uigen.sh index bbf89f2d3..91ee2faf3 100755 --- a/scripts/uigen.sh +++ b/scripts/uigen.sh @@ -7,8 +7,8 @@ tempdir=$(mktemp -d update-ui-assets.XXXXXX) ui_commitish=${UI_COMMITISH:-develop} cd $tempdir -git clone https://github.com/hashicorp/watchtower-ui -cd watchtower-ui +git clone https://github.com/hashicorp/boundary-ui +cd boundary-ui git fetch origin ${ui_commitish} git checkout ${ui_commitish} @@ -16,6 +16,6 @@ docker-compose -f docker-compose-embedding.yml run build cd $origdir -go-bindata -fs -o internal/ui/assets.go -pkg ui -prefix "${origdir}/${tempdir}/watchtower-ui/ui/core/dist" "${origdir}/${tempdir}/watchtower-ui/ui/core/dist" +go-bindata -fs -o internal/ui/assets.go -pkg ui -prefix "${origdir}/${tempdir}/boundary-ui/ui/core/dist" "${origdir}/${tempdir}/boundary-ui/ui/core/dist" rm -rf $tempdir diff --git a/testing/controller/controller.go b/testing/controller/controller.go index c2fe580fb..573c0c53b 100644 --- a/testing/controller/controller.go +++ b/testing/controller/controller.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/watchtower/internal/cmd/config" - "github.com/hashicorp/watchtower/internal/servers/controller" + "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/servers/controller" ) func getOpts(opt ...Option) (*controller.TestControllerOpts, error) { diff --git a/version/version.go b/version/version.go index aa46eb590..c03bf040c 100644 --- a/version/version.go +++ b/version/version.go @@ -54,10 +54,10 @@ func (c *Info) FullVersionNumber(rev bool) string { var versionString bytes.Buffer if Version == "unknown" && VersionPrerelease == "unknown" { - return "Watchtower (version unknown)" + return "Boundary (version unknown)" } - fmt.Fprintf(&versionString, "Watchtower v%s", c.Version) + fmt.Fprintf(&versionString, "Boundary v%s", c.Version) if c.VersionPrerelease != "" { fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease) } diff --git a/website/README.md b/website/README.md index a63cbff5b..1dafc8867 100644 --- a/website/README.md +++ b/website/README.md @@ -1,8 +1,8 @@ -# Watchtower Documentation Website +# Boundary Documentation Website [![Netlify Status](https://img.shields.io/netlify/?style=flat-square)](https://app.netlify.com/sites//deploys) -This subdirectory contains the entire source for the [Watchtower Website](https://example.com/). This is a [NextJS](https://nextjs.org/) project, which builds a static site from these source files. +This subdirectory contains the entire source for the [Boundary Website](https://example.com/). This is a [NextJS](https://nextjs.org/) project, which builds a static site from these source files.