Skip to content

Backport 1.16 fix snapshot test#18664

Closed
asheshvidyut wants to merge 9873 commits intorelease/1.6.xfrom
backport-1.16-fix-snapshot-test
Closed

Backport 1.16 fix snapshot test#18664
asheshvidyut wants to merge 9873 commits intorelease/1.6.xfrom
backport-1.16-fix-snapshot-test

Conversation

@asheshvidyut
Copy link
Contributor

Description

Small fix for this test. This fails in ENT because the version has 1.17.0+ent, but the test agent version does not have the +ent suffix.

The original PR is #18625

Andrew Stucki and others added 30 commits June 5, 2023 13:10
…a snapshot restore occurring (#17566)

* Fix up case where subscription is terminated due to ACLs changing or a snapshot restore occurring

* Add changelog entry

* Switch to use errors.Is
TLDR with many modules the versions included in each diverged quite a bit. Attempting to use Go Workspaces produces a bunch of errors.

This commit:

1. Fixes envoy-library-references.sh to work again
2. Ensures we are pulling in go-control-plane@v0.11.0 everywhere (previously it was at that version in some modules and others were much older)
3. Remove one usage of golang/protobuf that caused us to have a direct dependency on it.
4. Remove deprecated usage of the Endpoint field in the grpc resolver.Target struct. The current version of grpc (v1.55.0) has removed that field and recommended replacement with URL.Opaque and calls to the Endpoint() func when needing to consume the previous field.
4. `go work init <all the paths to go.mod files>` && `go work sync`. This syncrhonized versions of dependencies from the main workspace/root module to all submodules
5. Updated .gitignore to ignore the go.work and go.work.sum files. This seems to be standard practice at the moment.
6. Update doc comments in protoc-gen-consul-rate-limit to be go fmt compatible
7. Upgraded makefile infra to perform linting, testing and go mod tidy on all modules in a flexible manner.
8. Updated linter rules to prevent usage of golang/protobuf
9. Updated a leader peering test to account for an extra colon in a grpc error message.
* docs: clarify the behavior of prepending hostname to metrics

* Update website/content/docs/agent/config/config-files.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

---------

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* Fix subscribing/fetching objects not in the default namespace

* add changelog
Ensure that the embedded api struct is properly parsed when
deserializing config containing a set ResourceFilter.Services field.

Also enhance existing integration test to guard against bugs and
exercise this field.
* Add a ReplaceType dep mapper and move them into their own file

* Implement the service endpoints controller

* Implement a Catalog Controllers Integration Test
Fix some linter warnings before updating the lint-consul-retry code in hashicorp/lint-consul-retry#4
More validation is needed to ensure this behaves as expected; in the
meantime, align with docs and disable this proxy type.
…17608)

* backport of commit d77784b

* backport of commit f5a557d

* backport of commit 1d782d6

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Co-authored-by: Eric <eric@haberkorn.co>
* backport of commit dc9c08d

* backport of commit 1271705

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Co-authored-by: Ronald <roncodingenthusiast@users.noreply.github.com>
…es in synthesis code into release/1.16.x (#17616)

* backport of commit 63e8743

* backport of commit 896f117

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
Bump api, sdk versions to latest.
Bump api, envoyextensions versions to latest.
Update to new RC submodule versions. These will be updated again for the
1.16.0 release.
Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Other recent releases have not commented out the replace directives in
go.mod. Though it would be ideal to pin our submodules in the release
artifacts we produce, we need to tidy up our build pipeline to make this
feasible.

In the meantime, revert this change to keep the dependency entry
updates, but exclude them from the effective dependency tree.
Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
…ease/1.16.x (#17635)

* backport of commit fb2f3b6

* backport of commit 178abb8

* backport of commit 77b3998

* backport of commit a245b32

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
…c mgmt for k8s into release/1.16.x (#17645)

* backport of commit e4c2789

* backport of commit c3a2d0b

* backport of commit 81f8f7c

* backport of commit 63d12fb

* backport of commit 73d7179

* backport of commit f887336

---------

Co-authored-by: trujillo-adam <ajosetru@gmail.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Bryce Kalow <bkalow@hashicorp.com>
…into release/1.16.x (#17652)

* backport of commit 1602c99

* backport of commit 132c6ee

* backport of commit 5e64b93

* backport of commit 83a7b3f

---------

Co-authored-by: Paul Glass <pglass@hashicorp.com>
* backport of commit daf1268

* backport of commit fa7ec66

---------

Co-authored-by: David Yu <dyu@hashicorp.com>
…18449)

* backport of commit d6d0450

* backport of commit 39feb99

* backport of commit 8b1398a

* backport of commit 47b9c12

* backport of commit db8d974

* backport of commit f64e808

* backport of commit 6b6dbb4

* backport of commit 2e34721

* backport of commit 2d52b0c

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
… into release/1.16.x (#18472)

backport of commit 59bfc81

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
backport of commit a9482b0

Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
…18481)

backport of commit 2e091c0

Co-authored-by: David Yu <dyu@hashicorp.com>
… file contains BUSL header into release/1.16.x (#18489)

Add license-checker action that fails when any backported file contains BUSL header (#18485)

* Add license-checker action that fails when any backported file contains BUSL header

* Quote echoed variable to retain line breaks

* Add ticket to reference for more details

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
* backport of commit e0bdca4

* backport of commit bb76a45

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
* backport
* Update README.md

Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
…nto release/1.16.x (#18503)

backport of commit 61b7c0d

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
…into release/1.16.x (#18508)

backport of commit 1673852

Co-authored-by: Blake Covarrubias <blake@covarrubi.as>
* backport of commit b47758d

* backport of commit 7befe3e

---------

Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
…to release/1.16.x (#18520)

resolve conflict

Co-authored-by: temp <temp@hashicorp.com>
…k into release/1.16.x (#18565)

* backport of commit 06d4c72

* backport of commit 42c37bb

---------

Co-authored-by: cskh <hui.kang@hashicorp.com>
* fix for #18406 , non presence of consul-version meta

Co-authored-by: Vijay <vijayraghav22@gmail.com>
… files are in commit history into release/1.16.x (#18570)

backport of commit c833fcc

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
…e into release/1.16.x (#18537)

docs: Fix spelling errors across various pages on the site (#18533)

This commit fixes numerous spelling errors across the site and also
removes unnecessary whitespace that was present in the edited files.

Co-authored-by: Blake Covarrubias <blake@covarrubi.as>
#18588)

backport of commit 05dd1a8

Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
…6.x (#18527)

* backport of commit e7fa829

* fix merge conflicts

---------

Co-authored-by: Tu Nguyen <im2nguyen@gmail.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
…1.16.x (#18633)

* backport of commit bd136d1

* backport of commit cb770fa

---------

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
…populate after snapshot restore into release/1.16.x (#18645)

* backport of commit 029a517

* backport of commit 5f43acf

---------

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
…/1.16.x (#18648)

backport of commit 9c7f4f9

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
…18653)

backport of commit a2a903f

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
…Version / Datacenter into release/1.16.x (#18638)

* backport of commit 5e1bae5

* backport of commit 8805feb

* backport of commit 99443a2

* backport of commit 37155cd

* backport of commit c7971c9

* backport of commit 2b66e28

* backport of commit 2c9f48e

* backport of commit 0130674

* backport of commit 171e0a5

* NET 1594 - Snapshot Agent Filename Should Include Consul Version / Datacenter (#18625)

* init

* tests added and few fixes

* revert arg message

* changelog added

* removed var declaration

* fix CI

* fix test

* added node name and status

* updated save.mdx

* added example

* fix tense

* fix description

---------

Co-authored-by: absolutelightning <ashesh.vidyut@hashicorp.com>
Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
@github-actions github-actions bot deleted the backport-1.16-fix-snapshot-test branch August 29, 2025 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.