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 Resolve unrecognized parameter warnings on batch_input parameter in transit into release/1.11.x #18654

Conversation

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

Backport

This PR is auto-generated from #18299 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.


While playing around with #18243, I noticed operations that properly accepted the batch_input parameter were returning warnings about it being an unrecognized parameter. This should fix those issues across the transit APIs. Also fix a little glitch in the transit docs related to a batch_input parameter description.

❯ vault secrets enable transit
Success! Enabled the transit secrets engine at: transit/
❯ vault write transit/keys/test type=rsa-4096
Success! Data written to: transit/keys/test
❯ cat input.json | vault write -format=json transit/encrypt/test - | jq
{
  "request_id": "737ad91e-1303-2992-8fdc-d62ff8b35a1d",
  "lease_id": "",
  "lease_duration": 0,
  "renewable": false,
  "data": {
    "batch_results": [
      {
        "ciphertext": "vault:v1:KBnS9or3klQK8co1FYLSW5VrKhbYVgrN83cpY+MuvQtQpLla3rXLocgFs0ZL1XaNSE0Wz0muGRUXg4wk7uPpDS6syL1a1nBeyApo9LCcq3zvMztTN8fGxUiCvzCGRi6GonlhhQ5/d4UGyyDB3tXog84lvrLknTl2T9m6qZrbNKx+oeVA6laSIv4+sQkZORRWFGM+HhnNcWelpB8C+pAfuM/OCtVwoIUdwWWypFNIhQgYc5/Jjrbe7tBTb4GUUr9GqhF5wMiIxkR54EUKMpSTDWd+q6UwTtLnLAf++/rB+pU3cuIU+AhSZPWnhSEfJSXS1Dll7T96VluolCiTdaRZ7x00sNJaVpJ47IYnp9UhpdnIaYzltxbPDn8C+KNZiqpS6SXRODEBUjMiVndIB0vymUIb+i44R+xEA1ymsrtaTl6AJ2Sjzb6x4fta0ReNvQGtMBmRrei+pNQxhW3wOzrESLEcWAMkbjHAripSe4li4qSeWYkbJBoQ7j7LFiFEBgvP8G0VWSCZLSaQAzMHbfMvpZoHmEqsdABnuUSVAc7Z8Bv99BTMfj+86rdrhXyXZKfEq3t0MdDYaKDr0Om/hX6N0bYndimzRijegEB6k4HiN/NG6pA2mB266IkuwAVbQX5A+ADRoXdDoaFWCIP7NlaDQz516BWNi44g8dugNarrsbc=",
        "key_version": 1
      },
      {
        "ciphertext": "vault:v1:bbQrBjkOllJyuYgKb5Aa+nJStcteE3loiPWU1BfAPMk3N1NeiPOa0WCfAgGPMJ/au3x+CvJvxqv6PG3yhy8ABgAaebShAIoi6dAazwB+D3qqKfhCEvuAkSYJssaVM8EfnKY+KKlxFBbZd/3XBPP4O23qJSw+Nu1tJuEMdMRixyvkvW/Wxu3K8t7Mz77gxvY4PeJLhAGexXC2k8K/bPm4dFlI5yA4+eAr0peKqyHx/1XK1qQi7Dw7l1+IB00T3wkWXF+PxUmtn4yFsocmWqI2pPLrui/YkxdEeduzx850PIQ58xdli8zJzxsVTXPqPRD3CsTly3co43SV6crY3i9Ga9lczqt0i3wtaU3Z12Hqmgjl5+Xk/iXhl1clb78ExechnTjmrH5Yr+NCIRt5rhp6AD9HylGfbL3kjXxLjNhSQh3Y9mbFMGy15pW8JjDKPp4cTO96ZnwS5O6oi2ssIEe/Wj1/2lAJPbSMcZWbi5Ih0ne5v1q6zQFvU+cLQwjplIfG6Iz6YzXD34v1lNKwFqxBz+aRyf7HcOPYiUVjjT84F5coCC7G/AwcLMGLcxZgWZO0DUjChXEFxalqIPUjFgnKG5bay6a4EPtI4H1h1vGpDXZ2+F7ALW6+1YawDW1vAs4dSuMia4TTz6yGbt4ZgoFqF0y6qcjFN49HDZkRwbaVJuo=",
        "key_version": 1
      }
    ]
  },
  "warnings": [
    "Endpoint ignored these unrecognized parameters: [batch_input]"
  ]
}

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 10, 2023

CLA assistant check
All committers have signed the CLA.

@stevendpclark stevendpclark added this to the 1.11.7 milestone Jan 10, 2023
@stevendpclark stevendpclark self-assigned this Jan 10, 2023
…ransit (#18299)

* Resolve unused warnings on batch_input parameter in transit

* Add cl

* Fix text in hmac batch_input parameter description
@stevendpclark stevendpclark force-pushed the backport/stevendpclark/transit-batch-input-warnings/formally-sweet-anteater branch from d3112cf to f418923 Compare January 10, 2023 21:39
@stevendpclark stevendpclark marked this pull request as ready for review January 10, 2023 21:39
@stevendpclark stevendpclark enabled auto-merge (squash) January 10, 2023 21:43
@stevendpclark stevendpclark merged commit 530913a into release/1.11.x Jan 10, 2023
@stevendpclark stevendpclark deleted the backport/stevendpclark/transit-batch-input-warnings/formally-sweet-anteater branch January 11, 2023 13:56
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.

3 participants