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
Restore previous behaviour of no trailing newlines in HTTP error response bodies #11606
Restore previous behaviour of no trailing newlines in HTTP error response bodies #11606
Conversation
…onse bodies Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
Trivy scan found the following vulnerabilities:
|
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11606-to-release-2.8.x origin/release-2.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 627e09365beef213b3044631803df0080061efe0 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-11606-to-release-2.8.x
# Create the PR body template
PR_BODY=$(gh pr view 11606 --json body --template 'Backport 627e09365beef213b3044631803df0080061efe0 from #11606{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.8.x] Restore previous behaviour of no trailing newlines in HTTP error response bodies" --body-file - --label "size/S" --label "type/bug" --label "backport" --base release-2.8.x --milestone release-2.8.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-11606-to-release-2.8.x
# Create a pull request where the `base` branch is `release-2.8.x` and the `compare`/`head` branch is `backport-11606-to-release-2.8.x`.
# Remove the local backport branch
git switch main
git branch -D backport-11606-to-release-2.8.x |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11606-to-release-2.9.x origin/release-2.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 627e09365beef213b3044631803df0080061efe0 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-11606-to-release-2.9.x
# Create the PR body template
PR_BODY=$(gh pr view 11606 --json body --template 'Backport 627e09365beef213b3044631803df0080061efe0 from #11606{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.9.x] Restore previous behaviour of no trailing newlines in HTTP error response bodies" --body-file - --label "size/S" --label "type/bug" --label "backport" --base release-2.9.x --milestone release-2.9.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-11606-to-release-2.9.x
# Create a pull request where the `base` branch is `release-2.9.x` and the `compare`/`head` branch is `backport-11606-to-release-2.9.x`.
# Remove the local backport branch
git switch main
git branch -D backport-11606-to-release-2.9.x |
…onse bodies (grafana#11606) **What this PR does / why we need it**: grafana#11487 introduced a regression which added trailing newlines to HTTP error response bodies, which may affect client integrations. This regression hasn't made it into the 2.9.x or 2.8.x releases yet so no backporting is necessary.
What this PR does / why we need it:
#11487 introduced a regression which added trailing newlines to HTTP error response bodies, which may affect client integrations.
This regression hasn't made it into the 2.9.x or 2.8.x releases yet so no backporting is necessary.
Checklist
CONTRIBUTING.md
guide (required)CHANGELOG.md
updatedadd-to-release-notes
labeldocs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR