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 Change minimum retention window CE changes into release/1.15.x #26143

Merged

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

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

🚨

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:
@akshya96
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/vault/merges: 409 Merge conflict []

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


Approved ent: https://github.com/hashicorp/vault-enterprise/pull/5600 and https://github.com/hashicorp/vault-enterprise/pull/5637


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 25, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Mar 25, 2024
Copy link

github-actions bot commented Mar 25, 2024

CI Results:
All Go tests succeeded! ✅

* Retention window oss changes

* latest oss changes

* remove operator_diagnose change
@akshya96 akshya96 marked this pull request as ready for review April 11, 2024 18:35
@akshya96 akshya96 added this to the 1.15.8 milestone Apr 11, 2024
@akshya96 akshya96 requested a review from mpalmi April 11, 2024 18:36
Copy link

github-actions bot commented Apr 11, 2024

Build Results:
All builds succeeded! ✅

@akshya96 akshya96 closed this Apr 11, 2024
@akshya96 akshya96 reopened this Apr 11, 2024
Co-authored-by: Scott Miller <smiller@hashicorp.com>
Co-authored-by: miagilepner <mia.epner@hashicorp.com>
…all request headers (#26158) (#26159)

* Add known issue docs for Ent Perf Standby audit header logging issue

* attempt to improve description

Co-authored-by: Peter Wilson <peter.wilson@hashicorp.com>
To follow new processes for creating release notes on GitHub, I need to update the changelog on the release branch. I've opted to copy the entirety of the 1.15 changelog content to the release branch, adding the notes for 1.15.7.

Next I'll create the tag per these instructions https://github.com/hashicorp/engineering-docs/blob/main/consul/releases/release-process.md#manually-create-github-releases-for-ent-only-patch-releases, and update the release notes for that tag & release.
Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>
Co-authored-by: Socheat Sok <socheatsok78@gmail.com>
) (#26271)

* Add wildcard calc helpers to permissions service with tests

* Check for wildcard access when calculating permissionsBanner

* Move resultant-acl banner within TokenExpireWarning so it's mutually exclusive with token expired banner

* fix permissions banner if statement

* Add margin to resultant-acl

* cleanup comments
Co-authored-by: James Bayer <1139532+jbayer@users.noreply.github.com>
Co-authored-by: Victor Rodriguez <vrizo@hashicorp.com>
Co-authored-by: NikolaiMagicnet <118166702+NikolaiMagicnet@users.noreply.github.com>
* Add replication mirage handler

* Add test with skipped failed assertion

* Use component-calculated attrsForCurrentMode instead of cluster.replicationAttrs which wasn't triggering component updates

* assert previously-skipped assertion

* Add changelog
* Update test selectors specific to 1.15.x

* calculate attrs based on replication-mode service instead of cluster model getter
Co-authored-by: Ryan Cragun <me@ryan.ec>
* reform yarn.lock without minimatch or qs in resolutions

* pin async and nth-check

* fix TS errors after bump

* bump ember-template-lint and disable broken rules

* pin ansi-html

* add extra lint rule to skip

* remove ember-d3 in favor of specific d3 libraries we import except d3-selection which was failing in compareAttributes

* add changelog from PR to main
@akshya96 akshya96 force-pushed the backport/vault-24058-ce/sincerely-prime-warthog branch from 70d63af to f00d749 Compare April 11, 2024 22:33
@akshya96 akshya96 merged commit 9ae77cb into release/1.15.x Apr 12, 2024
76 checks passed
@akshya96 akshya96 deleted the backport/vault-24058-ce/sincerely-prime-warthog branch April 12, 2024 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants