From 959fe3ebd33b0e909e03ff14d5978e3657673a9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:17:46 -0400 Subject: [PATCH] chore(deps): bump the go group across 7 directories with 5 updates (#6035) * chore(deps): bump the go group across 7 directories with 5 updates Bumps the go group with 4 updates in the / directory: [github.com/coder/websocket](https://github.com/coder/websocket), [github.com/docker/docker](https://github.com/docker/docker), [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) and [mvdan.cc/gofumpt](https://github.com/mvdan/gofumpt). Bumps the go group with 2 updates in the /api directory: [github.com/coder/websocket](https://github.com/coder/websocket) and [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/aws directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/azure directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/gcp directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/minio directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /sdk directory: [github.com/coder/websocket](https://github.com/coder/websocket). Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) Updates `github.com/docker/docker` from 28.3.3+incompatible to 28.4.0+incompatible - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v28.3.3...v28.4.0) Updates `github.com/prometheus/client_golang` from 1.23.0 to 1.23.2 - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.23.0...v1.23.2) Updates `mvdan.cc/gofumpt` from 0.8.0 to 0.9.0 - [Release notes](https://github.com/mvdan/gofumpt/releases) - [Changelog](https://github.com/mvdan/gofumpt/blob/master/CHANGELOG.md) - [Commits](https://github.com/mvdan/gofumpt/compare/v0.8.0...v0.9.0) Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) --- updated-dependencies: - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/docker/docker dependency-version: 28.4.0+incompatible dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/prometheus/client_golang dependency-version: 1.23.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: mvdan.cc/gofumpt dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] * Format files with latest gofumpt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Brandhorst-Satzkorn --- api/go.mod | 6 +-- api/go.sum | 16 +++---- go.mod | 14 +++--- go.sum | 23 +++++----- .../repository_alias_list_resolvable.go | 4 +- internal/api/genapi/templates.go | 2 +- internal/auth/password/argon2_test.go | 2 +- internal/bsr/container.go | 4 +- .../convert/internal/asciicast/asciicast.go | 2 +- internal/bsr/internal/fstest/space.go | 2 +- .../cmd/commands/config/encryptdecrypt.go | 2 +- internal/cmd/commands/connect/cassandra.go | 2 +- internal/cmd/commands/connect/connect.go | 2 +- internal/cmd/commands/connect/mysql.go | 2 +- internal/cmd/commands/connect/postgres.go | 2 +- .../credential/vault/client_certificate.go | 4 +- internal/credential/vault/credential.go | 4 +- internal/credential/vault/credential_store.go | 2 +- .../vault/repository_credential_store_test.go | 14 +++--- .../vault/repository_credentials.go | 4 +- internal/credential/vault/vault.go | 2 +- .../credential/vault/vault_capabilities.go | 4 +- internal/credential/vault/vault_token.go | 6 +-- internal/daemon/controller/auth/auth.go | 44 +++++++++---------- .../host_catalogs/host_catalog_service.go | 2 +- .../handlers/host_sets/host_set_service.go | 2 +- internal/daemon/worker/proxy/testing.go | 2 +- internal/host/plugin/repository_host_util.go | 2 +- internal/iam/repository_principal_role.go | 2 +- .../iam/repository_principal_role_test.go | 4 +- internal/iam/testing.go | 2 +- internal/oplog/testing.go | 2 +- internal/perms/acl.go | 4 +- internal/perms/grants.go | 2 +- internal/ratelimit/handler.go | 14 +++--- internal/session/service_statistics_test.go | 22 +++++----- internal/util/net.go | 6 +-- internal/website/permstable/permstable.go | 8 ++-- plugins/boundary/mains/aws/go.mod | 6 +-- plugins/boundary/mains/aws/go.sum | 12 ++--- plugins/boundary/mains/azure/go.mod | 6 +-- plugins/boundary/mains/azure/go.sum | 12 ++--- plugins/boundary/mains/gcp/go.mod | 6 +-- plugins/boundary/mains/gcp/go.sum | 12 ++--- plugins/boundary/mains/minio/go.mod | 6 +-- plugins/boundary/mains/minio/go.sum | 12 ++--- sdk/go.mod | 2 +- sdk/go.sum | 4 +- testing/internal/e2e/vault/vault.go | 6 +-- 49 files changed, 164 insertions(+), 163 deletions(-) diff --git a/api/go.mod b/api/go.mod index 4ab03c56b0..b697013066 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,9 +3,9 @@ module github.com/hashicorp/boundary/api go 1.25.0 require ( - github.com/coder/websocket v1.8.13 + github.com/coder/websocket v1.8.14 github.com/google/go-cmp v0.7.0 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 github.com/hashicorp/go-retryablehttp v0.7.8 @@ -40,6 +40,6 @@ require ( github.com/ryanuber/go-glob v1.0.0 // indirect golang.org/x/crypto v0.41.0 // indirect golang.org/x/sys v0.35.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/api/go.sum b/api/go.sum index e15e74f864..c2cf632412 100644 --- a/api/go.sum +++ b/api/go.sum @@ -8,8 +8,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE= -github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= +github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g= +github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -23,8 +23,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/boundary/sdk v0.0.54 h1:BTCi/Sr0nmIqAafvm06JJFKYeQ11gRYF23psLeWJDdA= -github.com/hashicorp/boundary/sdk v0.0.54/go.mod h1:I6KqmAvQjuvF316iEEQly9/CzgVxwHPHo/W8nCXeV88= +github.com/hashicorp/boundary/sdk v0.0.55 h1:+1U2Nzw4snN62lNbztyczcFC3pN48gCZwyH6MTtVKII= +github.com/hashicorp/boundary/sdk v0.0.55/go.mod h1:Czlnppzciz//CzXDGRyeH9YRpZ/mCeN2EVirP1tJdGc= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -134,10 +134,10 @@ golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= diff --git a/go.mod b/go.mod index b08219c04e..2bda5ef12b 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ replace github.com/hashicorp/boundary/sdk => ./sdk require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/cenkalti/backoff/v4 v4.3.0 - github.com/coder/websocket v1.8.13 + github.com/coder/websocket v1.8.14 github.com/creack/pty v1.1.24 - github.com/docker/docker v28.3.3+incompatible + github.com/docker/docker v28.4.0+incompatible github.com/fatih/color v1.18.0 github.com/fatih/structs v1.1.0 github.com/favadi/protoc-go-inject-tag v1.4.0 @@ -23,7 +23,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 github.com/hashicorp/boundary/api v0.0.54 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 github.com/hashicorp/cap v0.10.0 github.com/hashicorp/cap/ldap v0.0.0-20240206183135-ed8f24513744 github.com/hashicorp/dawdle v0.5.0 @@ -81,7 +81,7 @@ require ( github.com/ory/dockertest/v3 v3.12.0 github.com/pires/go-proxyproto v0.8.1 github.com/posener/complete v1.2.3 - github.com/prometheus/client_golang v1.23.0 + github.com/prometheus/client_golang v1.23.2 github.com/ryanuber/go-glob v1.0.0 github.com/sevlyar/go-daemon v0.1.6 github.com/stretchr/testify v1.11.1 @@ -102,7 +102,7 @@ require ( google.golang.org/protobuf v1.36.8 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/postgres v1.6.0 - mvdan.cc/gofumpt v0.8.0 + mvdan.cc/gofumpt v0.9.0 ) require ( @@ -147,7 +147,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/cli v1.1.7 // indirect @@ -192,7 +191,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.65.0 // indirect + github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.16.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect @@ -213,6 +212,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect go.opentelemetry.io/otel/metric v1.37.0 // indirect go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect diff --git a/go.sum b/go.sum index 1e9d1506e6..6bf85e89d3 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE= -github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= +github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g= +github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -94,8 +94,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= -github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk= +github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -157,7 +157,6 @@ github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-migrate/migrate/v4 v4.19.0 h1:RcjOnCGz3Or6HQYEJ/EEVLfWnmw9KnoigPSjzhCuaSE= github.com/golang-migrate/migrate/v4 v4.19.0/go.mod h1:9dyEcu+hO+G9hPSw8AIg50yg622pXJsoHItQnDGZkI0= @@ -459,13 +458,13 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc= -github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= -github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= +github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= @@ -567,6 +566,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -764,5 +765,5 @@ modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E= modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ= modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0= -mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k= -mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg= +mvdan.cc/gofumpt v0.9.0 h1:W0wNHMSvDBDIyZsm3nnGbVfgp5AknzBrGJnfLCy501w= +mvdan.cc/gofumpt v0.9.0/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw= diff --git a/internal/alias/target/repository_alias_list_resolvable.go b/internal/alias/target/repository_alias_list_resolvable.go index bec1bcdffc..8b50085423 100644 --- a/internal/alias/target/repository_alias_list_resolvable.go +++ b/internal/alias/target/repository_alias_list_resolvable.go @@ -26,7 +26,7 @@ func splitPermissions(permissions []perms.Permission) (directIds, directScopeIds for _, perm := range permissions { if perm.GrantScopeId == globals.GrantScopeDescendants && perm.All { allDescendants = true - return + return directIds, directScopeIds, childAllScopes, allDescendants } } @@ -60,7 +60,7 @@ func splitPermissions(permissions []perms.Permission) (directIds, directScopeIds directIds = append(directIds, perm.ResourceIds...) } } - return + return directIds, directScopeIds, childAllScopes, allDescendants } // listResolvableAliases lists aliases which have a destination id set to that diff --git a/internal/api/genapi/templates.go b/internal/api/genapi/templates.go index 7899fb1c3e..8848ab5cc3 100644 --- a/internal/api/genapi/templates.go +++ b/internal/api/genapi/templates.go @@ -33,7 +33,7 @@ func getArgsAndPaths(pluralResource, parentTypeName, action string) (colArg, col action = fmt.Sprintf(":%s", action) } resPath = fmt.Sprintf("fmt.Sprintf(\"%s/%%s%s\", url.PathEscape(id))", colPath, action) - return + return colArg, colPath, resPath } type templateInput struct { diff --git a/internal/auth/password/argon2_test.go b/internal/auth/password/argon2_test.go index c687197ad8..cb0d5ad115 100644 --- a/internal/auth/password/argon2_test.go +++ b/internal/auth/password/argon2_test.go @@ -528,7 +528,7 @@ func measureCredentialCreations(ctx context.Context, t testing.TB, publicId stri select { case <-ctx.Done(): t.Error("timeout") - return + return mean, max, min case <-time.After(10 * time.Millisecond): // Run GC and check memory use runtime.GC() diff --git a/internal/bsr/container.go b/internal/bsr/container.go index 53d3ad13d6..ec97e79f51 100644 --- a/internal/bsr/container.go +++ b/internal/bsr/container.go @@ -758,7 +758,7 @@ func (c *container) computeFileChecksum(ctx context.Context, fileName string, op f, err = c.container.OpenFile(ctx, fileName) if err != nil { err = fmt.Errorf("%s: %w", op, err) - return + return checksum, err } defer func() { if closeErr := f.Close(); closeErr != nil { @@ -769,5 +769,5 @@ func (c *container) computeFileChecksum(ctx context.Context, fileName string, op if err != nil { err = fmt.Errorf("%s: %w", op, err) } - return + return checksum, err } diff --git a/internal/bsr/convert/internal/asciicast/asciicast.go b/internal/bsr/convert/internal/asciicast/asciicast.go index 0c96588abb..11ffb16e47 100644 --- a/internal/bsr/convert/internal/asciicast/asciicast.go +++ b/internal/bsr/convert/internal/asciicast/asciicast.go @@ -48,7 +48,7 @@ func (t *Time) UnmarshalJSON(b []byte) (err error) { return err } *(*time.Time)(t) = time.Unix(q, 0) - return + return err } // HeaderEnv is the env section of the header line. diff --git a/internal/bsr/internal/fstest/space.go b/internal/bsr/internal/fstest/space.go index 1623ff2b0f..c4437d509e 100644 --- a/internal/bsr/internal/fstest/space.go +++ b/internal/bsr/internal/fstest/space.go @@ -169,7 +169,7 @@ func (l *LimitedSpaceFile) WriteAndClose(p []byte) (n int, err error) { } n, err = l.MemFile.Write(p) if err != nil { - return + return n, err } return n, l.MemFile.Close() } diff --git a/internal/cmd/commands/config/encryptdecrypt.go b/internal/cmd/commands/config/encryptdecrypt.go index 01129270d3..899ae65b5e 100644 --- a/internal/cmd/commands/config/encryptdecrypt.go +++ b/internal/cmd/commands/config/encryptdecrypt.go @@ -235,5 +235,5 @@ func (c *EncryptDecryptCommand) Run(args []string) (ret int) { c.UI.Error(fmt.Sprintf("Wrong number of bytes written to file, expected %d, wrote %d", len(raw), n)) } - return + return ret } diff --git a/internal/cmd/commands/connect/cassandra.go b/internal/cmd/commands/connect/cassandra.go index ec90ef1ad4..8d589681cd 100644 --- a/internal/cmd/commands/connect/cassandra.go +++ b/internal/cmd/commands/connect/cassandra.go @@ -113,5 +113,5 @@ func (m *cassandraFlags) buildArgs(c *Command, port, ip, _ string, creds proxy.C args = append(args, port) } } - return + return args, envs, retCreds, retErr } diff --git a/internal/cmd/commands/connect/connect.go b/internal/cmd/commands/connect/connect.go index b48c345f83..214d06f0da 100644 --- a/internal/cmd/commands/connect/connect.go +++ b/internal/cmd/commands/connect/connect.go @@ -582,7 +582,7 @@ func (c *Command) Run(args []string) (retCode int) { } } - return + return retCode } func (c *Command) printCredentials(creds []*targets.SessionCredential) error { diff --git a/internal/cmd/commands/connect/mysql.go b/internal/cmd/commands/connect/mysql.go index 17f48da727..36dcbfdd7e 100644 --- a/internal/cmd/commands/connect/mysql.go +++ b/internal/cmd/commands/connect/mysql.go @@ -116,5 +116,5 @@ func (m *mysqlFlags) buildArgs(c *Command, port, ip, _ string, creds proxy.Crede args = append(args, "-u", c.flagUsername) } } - return + return args, envs, retCreds, retErr } diff --git a/internal/cmd/commands/connect/postgres.go b/internal/cmd/commands/connect/postgres.go index 43027bb344..a02322ea2a 100644 --- a/internal/cmd/commands/connect/postgres.go +++ b/internal/cmd/commands/connect/postgres.go @@ -111,5 +111,5 @@ func (p *postgresFlags) buildArgs(c *Command, port, ip, _ string, creds proxy.Cr } } } - return + return args, envs, retCreds, retErr } diff --git a/internal/credential/vault/client_certificate.go b/internal/credential/vault/client_certificate.go index 6345aa2e78..a1715c484a 100644 --- a/internal/credential/vault/client_certificate.go +++ b/internal/credential/vault/client_certificate.go @@ -127,7 +127,7 @@ func (c *ClientCertificate) insertQuery() (query string, queryValues []any) { sql.Named("certificate_key_hmac", c.CertificateKeyHmac), sql.Named("key_id", c.KeyId), } - return + return query, queryValues } func (c *ClientCertificate) deleteQuery() (query string, queryValues []any) { @@ -135,7 +135,7 @@ func (c *ClientCertificate) deleteQuery() (query string, queryValues []any) { queryValues = []any{ c.StoreId, } - return + return query, queryValues } func (c *ClientCertificate) oplogMessage(opType db.OpType) *oplog.Message { diff --git a/internal/credential/vault/credential.go b/internal/credential/vault/credential.go index a9329b4a06..84e2960c06 100644 --- a/internal/credential/vault/credential.go +++ b/internal/credential/vault/credential.go @@ -121,7 +121,7 @@ func (c *Credential) updateExpirationQuery() (query string, queryValues []any) { c.PublicId, } query = updateCredentialExpirationQuery - return + return query, queryValues } func (c *Credential) updateStatusQuery(status CredentialStatus) (query string, queryValues []any) { @@ -130,5 +130,5 @@ func (c *Credential) updateStatusQuery(status CredentialStatus) (query string, q c.PublicId, } query = updateCredentialStatusQuery - return + return query, queryValues } diff --git a/internal/credential/vault/credential_store.go b/internal/credential/vault/credential_store.go index 9b7e5001cb..3706dbdf1c 100644 --- a/internal/credential/vault/credential_store.go +++ b/internal/credential/vault/credential_store.go @@ -205,5 +205,5 @@ func (cs *CredentialStore) softDeleteQuery() (query string, queryValues []any) { queryValues = []any{ cs.PublicId, } - return + return query, queryValues } diff --git a/internal/credential/vault/repository_credential_store_test.go b/internal/credential/vault/repository_credential_store_test.go index e17ff3d1ac..ddad9150d4 100644 --- a/internal/credential/vault/repository_credential_store_test.go +++ b/internal/credential/vault/repository_credential_store_test.go @@ -1309,7 +1309,7 @@ func TestRepository_DeleteCredentialStore(t *testing.T) { _, prj := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper)) projectId = prj.GetPublicId() - return + return wrapper, repo, projectId } testStores := func(t *testing.T, conn *db.DB, wrapper wrapping.Wrapper, tokens tokenMap, projectId string, count int) ([]*CredentialStore, tokenMap) { @@ -1430,7 +1430,7 @@ group by store_id, status; css, tokens := testStores(t, conn, wrapper, nil, projectId, 1) cs := css[0] storeId = cs.GetPublicId() - return + return storeId, libs, tokens, repo }, }, { @@ -1442,7 +1442,7 @@ group by store_id, status; storeId = cs.GetPublicId() libs = TestCredentialLibraries(t, conn, wrapper, storeId, globals.UnspecifiedCredentialType, 4) - return + return storeId, libs, tokens, repo }, }, { @@ -1455,7 +1455,7 @@ group by store_id, status; libs = TestCredentialLibraries(t, conn, wrapper, storeId, globals.UnspecifiedCredentialType, 4) tokens = makeMaintainingTokens(t, conn, wrapper, tokens, projectId, storeId, 4) - return + return storeId, libs, tokens, repo }, }, { @@ -1468,7 +1468,7 @@ group by store_id, status; libs = TestCredentialLibraries(t, conn, wrapper, storeId, globals.UnspecifiedCredentialType, 4) tokens = makeRevokedTokens(t, conn, wrapper, tokens, projectId, storeId, 4) - return + return storeId, libs, tokens, repo }, }, { @@ -1481,7 +1481,7 @@ group by store_id, status; libs = TestCredentialLibraries(t, conn, wrapper, storeId, globals.UnspecifiedCredentialType, 4) tokens = makeExpiredTokens(t, conn, wrapper, tokens, projectId, storeId, 4) - return + return storeId, libs, tokens, repo }, }, { @@ -1496,7 +1496,7 @@ group by store_id, status; tokens = makeMaintainingTokens(t, conn, wrapper, tokens, projectId, storeId, 2) tokens = makeRevokedTokens(t, conn, wrapper, tokens, projectId, storeId, 3) tokens = makeExpiredTokens(t, conn, wrapper, tokens, projectId, storeId, 5) - return + return storeId, libs, tokens, repo }, }, } diff --git a/internal/credential/vault/repository_credentials.go b/internal/credential/vault/repository_credentials.go index d63ffb5f8f..968fc1332a 100644 --- a/internal/credential/vault/repository_credentials.go +++ b/internal/credential/vault/repository_credentials.go @@ -35,7 +35,7 @@ func insertQuery(c *Credential, sessionId string) (query string, queryValues []a query = insertCredentialWithExpirationQuery queryValues = append(queryValues, sql.Named("expiration_time", int(c.expiration.Round(time.Second).Seconds()))) } - return + return query, queryValues } func updateSessionQuery(c *Credential, sessionId string, purpose credential.Purpose) (query string, queryValues []any) { @@ -46,7 +46,7 @@ func updateSessionQuery(c *Credential, sessionId string, purpose credential.Purp sql.Named("purpose", string(purpose)), } query = updateSessionCredentialQuery - return + return query, queryValues } // Issue issues and returns dynamic credentials from Vault for all of the diff --git a/internal/credential/vault/vault.go b/internal/credential/vault/vault.go index 9b8165afad..860944c878 100644 --- a/internal/credential/vault/vault.go +++ b/internal/credential/vault/vault.go @@ -215,7 +215,7 @@ func (c *client) lookupToken(ctx context.Context) (*vault.Secret, error) { func (c *client) swapToken(ctx context.Context, new TokenSecret) (old TokenSecret) { old = TokenSecret(c.cl.Token()) c.cl.SetToken(string(new)) - return + return old } func (c *client) get(ctx context.Context, path string) (*vault.Secret, error) { diff --git a/internal/credential/vault/vault_capabilities.go b/internal/credential/vault/vault_capabilities.go index 0ee6321b00..b8ce694348 100644 --- a/internal/credential/vault/vault_capabilities.go +++ b/internal/credential/vault/vault_capabilities.go @@ -174,7 +174,7 @@ func (pc pathCapabilities) get(path string) (capabilities, bool) { // from x and y. func (pc pathCapabilities) union(y pathCapabilities) (z pathCapabilities) { if len(pc) == 0 && len(y) == 0 { - return + return z } max := func(a, b int) int { if a < b { @@ -189,7 +189,7 @@ func (pc pathCapabilities) union(y pathCapabilities) (z pathCapabilities) { for p := range y { z[p] = pc[p] | y[p] } - return + return z } func (pc pathCapabilities) missing(required pathCapabilities) pathCapabilities { diff --git a/internal/credential/vault/vault_token.go b/internal/credential/vault/vault_token.go index 03eba9e384..546a0807bc 100644 --- a/internal/credential/vault/vault_token.go +++ b/internal/credential/vault/vault_token.go @@ -152,7 +152,7 @@ func (t *Token) insertQuery() (query string, queryValues []any) { sql.Named("6", "now()"), sql.Named("7", exp), } - return + return query, queryValues } func (t *Token) updateStatusQuery(status TokenStatus) (query string, queryValues []any) { @@ -162,7 +162,7 @@ func (t *Token) updateStatusQuery(status TokenStatus) (query string, queryValues status, t.TokenHmac, } - return + return query, queryValues } func (t *Token) updateExpirationQuery() (query string, queryValues []any) { @@ -173,7 +173,7 @@ func (t *Token) updateExpirationQuery() (query string, queryValues []any) { exp, t.TokenHmac, } - return + return query, queryValues } func (t *Token) oplogMessage(opType db.OpType) *oplog.Message { diff --git a/internal/daemon/controller/auth/auth.go b/internal/daemon/controller/auth/auth.go index b2c8e6b49e..dc271bc511 100644 --- a/internal/daemon/controller/auth/auth.go +++ b/internal/daemon/controller/auth/auth.go @@ -237,17 +237,17 @@ func Verify(ctx context.Context, resourceType resource.Type, opt ...Option) (ret iamRepo, err := v.iamRepoFn() if err != nil { ret.Error = errors.Wrap(ctx, err, op, errors.WithMsg("failed to get iam repo")) - return + return ret } scp, err := iamRepo.LookupScope(v.ctx, ret.Scope.Id) if err != nil { ret.Error = errors.Wrap(ctx, err, op) - return + return ret } if scp == nil { ret.Error = errors.New(ctx, errors.InvalidParameter, op, fmt.Sprintf("non-existent scope %q", ret.Scope.Id)) - return + return ret } ret.Scope = &scopes.ScopeInfo{ Id: scp.GetPublicId(), @@ -264,7 +264,7 @@ func Verify(ctx context.Context, resourceType resource.Type, opt ...Option) (ret } ea.UserInfo = &event.UserInfo{UserId: ret.UserId} ret.Error = nil - return + return ret } v.act = opts.withAction @@ -292,7 +292,7 @@ func Verify(ctx context.Context, resourceType resource.Type, opt ...Option) (ret authResults, ret.UserData, ret.Scope, v.acl, ret.grants, err = v.performAuthCheck(ctx, resourcesToFetchGrants, opts.withRecursive) if err != nil { event.WriteError(ctx, op, err, event.WithInfoMsg("error performing authn/authz check")) - return + return ret } if ret.UserData.User.Id != nil { @@ -330,7 +330,7 @@ func Verify(ctx context.Context, resourceType resource.Type, opt ...Option) (ret ea.UserInfo = &event.UserInfo{ UserId: ret.UserId, } - return + return ret } } @@ -364,7 +364,7 @@ func Verify(ctx context.Context, resourceType resource.Type, opt ...Option) (ret } ret.Error = nil - return + return ret } func (v *verifier) decryptToken(ctx context.Context) { @@ -530,7 +530,7 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. tokenRepo, err := v.authTokenRepoFn() if err != nil { retErr = errors.Wrap(ctx, err, op) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } at, err := tokenRepo.ValidateToken(v.ctx, v.requestInfo.PublicId, v.requestInfo.Token) if err != nil { @@ -553,13 +553,13 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. iamRepo, err := v.iamRepoFn() if err != nil { retErr = errors.Wrap(ctx, err, op, errors.WithMsg("failed to get iam repo")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } u, _, err := iamRepo.LookupUser(ctx, *userData.User.Id) if err != nil { retErr = errors.Wrap(ctx, err, op, errors.WithMsg("failed to lookup user")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } userData.User.Name = util.Pointer(u.Name) userData.User.Email = util.Pointer(u.Email) @@ -574,34 +574,34 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. repo, repoErr := v.passwordAuthRepoFn() if repoErr != nil { retErr = errors.Wrap(ctx, repoErr, op, errors.WithMsg("failed to get password auth repo")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } acct, err = repo.LookupAccount(ctx, *userData.Account.Id) case oidc.Subtype: repo, repoErr := v.oidcAuthRepoFn() if repoErr != nil { retErr = errors.Wrap(ctx, repoErr, op, errors.WithMsg("failed to get oidc auth repo")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } acct, err = repo.LookupAccount(ctx, *userData.Account.Id) case ldap.Subtype: repo, repoErr := v.ldapAuthRepoFn() if repoErr != nil { retErr = errors.Wrap(ctx, repoErr, op, errors.WithMsg("failed to get ldap auth repo")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } acct, err = repo.LookupAccount(ctx, *userData.Account.Id) default: retErr = errors.Wrap(ctx, err, op, errors.WithMsg("unrecognized account id type")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } if err != nil { if errors.IsNotFoundError(err) { retErr = errors.Wrap(ctx, err, op, errors.WithMsg("account doesn't exist")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } retErr = errors.Wrap(ctx, err, op, errors.WithMsg("error looking up account")) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } userData.Account.Name = util.Pointer(acct.GetName()) userData.Account.Email = util.Pointer(acct.GetEmail()) @@ -625,11 +625,11 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. scp, err := iamRepo.LookupScope(v.ctx, v.res.ScopeId) if err != nil { retErr = errors.Wrap(ctx, err, op) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } if scp == nil { retErr = errors.New(ctx, errors.InvalidParameter, op, fmt.Sprint("non-existent scope $q", v.res.ScopeId)) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } scopeInfo = &scopes.ScopeInfo{ Id: scp.GetPublicId(), @@ -646,7 +646,7 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. aclResults.AuthenticationFinished = true aclResults.Authorized = true retErr = nil - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } var parsedGrants []perms.Grant @@ -657,7 +657,7 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. grantTuples, err = iamRepo.GrantsForUser(v.ctx, *userData.User.Id, resourceType, scopeInfo.Id, iamOpt...) if err != nil { retErr = errors.Wrap(ctx, err, op) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } parsedGrants = make([]perms.Grant, 0, len(grantTuples)) // Note: Below, we always skip validation so that we don't error on formats @@ -677,7 +677,7 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. permsOpts...) if err != nil { retErr = errors.Wrap(ctx, err, op, errors.WithMsg(fmt.Sprintf("failed to parse grant %#v", tuple.Grant))) - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } parsedGrants = append(parsedGrants, parsed) } @@ -690,7 +690,7 @@ func (v verifier) performAuthCheck(ctx context.Context, resourceType []resource. // grants successfully loaded. aclResults.AuthenticationFinished = true retErr = nil - return + return aclResults, userData, scopeInfo, retAcl, grantTuples, retErr } // FetchActionSetForId returns the allowed actions for a given ID using the diff --git a/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go index 703288e078..fe16271821 100644 --- a/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go +++ b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go @@ -668,7 +668,7 @@ func (s Service) updateInRepo(ctx context.Context, projId string, req *pbs.Updat case hostplugin.Subtype: hc, plg, err = s.updatePluginInRepo(ctx, projId, req.GetId(), req.GetUpdateMask().GetPaths(), req.GetItem()) } - return + return hc, plg, err } func (s Service) deleteFromRepo(ctx context.Context, id string) (bool, error) { diff --git a/internal/daemon/controller/handlers/host_sets/host_set_service.go b/internal/daemon/controller/handlers/host_sets/host_set_service.go index 6f60ef60aa..a28659c37d 100644 --- a/internal/daemon/controller/handlers/host_sets/host_set_service.go +++ b/internal/daemon/controller/handlers/host_sets/host_set_service.go @@ -722,7 +722,7 @@ func (s Service) updateInRepo(ctx context.Context, projectId, catalogId string, case hostplugin.Subtype: hs, hosts, plg, err = s.updatePluginInRepo(ctx, projectId, req) } - return + return hs, hosts, plg, err } func (s Service) deleteFromRepo(ctx context.Context, projectId, id string) (bool, error) { diff --git a/internal/daemon/worker/proxy/testing.go b/internal/daemon/worker/proxy/testing.go index 16777a0768..200f0fc656 100644 --- a/internal/daemon/worker/proxy/testing.go +++ b/internal/daemon/worker/proxy/testing.go @@ -50,5 +50,5 @@ func TestWsConn(t testing.TB, ctx context.Context) (clientConn, proxyConn *webso require.NoError(err) t.Cleanup(func() { _ = clientConn.Close(websocket.StatusGoingAway, "done") }) wg.Wait() - return + return clientConn, proxyConn } diff --git a/internal/host/plugin/repository_host_util.go b/internal/host/plugin/repository_host_util.go index 1dd87de784..9ff2d50870 100644 --- a/internal/host/plugin/repository_host_util.go +++ b/internal/host/plugin/repository_host_util.go @@ -267,5 +267,5 @@ func getSetChanges( } } - return + return setMembershipsToAdd, setMembershipsToRemove } diff --git a/internal/iam/repository_principal_role.go b/internal/iam/repository_principal_role.go index b683e71910..a0eb810ec6 100644 --- a/internal/iam/repository_principal_role.go +++ b/internal/iam/repository_principal_role.go @@ -665,5 +665,5 @@ func splitPrincipals(ctx context.Context, principals []string) (users, groups, m } } - return + return users, groups, managedGroups, retErr } diff --git a/internal/iam/repository_principal_role_test.go b/internal/iam/repository_principal_role_test.go index 6375adbc62..5371221bae 100644 --- a/internal/iam/repository_principal_role_test.go +++ b/internal/iam/repository_principal_role_test.go @@ -34,7 +34,7 @@ func TestRepository_AddPrincipalRoles(t *testing.T) { orgs = append(orgs, org.PublicId) projects = append(projects, proj.PublicId) } - return + return orgs, projects } createUsersFn := func(orgs []string) []string { results := []string{} @@ -462,7 +462,7 @@ func TestRepository_DeletePrincipalRoles(t *testing.T) { orgs = append(orgs, org.PublicId) projects = append(projects, proj.PublicId) } - return + return orgs, projects } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/internal/iam/testing.go b/internal/iam/testing.go index 8ee3284978..457b50e88f 100644 --- a/internal/iam/testing.go +++ b/internal/iam/testing.go @@ -85,7 +85,7 @@ func TestScopes(t testing.TB, repo *Repository, opt ...Option) (org *Scope, prj require.NotNil(prj) require.NotEmpty(prj.GetPublicId()) - return + return org, prj } func TestOrg(t testing.TB, repo *Repository, opt ...Option) *Scope { diff --git a/internal/oplog/testing.go b/internal/oplog/testing.go index fceb24bbe2..367c0ffcc5 100644 --- a/internal/oplog/testing.go +++ b/internal/oplog/testing.go @@ -112,7 +112,7 @@ func testInitDbInDocker(t testing.TB) (cleanup func() error, retURL string, err cleanup, retURL, _, err = dbtest.StartUsingTemplate(dbtest.Postgres) require.NoError(err) testInitStore(t, cleanup, retURL) - return + return cleanup, retURL, err } // testInitStore will execute the migrations needed to initialize the store for tests diff --git a/internal/perms/acl.go b/internal/perms/acl.go index 2dbd99c4a4..665c6bc4c0 100644 --- a/internal/perms/acl.go +++ b/internal/perms/acl.go @@ -369,11 +369,11 @@ func (a ACL) Allowed(r Resource, aType action.Type, userId string, opt ...Option fields, _ := grant.OutputFields.Fields() results.OutputFields = results.OutputFields.AddFields(fields) if results.OutputFields.Has("*") && results.Authorized { - return + return results } } } - return + return results } // ListResolvableAliasesPermissions builds a set of Permissions based on the diff --git a/internal/perms/grants.go b/internal/perms/grants.go index 75d247cb8b..0cccc2e08b 100644 --- a/internal/perms/grants.go +++ b/internal/perms/grants.go @@ -37,7 +37,7 @@ func (a ActionSet) Actions() (typs []action.Type, strs []string) { typs = append(typs, k) strs = append(strs, k.String()) } - return + return typs, strs } // GrantTuple is simply a struct that can be reference from other code to return diff --git a/internal/ratelimit/handler.go b/internal/ratelimit/handler.go index b234f02925..12e56335d6 100644 --- a/internal/ratelimit/handler.go +++ b/internal/ratelimit/handler.go @@ -51,7 +51,7 @@ func extractResourceAction(path, method string) (res, act string, err error) { if !ok { res = resource.Unknown.String() err = errUnknownResource - return + return res, act, err } res = r.String() case "action": @@ -61,17 +61,17 @@ func extractResourceAction(path, method string) (res, act string, err error) { if err != nil { act = action.Unknown.String() err = errUnknownAction - return + return res, act, err } at, ok := action.Map[act] if !ok { act = action.Unknown.String() err = errUnknownAction - return + return res, act, err } if !actionSet.HasAction(at) { err = errUnsupportedAction - return + return res, act, err } } case "id": @@ -91,7 +91,7 @@ func extractResourceAction(path, method string) (res, act string, err error) { default: act = action.Unknown.String() err = errUnsupportedAction - return + return res, act, err } default: switch method { @@ -104,11 +104,11 @@ func extractResourceAction(path, method string) (res, act string, err error) { default: act = action.Unknown.String() err = errUnsupportedAction - return + return res, act, err } } } - return + return res, act, err } // LimiterFunc returns a rate.Limiter diff --git a/internal/session/service_statistics_test.go b/internal/session/service_statistics_test.go index f61122fd10..7ab79df7fd 100644 --- a/internal/session/service_statistics_test.go +++ b/internal/session/service_statistics_test.go @@ -44,7 +44,7 @@ func TestCloseOrphanedConnections(t *testing.T) { { name: "missing connection repository", setup: func() (workerId string, conns []*Connection, expectedClosedConnections []string) { - return + return workerId, conns, expectedClosedConnections }, wantErrMsg: "session.CloseOrphanedConnections: missing connection repository: parameter violation: error #100", }, @@ -52,7 +52,7 @@ func TestCloseOrphanedConnections(t *testing.T) { name: "empty worker id", connRepo: &ConnectionRepository{}, setup: func() (workerId string, conns []*Connection, expectedClosedConnections []string) { - return + return workerId, conns, expectedClosedConnections }, wantErrMsg: "session.CloseOrphanedConnections: missing worker id: parameter violation: error #100", }, @@ -62,7 +62,7 @@ func TestCloseOrphanedConnections(t *testing.T) { setup: func() (workerId string, conns []*Connection, expectedClosedConnections []string) { w := server.TestKmsWorker(t, conn, wrapper) workerId = w.GetPublicId() - return + return workerId, conns, expectedClosedConnections }, }, { @@ -72,7 +72,7 @@ func TestCloseOrphanedConnections(t *testing.T) { w := server.TestKmsWorker(t, conn, wrapper) workerId = w.GetPublicId() conns = make([]*Connection, 0) - return + return workerId, conns, expectedClosedConnections }, }, { @@ -86,7 +86,7 @@ func TestCloseOrphanedConnections(t *testing.T) { PublicId: "c_dne", }, } - return + return workerId, conns, expectedClosedConnections }, }, { @@ -126,7 +126,7 @@ func TestCloseOrphanedConnections(t *testing.T) { require.NoError(t, err) workerId = w.GetPublicId() conns = []*Connection{} - return + return workerId, conns, expectedClosedConnections }, }, { @@ -167,7 +167,7 @@ func TestCloseOrphanedConnections(t *testing.T) { PublicId: c1.GetPublicId(), }, } - return + return workerId, conns, expectedClosedConnections }, }, { @@ -211,7 +211,7 @@ func TestCloseOrphanedConnections(t *testing.T) { PublicId: c1.GetPublicId(), }, } - return + return workerId, conns, expectedClosedConnections }, }, { @@ -275,7 +275,7 @@ func TestCloseOrphanedConnections(t *testing.T) { PublicId: c2.GetPublicId(), }, } - return + return workerId, conns, expectedClosedConnections }, }, { @@ -336,7 +336,7 @@ func TestCloseOrphanedConnections(t *testing.T) { }, } expectedClosedConnections = []string{c1.PublicId} - return + return workerId, conns, expectedClosedConnections }, }, { @@ -407,7 +407,7 @@ func TestCloseOrphanedConnections(t *testing.T) { }, } expectedClosedConnections = []string{c3.PublicId} - return + return workerId, conns, expectedClosedConnections }, }, } diff --git a/internal/util/net.go b/internal/util/net.go index f0b6ad97ca..32e2fa53f1 100644 --- a/internal/util/net.go +++ b/internal/util/net.go @@ -84,7 +84,7 @@ func SplitHostPort(hostport string) (host string, port string, err error) { // a port (or is a malformed IPv6 address like "::1:1234"). host = ip.String() err = ErrMissingPort - return + return host, port, err } // At this time, we don't necessarily know that `hostport` is a string @@ -95,7 +95,7 @@ func SplitHostPort(hostport string) (host string, port string, err error) { addrErr := new(net.AddrError) isAddrErr := errors.As(err, &addrErr) if !isAddrErr { - return + return host, port, err } // Since net.SplitHostPort does not type the error reason, we'll handle @@ -129,7 +129,7 @@ func SplitHostPort(hostport string) (host string, port string, err error) { } } - return + return host, port, err } // ParseAddress trims and validates the input address string. It checks whether diff --git a/internal/website/permstable/permstable.go b/internal/website/permstable/permstable.go index 2f35a25a5d..032cf89b00 100644 --- a/internal/website/permstable/permstable.go +++ b/internal/website/permstable/permstable.go @@ -231,7 +231,7 @@ func (p *Page) MarshalTableOfContents() (ret []string) { )) } - return + return ret } func (p *Page) MarshalBody() (ret []string) { @@ -240,7 +240,7 @@ func (p *Page) MarshalBody() (ret []string) { ret = append(ret, "") } - return + return ret } func (r *Resource) Marshal() (ret []string) { @@ -273,7 +273,7 @@ func (r *Resource) Marshal() (ret []string) { ret = append(ret, v.Marshal()...) } - return + return ret } func (e *Endpoint) Marshal() (ret []string) { @@ -315,7 +315,7 @@ func (e *Endpoint) Marshal() (ret []string) { ret = append(ret, fmt.Sprintf("| %s |", strings.Join(row, " | "))) - return + return ret } func toSentenceCase(s string) string { diff --git a/plugins/boundary/mains/aws/go.mod b/plugins/boundary/mains/aws/go.mod index 8a3085050e..508f62b405 100644 --- a/plugins/boundary/mains/aws/go.mod +++ b/plugins/boundary/mains/aws/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/hashicorp/boundary-plugin-aws v0.5.1 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 ) require ( @@ -63,8 +63,8 @@ require ( golang.org/x/net v0.43.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.28.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect google.golang.org/grpc v1.75.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/plugins/boundary/mains/aws/go.sum b/plugins/boundary/mains/aws/go.sum index 3d2c9047a1..6e0539145b 100644 --- a/plugins/boundary/mains/aws/go.sum +++ b/plugins/boundary/mains/aws/go.sum @@ -71,8 +71,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/boundary-plugin-aws v0.5.1 h1:m8uV2YnmM4yQB3wJdwlIeOB+EdzMXrBJ2jMqf5FkRXc= github.com/hashicorp/boundary-plugin-aws v0.5.1/go.mod h1:EgAYE7ZFz1uLoDEutYYlxLRieWfxPXW7hSCSmp8jA/E= -github.com/hashicorp/boundary/sdk v0.0.54 h1:BTCi/Sr0nmIqAafvm06JJFKYeQ11gRYF23psLeWJDdA= -github.com/hashicorp/boundary/sdk v0.0.54/go.mod h1:I6KqmAvQjuvF316iEEQly9/CzgVxwHPHo/W8nCXeV88= +github.com/hashicorp/boundary/sdk v0.0.55 h1:+1U2Nzw4snN62lNbztyczcFC3pN48gCZwyH6MTtVKII= +github.com/hashicorp/boundary/sdk v0.0.55/go.mod h1:Czlnppzciz//CzXDGRyeH9YRpZ/mCeN2EVirP1tJdGc= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -198,10 +198,10 @@ golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= diff --git a/plugins/boundary/mains/azure/go.mod b/plugins/boundary/mains/azure/go.mod index a658be2233..964c0f8ccf 100644 --- a/plugins/boundary/mains/azure/go.mod +++ b/plugins/boundary/mains/azure/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/hashicorp/boundary-plugin-azure v0.2.0 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 ) require ( @@ -59,8 +59,8 @@ require ( golang.org/x/sync v0.16.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.28.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect google.golang.org/grpc v1.75.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/plugins/boundary/mains/azure/go.sum b/plugins/boundary/mains/azure/go.sum index b05d907591..fe717f9feb 100644 --- a/plugins/boundary/mains/azure/go.sum +++ b/plugins/boundary/mains/azure/go.sum @@ -158,8 +158,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/hashicorp/boundary-plugin-azure v0.2.0 h1:JmsJamOb6IEWodQ7CJW9wJz09o+Q2fk1Cm0GnNruQuQ= github.com/hashicorp/boundary-plugin-azure v0.2.0/go.mod h1:V0zTGIqZQNYl9fl7q+NX13F4AyJ3pMGVlfopFfZr9O0= -github.com/hashicorp/boundary/sdk v0.0.54 h1:BTCi/Sr0nmIqAafvm06JJFKYeQ11gRYF23psLeWJDdA= -github.com/hashicorp/boundary/sdk v0.0.54/go.mod h1:I6KqmAvQjuvF316iEEQly9/CzgVxwHPHo/W8nCXeV88= +github.com/hashicorp/boundary/sdk v0.0.55 h1:+1U2Nzw4snN62lNbztyczcFC3pN48gCZwyH6MTtVKII= +github.com/hashicorp/boundary/sdk v0.0.55/go.mod h1:Czlnppzciz//CzXDGRyeH9YRpZ/mCeN2EVirP1tJdGc= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -534,10 +534,10 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/plugins/boundary/mains/gcp/go.mod b/plugins/boundary/mains/gcp/go.mod index cdaca8a3df..bd610e000a 100644 --- a/plugins/boundary/mains/gcp/go.mod +++ b/plugins/boundary/mains/gcp/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/hashicorp/boundary-plugin-gcp v0.1.0 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 ) require ( @@ -66,8 +66,8 @@ require ( golang.org/x/time v0.12.0 // indirect google.golang.org/api v0.196.0 // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect google.golang.org/grpc v1.75.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/plugins/boundary/mains/gcp/go.sum b/plugins/boundary/mains/gcp/go.sum index 6d0b3c308e..30fe75df0e 100644 --- a/plugins/boundary/mains/gcp/go.sum +++ b/plugins/boundary/mains/gcp/go.sum @@ -85,8 +85,8 @@ github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDP github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= github.com/hashicorp/boundary-plugin-gcp v0.1.0 h1:fIq07J0byp3qJ7aCC+oN+hLt11V5kjgzj3HpOa6r32o= github.com/hashicorp/boundary-plugin-gcp v0.1.0/go.mod h1:l15UQaKEEcppwrFGGVNBBVmAZqN5HaOk29dh5uVVztQ= -github.com/hashicorp/boundary/sdk v0.0.54 h1:BTCi/Sr0nmIqAafvm06JJFKYeQ11gRYF23psLeWJDdA= -github.com/hashicorp/boundary/sdk v0.0.54/go.mod h1:I6KqmAvQjuvF316iEEQly9/CzgVxwHPHo/W8nCXeV88= +github.com/hashicorp/boundary/sdk v0.0.55 h1:+1U2Nzw4snN62lNbztyczcFC3pN48gCZwyH6MTtVKII= +github.com/hashicorp/boundary/sdk v0.0.55/go.mod h1:Czlnppzciz//CzXDGRyeH9YRpZ/mCeN2EVirP1tJdGc= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -263,10 +263,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/plugins/boundary/mains/minio/go.mod b/plugins/boundary/mains/minio/go.mod index 79228be796..189a6df79e 100644 --- a/plugins/boundary/mains/minio/go.mod +++ b/plugins/boundary/mains/minio/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/hashicorp/boundary-plugin-minio v0.1.7 - github.com/hashicorp/boundary/sdk v0.0.54 + github.com/hashicorp/boundary/sdk v0.0.55 ) require ( @@ -51,8 +51,8 @@ require ( golang.org/x/net v0.43.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.28.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect google.golang.org/grpc v1.75.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/plugins/boundary/mains/minio/go.sum b/plugins/boundary/mains/minio/go.sum index 94ae0d3536..bb115d425b 100644 --- a/plugins/boundary/mains/minio/go.sum +++ b/plugins/boundary/mains/minio/go.sum @@ -63,8 +63,8 @@ github.com/hashicorp/boundary-plugin-minio v0.1.7 h1:s6VVeYor6jm6+RtEjAgRahrsi6H github.com/hashicorp/boundary-plugin-minio v0.1.7/go.mod h1:x7qnQE0bGwsRCiBXMMad1u+nhsLAa2Jpbpu9P3ysNQ0= github.com/hashicorp/boundary-plugin-minio/madmin v0.1.0 h1:VH/D4t0L3wmVPn7a1DDqF4nSOTGuWktXLnDny98y63Y= github.com/hashicorp/boundary-plugin-minio/madmin v0.1.0/go.mod h1:y0Q45edl67+Q8CVtnMpDeneusJv8ypMXWrKDyTA82qI= -github.com/hashicorp/boundary/sdk v0.0.54 h1:BTCi/Sr0nmIqAafvm06JJFKYeQ11gRYF23psLeWJDdA= -github.com/hashicorp/boundary/sdk v0.0.54/go.mod h1:I6KqmAvQjuvF316iEEQly9/CzgVxwHPHo/W8nCXeV88= +github.com/hashicorp/boundary/sdk v0.0.55 h1:+1U2Nzw4snN62lNbztyczcFC3pN48gCZwyH6MTtVKII= +github.com/hashicorp/boundary/sdk v0.0.55/go.mod h1:Czlnppzciz//CzXDGRyeH9YRpZ/mCeN2EVirP1tJdGc= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -229,10 +229,10 @@ golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU= -google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= diff --git a/sdk/go.mod b/sdk/go.mod index a8786012d3..99fa6c02bb 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -3,7 +3,7 @@ module github.com/hashicorp/boundary/sdk go 1.25.0 require ( - github.com/coder/websocket v1.8.13 + github.com/coder/websocket v1.8.14 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 github.com/hashicorp/eventlogger v0.2.11 github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20231025104552-802587e608f0 diff --git a/sdk/go.sum b/sdk/go.sum index cf933bdaf1..3407e9c853 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -10,8 +10,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw= github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= -github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE= -github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= +github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g= +github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/testing/internal/e2e/vault/vault.go b/testing/internal/e2e/vault/vault.go index a9e6fba95a..1ee00bbb88 100644 --- a/testing/internal/e2e/vault/vault.go +++ b/testing/internal/e2e/vault/vault.go @@ -36,7 +36,7 @@ func Setup(t testing.TB, boundaryControllerFilePath string) (boundaryPolicyName _, err = os.Create(kvPolicyFilePath) require.NoError(t, err) - return + return boundaryPolicyName, kvPolicyFilePath } // CreateKvPrivateKeyCredential creates a private key credential in vault and creates a vault policy @@ -98,7 +98,7 @@ func CreateKvPasswordCredential(t testing.TB, secretPath string, user string, kv ) require.NoError(t, output.Err, string(output.Stderr)) - return + return secretName, password } // CreateKvPasswordDomainCredential creates a username/password/domain credential in vault and creates a vault @@ -131,7 +131,7 @@ func CreateKvPasswordDomainCredential(t testing.TB, secretPath string, user stri ) require.NoError(t, output.Err, string(output.Stderr)) - return + return secretName, password } // WritePolicy adds a policy to vault. Provide a name for the policy that you want to create as well