fix(operator): Support private VPC S3 endpoints in endpoint validation#22395
Open
ptux wants to merge 1 commit into
Open
fix(operator): Support private VPC S3 endpoints in endpoint validation#22395ptux wants to merge 1 commit into
ptux wants to merge 1 commit into
Conversation
|
Shuang Wang seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
6 tasks
The operator's S3 endpoint validation was rejecting private VPC endpoints
(https://vpce-{id}.s3.{region}.vpce.amazonaws.com) because it only accepted
the standard format (https://s3.{region}.amazonaws.com).
This updates validateS3Endpoint to use regex-based validation that:
- Accepts standard AWS S3 endpoints with region verification
- Accepts VPC endpoints (vpce-*) with region verification
- Rejects bucket-prefixed endpoints to prevent folder creation issues
- Provides specific error messages for each failure case
Fixes grafana#19243
Co-authored-by: puretension <rlrlfhtm5@gmail.com>
Co-authored-by: JoaoBraveCoding <joao.coding@gmail.com>
73d98b3 to
0177abc
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
https://vpce-{id}.s3.{region}.vpce.amazonaws.com) tovalidateS3Endpoint()Context
This is a clean rewrite of #19247 (originally by @puretension with review contributions from @JoaoBraveCoding) which had been open for 9 months. The original PR had a test bug (expected scheme-prefixed endpoint in
ForcePathStyletest whileextractS3ConfigSecretstrips the scheme) and accumulated 11 commits including merge commits.This PR squashes everything into a single commit with the test bug fixed.
Fixes #19243
Changes
operator/internal/handlers/internal/storage/secrets.go:validateS3Endpoint()to validate using regex matching with region extractionerrS3EndpointAWSNoRegionanderrS3EndpointNoBucketNameerror variablesoperator/internal/handlers/internal/storage/secrets_test.go:ForcePathStyletest for VPC endpoints verifyingForcePathStyle=falseTest plan
go test ./internal/handlers/internal/storage/...passes (allTestS3Extract*tests)Co-authored-by: puretension rlrlfhtm5@gmail.com
Co-authored-by: JoaoBraveCoding joao.coding@gmail.com