Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Removed nodename and status from consul snapshot save -append-filename command and using leader version in version into release/1.14.x #18684

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #18680 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Using leader version in version. Also removes nodename and status in consul snapshot save -append-filename command

Testing & Reproduction steps

make dev
./bin/consul agent -dev -config-file=../server.json
./bin/consul snapshot save -append-filename version,dc snap.bkp

asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (fix-snapshot-save-append-file %) » ./bin/consul snapshot save -append-filename version,dc snap.bkp                                        130 ↵
Saved and verified snapshot to index 17
asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (fix-snapshot-save-append-file %) » ls | grep snap-1.17.0-dc1.bkp
snap-1.17.0-dc1.bkp

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Sep 6, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

Removed nodename and status from consul snapshot save -append-filename command and using leader version in version (#18680)

* init

* fix tests

* fix tests lint

* fix api call inside dc

* updated doc

* address comments
@absolutelightning absolutelightning force-pushed the backport/fix-snapshot-save-append-file/openly-informed-gar branch from 7a4fbd0 to 4be1ad9 Compare September 6, 2023 10:33
@absolutelightning absolutelightning enabled auto-merge (squash) September 6, 2023 10:40
@absolutelightning absolutelightning merged commit 812468a into release/1.14.x Sep 6, 2023
@absolutelightning absolutelightning deleted the backport/fix-snapshot-save-append-file/openly-informed-gar branch September 6, 2023 10:42
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.

4 participants