Skip to content

fix: move regex out of the module scope #1219

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 8, 2025
Merged

fix: move regex out of the module scope #1219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/sequin/consumers/sqs_sink.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ defmodule Sequin.Consumers.SqsSink do
field :is_fifo, :boolean, default: false
end

@sqs_url_regex ~r/^https:\/\/sqs\.(?<region>[a-z0-9-]+)\.amazonaws\.com\/\d{12}\/[a-zA-Z0-9_-]+(?:\.fifo)?$/

def changeset(struct, params) do
struct
|> cast(params, [:queue_url, :region, :access_key_id, :secret_access_key, :is_fifo])
Expand All @@ -32,7 +30,7 @@ defmodule Sequin.Consumers.SqsSink do

defp validate_queue_url(changeset) do
changeset
|> validate_format(:queue_url, @sqs_url_regex,
|> validate_format(:queue_url, sqs_url_regex(),
message: "must be a valid AWS SQS URL (https://sqs.<region>.amazonaws.com/<account-id>/<queue-name>)"
)
|> validate_length(:queue_url, max: 2000)
Expand Down Expand Up @@ -87,9 +85,13 @@ defmodule Sequin.Consumers.SqsSink do

"""
def region_from_url(queue_url) do
case Regex.named_captures(@sqs_url_regex, queue_url) do
case Regex.named_captures(sqs_url_regex(), queue_url) do
%{"region" => region} -> region
_ -> {:error, Sequin.Error.validation(summary: "Invalid SQS queue URL format")}
end
end

def sqs_url_regex do
~r/^https:\/\/sqs\.(?<region>[a-z0-9-]+)\.amazonaws\.com\/\d{12}\/[a-zA-Z0-9_-]+(?:\.fifo)?$/
end
end
Loading