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 ssh: Fix template regex test for defaultExtensions to allow additional text into release/1.11.x #16038

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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.


  • The regex to identify if our defaultExtensions contains a template was
    a little too greedy, requiring the entire field to be just the regex. Allow
    additional text within the value field to be added

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jun 17, 2022

CLA assistant check
All committers have signed the CLA.

…l text (#16018)

* ssh: Fix template regex test for defaultExtensions

 - The regex to identify if our defaultExtensions contains a template was
   a little too greedy, requiring the entire field to be just the regex. Allow
   additional text within the value field to be added

* Add cl
@stevendpclark stevendpclark force-pushed the backport/stevendpclark/vault-6115-ssh-template/actively-huge-prawn branch from f9abd51 to 6eaaa72 Compare June 17, 2022 15:28
@stevendpclark stevendpclark self-assigned this Jun 17, 2022
@stevendpclark stevendpclark added this to the 1.11.1 milestone Jun 17, 2022
@stevendpclark stevendpclark marked this pull request as ready for review June 17, 2022 15:28
@cipherboy cipherboy merged commit fc46bb6 into release/1.11.x Jun 20, 2022
@stevendpclark stevendpclark deleted the backport/stevendpclark/vault-6115-ssh-template/actively-huge-prawn branch June 20, 2022 16:40
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.

None yet

4 participants