fix(operator): resolve merge conflict and fix VPC endpoint regex

Signed-off-by: puretension <rlrlfhtm5@gmail.com>

Author: puretension

operator/internal/handlers/internal/storage/secrets.go

@@ -77,7 +77,7 @@ var (
 	awsS3WithBucketRegex = regexp.MustCompile(`^https://([a-z0-9.-]+)\.s3\.([a-z0-9-]+)\.amazonaws\.com$`)
 
 	// VPC with bucket: https://bucket-name.vpce-id.s3.region.vpce.amazonaws.com
-	awsVPCWithBucketRegex = regexp.MustCompile(`^https://([a-z0-9.-]+)\.bucket.vpce-[a-z0-9-]+\.s3\.([a-z0-9-]+)\.vpce\.amazonaws\.com$`)
+	awsVPCWithBucketRegex = regexp.MustCompile(`^https://([a-z0-9.-]+)\.vpce-[a-z0-9-]+\.s3\.([a-z0-9-]+)\.vpce\.amazonaws\.com$`)
 )
 
 func getSecrets(ctx context.Context, k k8s.Client, stack *lokiv1.LokiStack, fg configv1.FeatureGates) (*corev1.Secret, *corev1.Secret, error) {

operator/internal/handlers/internal/storage/secrets_test.go

@@ -657,7 +657,7 @@ func TestS3Extract(t *testing.T) {
 					"access_key_secret": []byte("secret"),
 				},
 			},
-			wantError: "endpoint for AWS S3 is invalid, must match either https://s3.region.amazonaws.com or https://vpce-id.s3.region.vpce.amazonaws.com: https://bucket.vpce-1234567abc.s3.us-east-1.vpce.amazonaws.com",
+			wantError: "bucket name must not be included in AWS S3 endpoint URL",
 		},
 		{
 			name: "aws s3 vpc endpoint wrong region",