165 Commits (e26ac3f388ffb217dff0c153d3ac123a501384ef)

Author	SHA1	Message	Date
Hans Hasselberg	e26ac3f388	Update HCP bootstrapping to support existing clusters 1.14.x version (#17303) ... * Persist HCP management token from server config We want to move away from injecting an initial management token into Consul clusters linked to HCP. The reasoning is that by using a separate class of token we can have more flexibility in terms of allowing HCP's token to co-exist with the user's management token. Down the line we can also more easily adjust the permissions attached to HCP's token to limit it's scope. With these changes, the cloud management token is like the initial management token in that iit has the same global management policy and if it is created it effectively bootstraps the ACL system. * Update SDK and mock HCP server The HCP management token will now be sent in a special field rather than as Consul's "initial management" token configuration. This commit also updates the mock HCP server to more accurately reflect the behavior of the CCM backend. * Refactor HCP bootstrapping logic and add tests We want to allow users to link Consul clusters that already exist to HCP. Existing clusters need care when bootstrapped by HCP, since we do not want to do things like change ACL/TLS settings for a running cluster. Additional changes: * Deconstruct MaybeBootstrap so that it can be tested. The HCP Go SDK requires HTTPS to fetch a token from the Auth URL, even if the backend server is mocked. By pulling the hcp.Client creation out we can modify its TLS configuration in tests while keeping the secure behavior in production code. * Add light validation for data received/loaded. * Sanitize initial_management token from received config, since HCP will only ever use the CloudConfig.MangementToken. * Add changelog entry * pin logr * pin stdr --------- Co-authored-by: freddygv <freddy@hashicorp.com> Co-authored-by: John Murret <john.murret@hashicorp.com>	2 years ago
hc-github-team-consul-core	5f5590e1be	Update golang.org/x/net to v0.7.0 (#17026) ... Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com> Co-authored-by: David Yu <dyu@hashicorp.com>	2 years ago
Dan Stough	0448e51cf5	Manual Backport of [OSS] security: update go to 1.20.1 into release/1.14.x (#16321) ... * security: update go to 1.20.1 (#16263) * changelog	2 years ago
hc-github-team-consul-core	7ac2df3f3c	Update go-discover to support ECS discovery (#13782) (#15966) ... Co-authored-by: Frank DiRocco <160608+fdr2@users.noreply.github.com> Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>	2 years ago
hc-github-team-consul-core	83bf3e4b43	Backport of [OSS] security: update x/net module into release/1.14.x (#15744) ... * backport of commit 32688b1ef5 * backport of commit 9c832651d9 * go mod tidy compatibility tests * changelog Co-authored-by: DanStough <dan.stough@hashicorp.com> Co-authored-by: Dhia Ayachi <dhia@hashicorp.com>	2 years ago
Chris S. Kim	fb7b645b29	Update hcp-scada-provider to fix diamond dependency problem with go-msgpack (#15185) (#15277)	2 years ago
Chris S. Kim	59f14f5e01	Update go-memdb to fix a goroutine leak	2 years ago
Dhia Ayachi	5eb2bad8fd	bump relevant modules versions (#14972)	2 years ago
Dhia Ayachi	7f6c52a9ee	bump raft version to v1.3.11 (#14897) ... * bump raft version to v1.3.11 * Add change log * fix go.sum	2 years ago
John Murret	79a541fd7d	Upgrade serf to v0.10.1 and memberlist to v0.5.0 to get memberlist size metrics and broadcast queue depth metric (#14873) ... * updating to serf v0.10.1 and memberlist v0.5.0 to get memberlist size metrics and memberlist broadcast queue depth metric * update changelog * update changelog * correcting changelog * adding "QueueCheckInterval" for memberlist to test * updating integration test containers to grab latest api	2 years ago
Nick Ethier	1c1b0994b8	add HCP integration component (#14723) ... * add HCP integration * lint: use non-deprecated logging interface	2 years ago
freddygv	f30bc96239	Test fixes ... - Pulls in CLI test fix from main - Updates psutils to fix TestAgent_Host on M1 Mac	2 years ago
cskh	e84e4b8868	Fix: upgrade pkg imdario/merg to prevent merge config panic (#14237) ... * upgrade imdario/merg to prevent merge config panic * test: service definition takes precedence over service-defaults in merged results	2 years ago
cskh	81931e52c3	feat(telemetry): add labels to serf and memberlist metrics (#14161) ... * feat(telemetry): add labels to serf and memberlist metrics * changelog * doc update Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>	2 years ago
Nitya Dhanushkodi	f47319b7c6	update generate token endpoint to take external addresses (#13844) ... Update generate token endpoint (rpc, http, and api module) If ServerExternalAddresses are set, it will override any addresses gotten from the "consul" service, and be used in the token instead, and dialed by the dialer. This allows for setting up a load balancer for example, in front of the consul servers.	2 years ago
Paul Glass	77afe0e76e	Extract AWS auth implementation out of Consul (#13760)	2 years ago
Daniel Kimsey	feead0b11b	Update go-grpc/grpc to resolve conection memory leak ... Reported in #12288 The initial test reported was ported and accurately reproduced the issue. However, since it is a test of an upstream library's internal behavior it won't be codified in our test suite. Refer to the ticket/PR for details on how to demonstrate the behavior.	3 years ago
Chris S. Kim	f0a9b30174	Update repo to use go:embed (#10996) ... Replace bindata packages with stdlib go:embed. Modernize some uiserver code with newer interfaces introduced in go 1.16 (mainly working with fs.File instead of http.File. Remove steps that are no longer used from our build files. Add Github Action to detect differences in agent/uiserver/dist and verify that the files are correct (by compiling UI assets and comparing contents).	3 years ago
Kyle Havlovitz	4bc6c23357	Add connection limit setting to service defaults	3 years ago
R.B. Boyer	2e72f44fda	peering: accept replication stream of discovery chain information at the importing side (#13151)	3 years ago
Dhia Ayachi	78412ae069	upgrade serf to v0.9.8 (#13062) ... * upgrade serf to v0.9.8 * add changelog * Update .changelog/13062.txt Co-authored-by: Dan Upton <daniel@floppy.co> Co-authored-by: Dan Upton <daniel@floppy.co>	3 years ago
Dhia Ayachi	b895dd7d2d	change mod go version to 1.18 (#12976) ... * change mod go version to 1.18 * fix go.mod format for 1.18	3 years ago
Dan Upton	7a6f86c1d4	Upgrade Raft to v1.3.9 for saturation metrics (#12865)	3 years ago
Dhia Ayachi	b83a790927	update raft to v1.3.8 (#12844) ... * update raft to v1.3.7 * add changelog * fix compilation error * fix HeartbeatTimeout * fix ElectionTimeout to reload only if value is valid * fix default values for `ElectionTimeout` and `HeartbeatTimeout` * fix test defaults * bump raft to v1.3.8	3 years ago
R.B. Boyer	f507f62f3c	peering: initial sync (#12842) ... - Add endpoints related to peering: read, list, generate token, initiate peering - Update node/service/check table indexing to account for peers - Foundational changes for pushing service updates to a peer - Plumb peer name through Health.ServiceNodes path see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679, ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663, ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634, ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555 Co-authored-by: R.B. Boyer <rb@hashicorp.com> Co-authored-by: freddygv <freddy@hashicorp.com> Co-authored-by: Chris S. Kim <ckim@hashicorp.com> Co-authored-by: Evan Culver <eculver@hashicorp.com> Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>	3 years ago
DanStough	95250e7915	Update go version to 1.18.1	3 years ago
R.B. Boyer	8beaca4e01	deps: update to latest go-discover (#12739) ... Fixes #11253 $ go mod why -m github.com/dgrijalva/jwt-go # github.com/dgrijalva/jwt-go (main module does not need module github.com/dgrijalva/jwt-go) $ go mod why -m github.com/form3tech-oss/jwt-go # github.com/form3tech-oss/jwt-go github.com/hashicorp/consul/agent github.com/hashicorp/go-discover github.com/hashicorp/go-discover/provider/azure github.com/Azure/go-autorest/autorest github.com/Azure/go-autorest/autorest/adal github.com/form3tech-oss/jwt-go	3 years ago
Matt Keeler	a553982506	Enable running autopilot state updates on all servers (#12617) ... * Fixes a lint warning about t.Errorf not supporting %w * Enable running autopilot on all servers On the non-leader servers all they do is update the state and do not attempt any modifications. * Fix the RPC conn limiting tests Technically they were relying on racey behavior before. Now they should be reliable.	3 years ago
Eric	e4b4f175ed	Bump go-control-plane ... * `go get cloud.google.com/go@v0.59.0` * `go get github.com/envoyproxy/go-control-plane@v0.9.9` * `make envoy-library` * Bumpprotoc to 3.15.8	3 years ago
Matt Keeler	15ddbbc686	Update raft-boltdb to pull in new writeCapacity metric (#12646)	3 years ago
Eric	776f5843d0	remove gogo from pbservice	3 years ago
FFMMM	db27ea3484	[sync oss] add net/rpc interceptor implementation (#12573) ... * sync ent changes from 866dcb0667 Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> * update oss go.mod Signed-off-by: FFMMM <FFMMM@users.noreply.github.com>	3 years ago
R.B. Boyer	58e053c336	raft: upgrade to v1.3.6 (#12496) ... Add additional protections on the Consul side to prevent NonVoters from bootstrapping raft. This should un-flake TestServer_Expect_NonVoters	3 years ago
R.B. Boyer	7b0548dd8d	server: suppress spurious blocking query returns where multiple config entries are involved (#12362) ... Starting from and extending the mechanism introduced in #12110 we can specially handle the 3 main special Consul RPC endpoints that react to many config entries in a single blocking query in Connect: - `DiscoveryChain.Get` - `ConfigEntry.ResolveServiceConfig` - `Intentions.Match` All of these will internally watch for many config entries, and at least one of those will likely be not found in any given query. Because these are blends of multiple reads the exact solution from #12110 isn't perfectly aligned, but we can tweak the approach slightly and regain the utility of that mechanism. ### No Config Entries Found In this case, despite looking for many config entries none may be found at all. Unlike #12110 in this scenario we do not return an empty reply to the caller, but instead synthesize a struct from default values to return. This can be handled nearly identically to #12110 with the first 1-2 replies being non-empty payloads followed by the standard spurious wakeup suppression mechanism from #12110. ### No Change Since Last Wakeup Once a blocking query loop on the server has completed and slept at least once, there is a further optimization we can make here to detect if any of the config entries that were present at specific versions for the prior execution of the loop are identical for the loop we just woke up for. In that scenario we can return a slightly different internal sentinel error and basically externally handle it similar to #12110. This would mean that even if 20 discovery chain read RPC handling goroutines wakeup due to the creation of an unrelated config entry, the only ones that will terminate and reply with a blob of data are those that genuinely have new data to report. ### Extra Endpoints Since this pattern is pretty reusable, other key config-entry-adjacent endpoints used by `agent/proxycfg` also were updated: - `ConfigEntry.List` - `Internal.IntentionUpstreams` (tproxy)	3 years ago
Dhia Ayachi	cd9d8d44a5	file watcher to be used for configuration auto-reload feature (#12301) ... * add config watcher to the config package * add logging to watcher * add test and refactor to add WatcherEvent. * add all API calls and fix a bug with recreated files * add tests for watcher * remove the unnecessary use of context * Add debug log and a test for file rename * use inode to detect if the file is recreated/replaced and only listen to create events. * tidy ups (#1535) * tidy ups * Add tests for inode reconcile * fix linux vs windows syscall * fix linux vs windows syscall * fix windows compile error * increase timeout * use ctime ID * remove remove/creation test as it's a use case that fail in linux * fix linux/windows to use Ino/CreationTime * fix the watcher to only overwrite current file id * fix linter error * fix remove/create test * set reconcile loop to 200 Milliseconds * fix watcher to not trigger event on remove, add more tests * on a remove event try to add the file back to the watcher and trigger the handler if success * fix race condition * fix flaky test * fix race conditions * set level to info * fix when file is removed and get an event for it after * fix to trigger handler when we get a remove but re-add fail * fix error message * add tests for directory watch and fixes * detect if a file is a symlink and return an error on Add * rename Watcher to FileWatcher and remove symlink deref * add fsnotify@v1.5.1 * fix go mod * fix flaky test * Apply suggestions from code review Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> * fix a possible stack overflow * do not reset timer on errors, rename OS specific files * start the watcher when creating it * fix data race in tests * rename New func * do not call handler when a remove event happen * events trigger on write and rename * fix watcher tests * make handler async * remove recursive call * do not produce events for sub directories * trim "/" at the end of a directory when adding * add missing test * fix logging * add todo * fix failing test * fix flaking tests * fix flaky test * add logs * fix log text * increase timeout * reconcile when remove * check reconcile when removed * fix reconcile move test * fix logging * delete invalid file * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix review comments * fix is watched to properly catch a remove * change test timeout * fix test and rename id * fix test to create files with different mod time. * fix deadlock when stopping watcher * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix a deadlock when calling stop while emitting event is blocked * make sure to close the event channel after the event loop is done * add go doc * back date file instead of sleeping * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * check error Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>	3 years ago
R.B. Boyer	80dfcb1bcd	raft: update to v1.3.5 (#12325) ... This includes closing some leadership transfer gaps and adding snapshot restore progress logging.	3 years ago
FFMMM	78264a8030	Vendor in rpc mono repo for net/rpc fork, go-msgpack, msgpackrpc. (#12311) ... This commit syncs ENT changes to the OSS repo. Original commit details in ENT: ``` commit 569d25f7f4578981c3801e6e067295668210f748 Author: FFMMM <FFMMM@users.noreply.github.com> Date: Thu Feb 10 10:23:33 2022 -0800 Vendor fork net rpc (#1538) * replace net/rpc w consul-net-rpc/net/rpc Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> * replace msgpackrpc and go-msgpack with fork from mono repo Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> * gofmt all files touched Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> ``` Signed-off-by: FFMMM <FFMMM@users.noreply.github.com>	3 years ago
Dhia Ayachi	25c36af222	update serf to v0.9.7 (#12057) ... * update serf to v0.9.7 * add change log * update changelog	3 years ago
dependabot[bot]	f3ac9dafa6	build(deps): bump github.com/ryanuber/columnize (#12062) ... Bumps [github.com/ryanuber/columnize](https://github.com/ryanuber/columnize) from 2.1.0+incompatible to 2.1.2+incompatible. - [Release notes](https://github.com/ryanuber/columnize/releases) - [Commits](https://github.com/ryanuber/columnize/compare/v2.1.0...v2.1.2) --- updated-dependencies: - dependency-name: github.com/ryanuber/columnize dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	2c8de28005	build(deps): bump github.com/kr/text from 0.1.0 to 0.2.0 (#12063) ... Bumps [github.com/kr/text](https://github.com/kr/text) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/kr/text/releases) - [Commits](https://github.com/kr/text/compare/v0.1.0...v0.2.0) --- updated-dependencies: - dependency-name: github.com/kr/text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	4947d6d29f	build(deps): bump github.com/mitchellh/pointerstructure (#12072) ... Bumps [github.com/mitchellh/pointerstructure](https://github.com/mitchellh/pointerstructure) from 1.0.0 to 1.2.1. - [Release notes](https://github.com/mitchellh/pointerstructure/releases) - [Commits](https://github.com/mitchellh/pointerstructure/compare/v1.0.0...v1.2.1) --- updated-dependencies: - dependency-name: github.com/mitchellh/pointerstructure dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	97348e25a7	Bump github.com/aws/aws-sdk-go from 1.25.41 to 1.42.34 (#12083) ... Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.25.41 to 1.42.34. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.25.41...v1.42.34) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	151e516a8c	Bump github.com/hashicorp/go-memdb from 1.3.1 to 1.3.2 (#11066) ... Bumps [github.com/hashicorp/go-memdb](https://github.com/hashicorp/go-memdb) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/hashicorp/go-memdb/releases) - [Changelog](https://github.com/hashicorp/go-memdb/blob/master/changes.go) - [Commits](https://github.com/hashicorp/go-memdb/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-memdb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	b9ed140b4b	Bump github.com/hashicorp/go-raftchunking from 0.6.1 to 0.6.2 (#11065) ... Bumps [github.com/hashicorp/go-raftchunking](https://github.com/hashicorp/go-raftchunking) from 0.6.1 to 0.6.2. - [Release notes](https://github.com/hashicorp/go-raftchunking/releases) - [Commits](https://github.com/hashicorp/go-raftchunking/compare/v0.6.1...v0.6.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-raftchunking dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	8878f0ea21	build(deps): bump github.com/hashicorp/go-multierror from 1.1.0 to 1.1.1 ... Bumps [github.com/hashicorp/go-multierror](https://github.com/hashicorp/go-multierror) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/hashicorp/go-multierror/releases) - [Commits](https://github.com/hashicorp/go-multierror/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-multierror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	3 years ago
Chris S. Kim	ea0df29afb	Update memberlist to 0.3.1 (#12042)	3 years ago
Dhia Ayachi	d0274d38a9	upgrade raft to v1.3.3 (#11958) ... * upgrade raft to v1.3.3 * add change log * reword the changelog Co-authored-by: FFMMM <FFMMM@users.noreply.github.com> Co-authored-by: FFMMM <FFMMM@users.noreply.github.com>	3 years ago
kisunji	59ddc44cc7	Update golang.org/x/net to address CVE-2021-44716	3 years ago
Daniel Nephin	dccd3f5806	Merge remote-tracking branch 'origin/main' into serve-panic-recovery	3 years ago
Matt Keeler	42a5635bc3	Use raft-boltdb/v2	3 years ago